From cb2a3ab93c2c222412ff9921f4019b457abf42f4 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Tue, 17 Nov 2015 16:35:34 +0100 Subject: Create a yardstick daily job to run on yardstick ericsson pod Other changes are - job for foreman is removed. - stable/arno is removed. - cron trigger for job on lf commented out to make it possible to use macro. Change-Id: Ib498a3daa2b5689446be2f3ea7352f995666d9ee Signed-off-by: Fatih Degirmenci --- jjb/yardstick/yardstick.yml | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) (limited to 'jjb/yardstick') diff --git a/jjb/yardstick/yardstick.yml b/jjb/yardstick/yardstick.yml index 50369ce73..7c40096cd 100644 --- a/jjb/yardstick/yardstick.yml +++ b/jjb/yardstick/yardstick.yml @@ -1,18 +1,23 @@ - project: name: yardstick - installer: - - fuel: + project: 'yardstick' + + pod: + - lf: node: 'opnfv-jump-2' installer_type: 'fuel' installer_ip: '10.20.0.2' - - foreman: - node: 'opnfv-jump-2' - installer_type: 'foreman' - installer_ip: '172.30.10.73' + - ericsson: + node: 'yardstick-pod' + installer_type: 'fuel' + installer_ip: '10.20.0.2' + + installer: + - fuel jobs: - - 'yardstick-{installer}-{stream}' + - 'yardstick-{installer}-{pod}-{stream}' - 'yardstick-merge' - 'yardstick-verify' @@ -21,11 +26,6 @@ stream: - master: branch: 'master' - - stable-arno: - branch: 'stable/arno' - gs-pathname: '/arno' - - project: 'yardstick' - job-template: name: 'yardstick-verify' @@ -160,7 +160,7 @@ deactivate - job-template: - name: 'yardstick-{installer}-{stream}' + name: 'yardstick-{installer}-{pod}-{stream}' project-type: freestyle @@ -192,6 +192,9 @@ artifactDaysToKeep: -1 artifactNumToKeep: -1 + triggers: + - 'yardstick-trigger-{pod}' + builders: - 'yardstick-fetch-os-creds' - 'yardstick-daily' @@ -237,3 +240,16 @@ builders: - shell: !include-raw ../../utils/fetch_os_creds.sh + +######################## +# trigger macros +######################## +- trigger: + name: yardstick-trigger-ericsson + triggers: + timed: "@midnight" + +- trigger: + name: yardstick-trigger-lf + triggers: + timed: "#@midnight" -- cgit 1.2.3-korg