From: xudan <xudan16@huawei.com>
Date: Wed, 6 Dec 2017 20:00:25 +0000 (-0500)
Subject: enable dovetail to run on APEX bgpvpn scenario
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F85%2F48485%2F1;p=releng.git

enable dovetail to run on APEX bgpvpn scenario

Since only APEX has the bgpvpn scenario in Euphrates, enable run dovetail
on Apex euphrates scenario os-odl-bgpvpn-ha to test sdnvpn test cases.

JIRA: DOVETAIL-568

Change-Id: Ic7c880a5ef911fac17807e19484f937bdaa53e21
Signed-off-by: xudan <xudan16@huawei.com>
---

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 43e234ce1..eadfbf9ee 100644
--- 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 6cd9de282..f49c7fa1a 100644
--- 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: