summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwutianwei <wutianwei1@huawei.com>2017-08-04 14:10:45 +0800
committerwutianwei <wutianwei1@huawei.com>2017-08-04 14:33:59 +0800
commit7570294d4dec8de4c172c3115247821b5e0b3d44 (patch)
treee9c3d0fb2481f37028f9029bac4186e3440aaae5
parentaf3d0f65484c7ad99f716dae0adcf9b2044bee05 (diff)
Don't trigger odl_l2-nofeature scenario by time
when patch verify, we define the os-nosdn-nofeature-ha scenario for functest Change-Id: Ia7a11817a29a2e5e9649708652f8655d1cf89361 Signed-off-by: wutianwei <wutianwei1@huawei.com>
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml6
-rw-r--r--jjb/compass4nfv/compass-verify-jobs.yml6
2 files changed, 7 insertions, 5 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index c98fd369c..4c12f199e 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -362,7 +362,7 @@
- trigger:
name: 'compass-os-odl_l2-nofeature-ha-baremetal-centos-master-trigger'
triggers:
- - timed: '0 23 * * *'
+ - timed: ''
- trigger:
name: 'compass-os-odl_l3-nofeature-ha-baremetal-centos-master-trigger'
triggers:
@@ -411,7 +411,7 @@
- trigger:
name: 'compass-os-odl_l2-nofeature-ha-baremetal-master-trigger'
triggers:
- - timed: '0 22 * * *'
+ - timed: ''
- trigger:
name: 'compass-os-odl_l3-nofeature-ha-baremetal-master-trigger'
triggers:
@@ -511,7 +511,7 @@
- trigger:
name: 'compass-os-odl_l2-nofeature-ha-virtual-master-trigger'
triggers:
- - timed: '0 20 * * *'
+ - timed: ''
- trigger:
name: 'compass-os-odl_l3-nofeature-ha-virtual-master-trigger'
triggers:
diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml
index f016b91c7..ee91e02da 100644
--- a/jjb/compass4nfv/compass-verify-jobs.yml
+++ b/jjb/compass4nfv/compass-verify-jobs.yml
@@ -158,15 +158,17 @@
projects:
- name: 'functest-compass-virtual-suite-{stream}'
current-parameters: false
- predefined-parameters:
+ predefined-parameters: |
FUNCTEST_SUITE_NAME=healthcheck
+ DEPLOY_SCENARIO=os-nosdn-nofeature-ha
node-parameters: true
kill-phase-on: NEVER
abort-all-job: true
- name: 'functest-compass-virtual-suite-{stream}'
current-parameters: false
- predefined-parameters:
+ predefined-parameters: |
FUNCTEST_SUITE_NAME=vping_ssh
+ DEPLOY_SCENARIO=os-nosdn-nofeature-ha
node-parameters: true
kill-phase-on: NEVER
abort-all-job: true