From: Tim Rozet <trozet@redhat.com>
Date: Wed, 2 May 2018 19:27:19 +0000 (-0400)
Subject: Apex: Fix resources/images directory usage with deploy
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F85%2F56985%2F1;p=releng.git

Apex: Fix resources/images directory usage with deploy

Change-Id: If50ad310049edca687da8e0acf412a7e1eacd2b6
Signed-off-by: Tim Rozet <trozet@redhat.com>
---

diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh
index 64877b0d5..35c2b8544 100755
--- a/jjb/apex/apex-deploy.sh
+++ b/jjb/apex/apex-deploy.sh
@@ -22,7 +22,6 @@ if [[ "$ARTIFACT_VERSION" =~ dev ]]; then
   # Settings for deploying from git workspace
   DEPLOY_SETTINGS_DIR="${WORKSPACE}/config/deploy"
   NETWORK_SETTINGS_DIR="${WORKSPACE}/config/network"
-  DEPLOY_CMD="opnfv-deploy --image-dir ${WORKSPACE}/.build"
   CLEAN_CMD="opnfv-clean"
   # if we are using master, then we are downloading/caching upstream images
   # we want to use that built in mechanism to avoid re-downloading every job
@@ -38,7 +37,7 @@ if [[ "$ARTIFACT_VERSION" =~ dev ]]; then
   BASE=$CONFIG
   IMAGES=$RESOURCES
   LIB="${WORKSPACE}/lib"
-
+  DEPLOY_CMD="opnfv-deploy --image-dir ${RESOURCES}"
   # Ensure artifacts were downloaded and extracted correctly
   # TODO(trozet) add verification here
 
@@ -50,7 +49,6 @@ if [[ "$ARTIFACT_VERSION" =~ dev ]]; then
 else
   DEPLOY_SETTINGS_DIR="/etc/opnfv-apex/"
   NETWORK_SETTINGS_DIR="/etc/opnfv-apex/"
-  DEPLOY_CMD="opnfv-deploy"
   CLEAN_CMD="opnfv-clean"
   # set to use different directory here because upon RPM removal this
   # directory will be wiped in daily
@@ -61,6 +59,7 @@ else
   else
     RESOURCES="/var/opt/opnfv/images"
   fi
+  DEPLOY_CMD="opnfv-deploy --image-dir ${RESOURCES}"
   CONFIG="/var/opt/opnfv"
   BASE=$CONFIG
   IMAGES=$RESOURCES