summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2015-11-17 16:35:34 +0100
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2015-11-17 22:36:49 +0000
commitcb2a3ab93c2c222412ff9921f4019b457abf42f4 (patch)
tree4dc0767f6310a2078bc353e3c8354269e24de7c8
parent57c83817b33ad9035be534f7c160259cbf11be60 (diff)
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 <fatih.degirmenci@ericsson.com>
-rw-r--r--jjb/yardstick/yardstick.yml42
1 files changed, 29 insertions, 13 deletions
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"