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.yml37
1 files changed, 33 insertions, 4 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 64a4b317c..f43ab59ec 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -24,11 +24,15 @@
#--------------------------------
- huawei-us-deploy-bare-1:
<<: *brahmaputra
+ - huawei-virtual:
+ <<: *brahmaputra
#--------------------------------
# master
#--------------------------------
- intel-pod8:
<<: *master
+ - huawei-virtual:
+ <<: *master
scenario:
- 'os-nosdn-nofeature-ha':
@@ -103,7 +107,7 @@
condition: COMPLETED
projects:
- name: 'functest-compass-{pod}-daily-{stream}'
- current-parameters: false
+ current-parameters: true
predefined-parameters: 'DEPLOY_SCENARIO={scenario}'
kill-phase-on: NEVER
- multijob:
@@ -111,7 +115,7 @@
condition: COMPLETED
projects:
- name: 'yardstick-compass-{pod}-daily-{stream}'
- current-parameters: false
+ current-parameters: true
predefined-parameters: 'DEPLOY_SCENARIO={scenario}'
kill-phase-on: NEVER
@@ -204,7 +208,16 @@
choices:
- 'trusty'
- 'centos7'
-
+- parameter:
+ name: 'huawei-virtual-defaults'
+ parameters:
+ - label:
+ name: SLAVE_LABEL
+ default: 'huawei-deploy-vm'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on these Jenkins Slaves'
########################
# trigger macros
########################
@@ -231,7 +244,7 @@
- trigger:
name: 'compass-os-odl_l2-nofeature-ha-intel-pod8-trigger'
triggers:
- - timed: '0 16 * * *'
+ - timed: ''
- trigger:
name: 'compass-os-onos-nofeature-ha-intel-pod8-trigger'
triggers:
@@ -240,3 +253,19 @@
name: 'compass-os-ocl-nofeature-ha-intel-pod8-trigger'
triggers:
- timed: ''
+- trigger:
+ name: 'compass-os-nosdn-nofeature-ha-huawei-virtual-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'compass-os-odl_l2-nofeature-ha-huawei-virtual-trigger'
+ triggers:
+ - timed: '0 16 * * *'
+- trigger:
+ name: 'compass-os-onos-nofeature-ha-huawei-virtual-trigger'
+ triggers:
+ - timed: '0 16 * * *'
+- trigger:
+ name: 'compass-os-ocl-nofeature-ha-huawei-virtual-trigger'
+ triggers:
+ - timed: ''