summaryrefslogtreecommitdiffstats
path: root/jjb/compass4nfv/compass-ci-jobs.yml
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/compass4nfv/compass-ci-jobs.yml')
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml33
1 files changed, 28 insertions, 5 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index b3438d799..dd046c1c7 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -23,15 +23,22 @@
# brahmaputra
#--------------------------------
- huawei-us-deploy-bare-1:
+ os-version: 'trusty'
<<: *brahmaputra
- huawei-virtual:
+ os-version: 'trusty'
<<: *brahmaputra
#--------------------------------
# master
#--------------------------------
+ - huawei-us-deploy-bare-2:
+ os-version: 'centos7'
+ <<: *master
- intel-pod8:
+ os-version: 'trusty'
<<: *master
- huawei-virtual:
+ os-version: 'trusty'
<<: *master
scenario:
@@ -99,6 +106,7 @@
current-parameters: false
predefined-parameters:
DEPLOY_SCENARIO={scenario}
+ COMPASS_OS_VERSION={os-version}
same-node: true
block: true
- trigger-builds:
@@ -200,16 +208,31 @@
choices:
- 'liberty'
- 'juno'
- - choice:
- name: COMPASS_OS_VERSION
- choices:
- - 'trusty'
- - 'centos7'
########################
# trigger macros
########################
- trigger:
+ name: 'compass-os-nosdn-nofeature-ha-huawei-us-deploy-bare-2-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'compass-os-odl_l2-nofeature-ha-huawei-us-deploy-bare-2-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'compass-os-odl_l3-nofeature-ha-huawei-us-deploy-bare-2-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'compass-os-onos-nofeature-ha-huawei-us-deploy-bare-2-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'compass-os-ocl-nofeature-ha-huawei-us-deploy-bare-2-trigger'
+ triggers:
+ - timed: ''
+- trigger:
name: 'compass-os-nosdn-nofeature-ha-huawei-us-deploy-bare-1-trigger'
triggers:
- timed: '0 3 * * * '