summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJun Li <lijun_1203@126.com>2017-11-29 01:19:16 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-11-29 01:19:16 +0000
commitcdb6fb10974fed3359a01391bad0fd93958da7bc (patch)
tree4a1f5cfeb0f7bea553fee5165febdce1f88cd826
parent75348f8ed4d5c2ba0fe87229c219eb41bbfe6c56 (diff)
parent55895a017433ff5966a7b653067eda0e6acbd458 (diff)
Merge "Enable Dovetail Euphrates CI Jobs"
-rw-r--r--jjb/dovetail/dovetail-ci-jobs.yml69
1 files changed, 67 insertions, 2 deletions
diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml
index 6efe12820..99867c327 100644
--- a/jjb/dovetail/dovetail-ci-jobs.yml
+++ b/jjb/dovetail/dovetail-ci-jobs.yml
@@ -25,7 +25,13 @@
branch: 'stable/{stream}'
dovetail-branch: master
gs-pathname: '/{stream}'
- docker-tag: 'cvp.0.8.0'
+ docker-tag: 'cvp.0.9.0'
+ euphrates: &euphrates
+ stream: euphrates
+ branch: 'stable/{stream}'
+ dovetail-branch: master
+ gs-pathname: '/{stream}'
+ docker-tag: 'cvp.0.9.0'
# ----------------------------------
# POD, PLATFORM, AND BRANCH MAPPING
@@ -60,6 +66,16 @@
SUT: fuel
auto-trigger-name: 'daily-trigger-disabled'
<<: *danube
+ - baremetal:
+ slave-label: fuel-baremetal
+ SUT: fuel
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *euphrates
+ - virtual:
+ slave-label: fuel-virtual
+ SUT: fuel
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *euphrates
# compass CI PODs
- baremetal:
slave-label: compass-baremetal
@@ -81,6 +97,16 @@
SUT: compass
auto-trigger-name: 'daily-trigger-disabled'
<<: *danube
+ - baremetal:
+ slave-label: compass-baremetal
+ SUT: compass
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *euphrates
+ - virtual:
+ slave-label: compass-virtual
+ SUT: compass
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *euphrates
# -------------------------------
# Installers not using labels
# CI PODs
@@ -108,6 +134,16 @@
SUT: apex
auto-trigger-name: 'daily-trigger-disabled'
<<: *danube
+ - virtual:
+ slave-label: apex-virtual-master
+ SUT: apex
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *euphrates
+ - baremetal:
+ slave-label: apex-baremetal-master
+ SUT: apex
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *euphrates
# armband CI PODs
- armband-baremetal:
slave-label: armband-baremetal
@@ -129,6 +165,16 @@
SUT: fuel
auto-trigger-name: 'daily-trigger-disabled'
<<: *danube
+ - armband-baremetal:
+ slave-label: armband-baremetal
+ SUT: fuel
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *euphrates
+ - armband-virtual:
+ slave-label: armband-virtual
+ SUT: fuel
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *euphrates
# -------------------------------
# None-CI PODs
# -------------------------------
@@ -172,10 +218,29 @@
SUT: compass
auto-trigger-name: 'daily-trigger-disabled'
<<: *danube
+ - zte-pod1:
+ slave-label: zte-pod1
+ SUT: fuel
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *euphrates
+ - zte-pod3:
+ slave-label: zte-pod3
+ SUT: fuel
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *euphrates
+ - huawei-pod4:
+ slave-label: huawei-pod4
+ SUT: apex
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *euphrates
+ - huawei-pod7:
+ slave-label: huawei-pod7
+ SUT: compass
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *euphrates
# -------------------------------
testsuite:
- - 'compliance_set'
- 'proposed_tests'
jobs: