summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorSerena Feng <feng.xiaowei@zte.com.cn>2018-04-13 06:12:56 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-04-13 06:12:56 +0000
commitbaabd8fc2aecabcac6903f515a032054a1528bda (patch)
tree749849b939f1b74a62cfcf050c7c90f6ca9fd2de /jjb
parent9c9a3734e4615088b812f92d37491cb38d792c89 (diff)
parent17854283cc61441eca050809132ba16b5df54689 (diff)
Merge "Enable all yardstick tasks on baremetal for daisy"
Diffstat (limited to 'jjb')
-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 eb3dcb746..4eaa39ae9 100644
--- a/jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yml
@@ -156,9 +156,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