summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-06-01 11:30:00 -0400
committerTim Rozet <trozet@redhat.com>2017-06-01 11:30:00 -0400
commit8efe44853121774b32960149e8c8323038235d5b (patch)
treef6d6d8530a28f34f674171fc40fafef3cde6cd99
parent637873b739bb486f409a05a630159782866b7c7e (diff)
Apex: fixes scenario name for netvirt+vpp
Change-Id: Ie3ca73a09cbea1aaf5c195fe319e5ec46e71f1bf Signed-off-by: Tim Rozet <trozet@redhat.com>
-rw-r--r--jjb/apex/apex.yml4
-rw-r--r--jjb/apex/apex.yml.j22
-rw-r--r--jjb/apex/scenarios.yaml.hidden2
3 files changed, 4 insertions, 4 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index bb49e4238..ab3df6e63 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -799,7 +799,7 @@
node-parameters: false
current-parameters: false
predefined-parameters: |
- DEPLOY_SCENARIO=os-odl_l2-netvirt_gbp_fdio-noha
+ DEPLOY_SCENARIO=os-odl_netvirt-fdio-noha
OPNFV_CLEAN=yes
kill-phase-on: NEVER
abort-all-job: true
@@ -1253,7 +1253,7 @@
- name: 'apex-deploy-virtual-{stream}'
current-parameters: false
predefined-parameters: |
- DEPLOY_SCENARIO=os-odl_l2-netvirt_gbp_fdio-noha
+ DEPLOY_SCENARIO=os-odl_netvirt-fdio-noha
OPNFV_CLEAN=yes
GERRIT_BRANCH=$GERRIT_BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index a95d9f433..b040ba5bf 100644
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -892,7 +892,7 @@
- name: 'apex-deploy-virtual-{stream}'
current-parameters: false
predefined-parameters: |
- DEPLOY_SCENARIO=os-odl_l2-netvirt_gbp_fdio-noha
+ DEPLOY_SCENARIO=os-odl_netvirt-fdio-noha
OPNFV_CLEAN=yes
GERRIT_BRANCH=$GERRIT_BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
diff --git a/jjb/apex/scenarios.yaml.hidden b/jjb/apex/scenarios.yaml.hidden
index bff7d3b5a..dc9107a11 100644
--- a/jjb/apex/scenarios.yaml.hidden
+++ b/jjb/apex/scenarios.yaml.hidden
@@ -15,7 +15,7 @@ danube:
- 'os-nosdn-kvm-noha'
- 'os-odl_l2-fdio-noha'
- 'os-odl_l2-fdio-ha'
- - 'os-odl_l2-netvirt_gbp_fdio-noha'
+ - 'os-odl_netvirt-fdio-noha'
- 'os-odl_l2-sfc-noha'
- 'os-odl_l3-nofeature-noha'
- 'os-odl_l3-nofeature-ha'