summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-03-15 19:40:15 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-15 19:40:15 +0000
commit1e1adaf5f02fd5fa3887386b524932328d8579bb (patch)
treedccea84e0383b68f54611d8102eb38596d705a9c /jjb
parent013ab627c0b7f43dda7bc6e8f654b50e8e9a64a3 (diff)
parentae6dd477448fb3c413a0b478d02ca2bd41fe23c0 (diff)
Merge "change dovetail CI jobs on Apex"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/apex/apex.yml19
-rw-r--r--jjb/apex/apex.yml.j219
2 files changed, 34 insertions, 4 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index cf29b928c..e19a90e94 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -530,7 +530,7 @@
abort-all-job: false
git-revision: false
- multijob:
- name: Dovetail
+ name: Dovetail-proposed_tests
condition: ALWAYS
projects:
- name: 'dovetail-apex-baremetal-proposed_tests-{scenario_stream}'
@@ -539,7 +539,22 @@
predefined-parameters:
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
kill-phase-on: NEVER
- enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/"
+ enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/
+ && $BUILD_NUMBER % 2 == 1"
+ abort-all-job: false
+ git-revision: false
+ - multijob:
+ name: Dovetail-default
+ condition: ALWAYS
+ projects:
+ - name: 'dovetail-apex-baremetal-default-{scenario_stream}'
+ node-parameters: true
+ current-parameters: false
+ predefined-parameters:
+ DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+ kill-phase-on: NEVER
+ enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/
+ && $BUILD_NUMBER % 2 == 0"
abort-all-job: false
git-revision: false
- multijob:
diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index ab65c4e2b..ecc6f270c 100644
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -408,7 +408,7 @@
abort-all-job: false
git-revision: false
- multijob:
- name: Dovetail
+ name: Dovetail-proposed_tests
condition: ALWAYS
projects:
- name: 'dovetail-apex-baremetal-proposed_tests-{scenario_stream}'
@@ -417,7 +417,22 @@
predefined-parameters:
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
kill-phase-on: NEVER
- enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/"
+ enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/
+ && $BUILD_NUMBER % 2 == 1"
+ abort-all-job: false
+ git-revision: false
+ - multijob:
+ name: Dovetail-default
+ condition: ALWAYS
+ projects:
+ - name: 'dovetail-apex-baremetal-default-{scenario_stream}'
+ node-parameters: true
+ current-parameters: false
+ predefined-parameters:
+ DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+ kill-phase-on: NEVER
+ enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/
+ && $BUILD_NUMBER % 2 == 0"
abort-all-job: false
git-revision: false
- multijob: