summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJun Li <matthew.lijun@huawei.com>2017-03-06 12:37:19 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-06 12:37:19 +0000
commit82044493d0fda43726bbcbd7c1af67aa13e81518 (patch)
treeb218bc266749bba507715d2beb37507d9eb41f33
parentc0cd979a0812473d9f5f125a5e6e9441b9f217f0 (diff)
parentf64bda228ff7e6a062f7b9e5b0533e86a9f8bda2 (diff)
Merge "change the name of open-o scenario to os-nosdn-openo-ha"
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml12
-rw-r--r--jjb/opera/opera-daily-jobs.yml2
2 files changed, 7 insertions, 7 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 9b1ba8092..5ccd4b56f 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -71,7 +71,7 @@
- 'os-nosdn-kvm-ha':
disabled: false
auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
- - 'os-nosdn-openo-noha':
+ - 'os-nosdn-openo-ha':
disabled: false
auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
@@ -251,7 +251,7 @@
triggers:
- timed: '0 19 * * *'
- trigger:
- name: 'compass-os-nosdn-openo-noha-baremetal-centos-master-trigger'
+ name: 'compass-os-nosdn-openo-ha-baremetal-centos-master-trigger'
triggers:
- timed: ''
- trigger:
@@ -288,7 +288,7 @@
triggers:
- timed: '0 2 * * *'
- trigger:
- name: 'compass-os-nosdn-openo-noha-baremetal-master-trigger'
+ name: 'compass-os-nosdn-openo-ha-baremetal-master-trigger'
triggers:
- timed: '0 3 * * *'
- trigger:
@@ -325,7 +325,7 @@
triggers:
- timed: ''
- trigger:
- name: 'compass-os-nosdn-openo-noha-baremetal-danube-trigger'
+ name: 'compass-os-nosdn-openo-ha-baremetal-danube-trigger'
triggers:
- timed: ''
- trigger:
@@ -362,7 +362,7 @@
triggers:
- timed: '0 21 * * *'
- trigger:
- name: 'compass-os-nosdn-openo-noha-virtual-master-trigger'
+ name: 'compass-os-nosdn-openo-ha-virtual-master-trigger'
triggers:
- timed: '0 22 * * *'
- trigger:
@@ -399,7 +399,7 @@
triggers:
- timed: '0 21 * * *'
- trigger:
- name: 'compass-os-nosdn-openo-noha-virtual-danube-trigger'
+ name: 'compass-os-nosdn-openo-ha-virtual-danube-trigger'
triggers:
- timed: '0 22 * * *'
- trigger:
diff --git a/jjb/opera/opera-daily-jobs.yml b/jjb/opera/opera-daily-jobs.yml
index d49caf1a6..5d2cc03f3 100644
--- a/jjb/opera/opera-daily-jobs.yml
+++ b/jjb/opera/opera-daily-jobs.yml
@@ -83,7 +83,7 @@
- name: 'compass-deploy-virtual-daily-{stream}'
current-parameters: false
predefined-parameters: |
- DEPLOY_SCENARIO=os-nosdn-openo-noha
+ DEPLOY_SCENARIO=os-nosdn-openo-ha
COMPASS_OS_VERSION=xenial
node-parameters: true
kill-phase-on: FAILURE