summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-12-03 11:52:27 -0500
committerTim Rozet <trozet@redhat.com>2018-12-03 11:52:27 -0500
commitafa13d6ee8b87c8e63e71fa2ceead357396b8f70 (patch)
tree36090aaa951ec9841f0c7d6834ecd15fd0807dee
parent351e5623582731756fedee5c506dc5fbdc836b93 (diff)
Apex: Fix deployment detecting snapshot type
With the refactoring of the promotion job, the Apex deploy was not detecting the snapshot type and using default upstream deployment. This change passes the snapshot type to the deploy script for detection. Change-Id: I76cf2b894955aa94bd70dc597305553dc9fe4c17 Signed-off-by: Tim Rozet <trozet@redhat.com>
-rw-r--r--jjb/apex/apex.yaml2
-rw-r--r--jjb/apex/apex.yaml.j22
2 files changed, 2 insertions, 2 deletions
diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index a5af63cb5..23a1daf0f 100644
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -918,7 +918,7 @@
- name: 'apex-deploy-virtual-{stream}'
current-parameters: true
predefined-parameters: |
- DEPLOY_SCENARIO=os-{sdn}-{os_scenario}-{topology}
+ DEPLOY_SCENARIO=os-{sdn}-{os_scenario}-{topology}-{snap_type}
OPNFV_CLEAN=yes
GERRIT_BRANCH=$GERRIT_BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2
index 2e507fb09..451274cf1 100644
--- a/jjb/apex/apex.yaml.j2
+++ b/jjb/apex/apex.yaml.j2
@@ -764,7 +764,7 @@
- name: 'apex-deploy-virtual-{stream}'
current-parameters: true
predefined-parameters: |
- DEPLOY_SCENARIO=os-{sdn}-{os_scenario}-{topology}
+ DEPLOY_SCENARIO=os-{sdn}-{os_scenario}-{topology}-{snap_type}
OPNFV_CLEAN=yes
GERRIT_BRANCH=$GERRIT_BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC