Code Review / releng.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw (from parent 1: c8063f1)
Merge "enable dovetail to run on APEX bgpvpn scenario"
authorTim Rozet <trozet@redhat.com>
Fri, 8 Dec 2017 19:33:32 +0000 (19:33 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 8 Dec 2017 19:33:32 +0000 (19:33 +0000)
jjb/apex/apex.yml patch | blob | history
jjb/apex/apex.yml.j2 patch | blob | history

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 43e234c..eadfbf9 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -543,7 +543,7 @@
               predefined-parameters:
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
               kill-phase-on: NEVER
-              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|nosdn-kvm|odl_l3-fdio)-ha/"
+              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/"
               abort-all-job: false
               git-revision: false
       - multijob:
diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index 6cd9de2..f49c7fa 100644 (file)
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -419,7 +419,7 @@
               predefined-parameters:
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
               kill-phase-on: NEVER
-              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|nosdn-kvm|odl_l3-fdio)-ha/"
+              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/"
               abort-all-job: false
               git-revision: false
       - multijob: