summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien <zhang.jun3g@zte.com.cn>2018-04-12 21:27:15 +0800
committerJulien <zhang.jun3g@zte.com.cn>2018-04-13 08:43:30 +0800
commit17854283cc61441eca050809132ba16b5df54689 (patch)
tree2e59a299329b29ae587ba597597cf1f2217c0de8
parentc5ba198398eae4098b07b68b3301d52f9afbebea (diff)
Enable all yardstick tasks on baremetal for daisy
currently only master job is enabled. Change-Id: I7da6a1a3a8e8faf08cde34d9a20219346070151b Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
-rw-r--r--jjb/daisy4nfv/daisy-daily-jobs.yml3
-rw-r--r--jjb/yardstick/yardstick-daily-jobs.yml5
2 files changed, 5 insertions, 3 deletions
diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml
index 2eb27a663..800de927d 100644
--- a/jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yml
@@ -155,9 +155,6 @@
- condition-kind: regex-match
regex: 'baremetal'
label: '{pod}'
- - condition-kind: regex-match
- regex: 'master'
- label: '{stream}'
steps:
- trigger-builds:
- project: 'yardstick-daisy-{pod}-daily-{stream}'
diff --git a/jjb/yardstick/yardstick-daily-jobs.yml b/jjb/yardstick/yardstick-daily-jobs.yml
index 2eaa0feb1..fefa8e68a 100644
--- a/jjb/yardstick/yardstick-daily-jobs.yml
+++ b/jjb/yardstick/yardstick-daily-jobs.yml
@@ -140,6 +140,11 @@
installer: daisy
auto-trigger-name: 'daily-trigger-disabled'
<<: *master
+ - baremetal:
+ slave-label: daisy-baremetal
+ installer: daisy
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *fraser
- virtual:
slave-label: daisy-virtual
installer: daisy