From: Tim Rozet <trozet@redhat.com>
Date: Mon, 3 Dec 2018 16:52:27 +0000 (-0500)
Subject: Apex: Fix deployment detecting snapshot type
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=commitdiff_plain;h=afa13d6ee8b87c8e63e71fa2ceead357396b8f70

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>
---

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