summaryrefslogtreecommitdiffstats
path: root/jjb/functest/functest-daily-jobs.yml
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/functest/functest-daily-jobs.yml')
-rw-r--r--jjb/functest/functest-daily-jobs.yml34
1 files changed, 18 insertions, 16 deletions
diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index 5a99fdce8..04a293618 100644
--- a/jjb/functest/functest-daily-jobs.yml
+++ b/jjb/functest/functest-daily-jobs.yml
@@ -122,6 +122,14 @@
slave-label: daisy-virtual
installer: daisy
<<: *master
+ - baremetal:
+ slave-label: daisy-baremetal
+ installer: daisy
+ <<: *euphrates
+ - virtual:
+ slave-label: daisy-virtual
+ installer: daisy
+ <<: *euphrates
# netvirt 3rd party ci
- virtual:
slave-label: odl-netvirt-virtual
@@ -160,15 +168,19 @@
<<: *euphrates
- zte-pod2:
slave-label: '{pod}'
- installer: fuel
+ installer: daisy
<<: *master
+ - zte-pod2:
+ slave-label: '{pod}'
+ installer: daisy
+ <<: *euphrates
- zte-pod3:
slave-label: '{pod}'
- installer: fuel
+ installer: daisy
<<: *master
- zte-pod3:
slave-label: '{pod}'
- installer: fuel
+ installer: daisy
<<: *euphrates
# PODs for verify jobs triggered by each patch upload
# - ool-virtual1:
@@ -216,7 +228,7 @@
wrappers:
- build-name:
- name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO'
+ name: '$BUILD_NUMBER Suite: $FUNCTEST_MODE Scenario: $DEPLOY_SCENARIO'
- timeout:
timeout: '{job-timeout}'
abort: true
@@ -329,7 +341,6 @@
- 'rally_sanity'
- 'odl'
- 'odl_netvirt'
- - 'onos'
- 'snaps_smoke'
- 'refstack_defcore'
- 'promise'
@@ -412,7 +423,7 @@
name: functest-suite-builder
builders:
- 'functest-cleanup'
- - 'set-functest-env'
+ - 'set-functest-env-alpine'
- 'functest-suite'
- 'functest-store-results'
- 'functest-exit'
@@ -424,14 +435,7 @@
- 'set-functest-env-alpine'
- 'functest-daily'
- 'functest-store-results'
-
-- builder:
- name: functest-alpine-suite-builder
- builders:
- - 'functest-cleanup'
- - 'set-functest-env-alpine'
- - 'functest-suite'
- - 'functest-store-results'
+ - 'functest-exit'
- builder:
name: functest-daily
@@ -453,8 +457,6 @@
builders:
- shell:
!include-raw:
- - ./functest-env-presetup.sh
- - ../../utils/fetch_os_creds.sh
- ./functest-alpine.sh
- builder: