diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-05-02 15:27:19 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2018-05-02 15:27:19 -0400 |
| commit | d29c3e495aee81b96f653b6a4b5ee72a9bf33976 (patch) | |
| tree | 0d4f3a66f3f6c11a14807770f628966e3b8e80ef /jjb | |
| parent | 13e6cf7b998848aca31c0a78329706c83e48e468 (diff) | |
Apex: Fix resources/images directory usage with deploy
Change-Id: If50ad310049edca687da8e0acf412a7e1eacd2b6
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/apex/apex-deploy.sh | 5 |
1 files changed, 2 insertions, 3 deletions
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 |