engine: Include stack version in installer filename

Change-Id: I8564a495dc1c0e5dd9d2c29621d190de9ec5327d

diff --git a/jjb/engine/scripts/download-artifact.sh b/jjb/engine/scripts/download-artifact.sh
index 68e8d03998a6d17f1388708c7933d34bdb5ba4de..9b3aebf5c2e5e9ca9af15548f93a2aa60bd27482 100755 (executable)
--- a/jjb/engine/scripts/download-artifact.sh
+++ b/jjb/engine/scripts/download-artifact.sh
@@ -23,22 +23,24 @@ set -o errexit
 
 if [[ "$EXECUTION_MODE" == "offline-deployment" ]]; then
   # ensure we delete leftovers due to lack of disk space
-  sudo /bin/rm -rf /tmp/$INSTALLER_FILE ~/.ara \
+  sudo /bin/rm -rf $OFFLINE_INSTALLER_FILE ~/.ara \
       /opt/test /opt/stack /httpboot > /dev/null 2>&1 || true
   sudo docker ps -a --format {{.ID}} | xargs -n 1 sudo docker stop > /dev/null 2>&1 || true
   sudo docker ps -a --format {{.ID}} | xargs -n 1 sudo docker rm > /dev/null 2>&1 || true
   sudo docker images -a --format {{.ID}} | xargs -n 1 sudo docker rmi -f > /dev/null 2>&1 || true
   sudo docker volume rm $(sudo docker volume ls -qf dangling=true) > /dev/null 2>&1 || true
 
+  REMOTE_ARTIFACT=$(echo $OFFLINE_INSTALLER_FILE | sed 's/.*\///g')
+
   echo "Info  : Downloading artifact from Nordix ARM..."
-  echo "        $NORDIX_ARTIFACT_URL/$INSTALLER_FILE"
+  echo "        $NORDIX_ARTIFACT_URL/$REMOTE_ARTIFACT"
   cd /tmp
-  curl -s -S -O $NORDIX_ARTIFACT_URL/$INSTALLER_FILE
+  curl -s -S -O $NORDIX_ARTIFACT_URL/$REMOTE_ARTIFACT
   echo "Info  : Downloaded the artifact for offline deployment. Extracting..."
-  echo "        $(ls -al /tmp/$INSTALLER_FILE)"
-  chmod +x /tmp/$INSTALLER_FILE
-  /tmp/$INSTALLER_FILE
-  sudo /bin/rm -rf /tmp/$INSTALLER_FILE
+  echo "        $(ls -al $OFFLINE_INSTALLER_FILE)"
+  chmod +x $OFFLINE_INSTALLER_FILE
+  $OFFLINE_INSTALLER_FILE
+  sudo /bin/rm -rf $OFFLINE_INSTALLER_FILE
 else
   echo "Info  : Online deployment. Skipping artifact download."
 fi

diff --git a/jjb/engine/scripts/generate-change-metadata.sh b/jjb/engine/scripts/generate-change-metadata.sh
index ead0a77886da01273e8e2e43c8f0597e9f1a2ada..0e510117c1803d877c17791375a0c016a6c70c46 100755 (executable)
--- a/jjb/engine/scripts/generate-change-metadata.sh
+++ b/jjb/engine/scripts/generate-change-metadata.sh
@@ -157,8 +157,8 @@ fi
 export NORDIX_ARM_HTTPS_URL="https://artifactory.nordix.org/artifactory"
 export ARTIFACT_ARM_FOLDER="gerrit"
 export BUILD_IDENTIFIER=$GERRIT_CHANGE_NUMBER
-export INSTALLER_FILE="${STACK_TYPE}-${DISTRO}.bsx"
-export BUILD_ARTIFACTS="${STACK_TYPE}-${DISTRO}.bsx"
+export OFFLINE_INSTALLER_FILE="/tmp/${STACK_TYPE}-${GERRIT_BRANCH}-${DISTRO}.bsx"
+export BUILD_ARTIFACTS="/tmp/${STACK_TYPE}-${GERRIT_BRANCH}-${DISTRO}.bsx"
 export NORDIX_ARM_REPO="nordix-${STACK_TYPE}"
 export NORDIX_ARTIFACT_URL="$NORDIX_ARM_HTTPS_URL/$NORDIX_ARM_REPO/installer/oss/$ARTIFACT_ARM_FOLDER/$BUILD_IDENTIFIER"
 
@@ -169,8 +169,8 @@ BUILT_BY=$BUILD_URL
 DISTRO=$DISTRO
 CI_LOOP=$CI_LOOP
 ENGINE_SHA=$(git rev-parse HEAD)
-INSTALLER_FILE=${STACK_TYPE}-ubuntu1804.bsx
-BUILD_ARTIFACTS=${STACK_TYPE}-ubuntu1804.bsx
+OFFLINE_INSTALLER_FILE=$OFFLINE_INSTALLER_FILE
+BUILD_ARTIFACTS=$BUILD_ARTIFACTS
 NORDIX_ARM_REPO=nordix-${STACK_TYPE}
 NORDIX_ARTIFACT_URL=$NORDIX_ARTIFACT_URL
 EOF

diff --git a/jjb/engine/scripts/upload-artifact.sh b/jjb/engine/scripts/upload-artifact.sh
index fe2374217f2ea81586a9af2965a37427ba9c9447..b63a02449ba82b2489aead182dd273d7a1a52d1a 100755 (executable)
--- a/jjb/engine/scripts/upload-artifact.sh
+++ b/jjb/engine/scripts/upload-artifact.sh
@@ -32,6 +32,9 @@ if [[ "$EXECUTION_MODE" == "packaging" || "$EXECUTION_MODE" == "offline-deployme
     ARTIFACT_SHASUM=$(shasum $BUILD_ARTIFACT | cut -d' ' -f1)
     ARTIFACT_SHA256SUM=$(sha256sum $BUILD_ARTIFACT | cut -d' ' -f1)
 
+    # NOTE (fdegir): get rid of /tmp from BUILD_ARTIFACT
+    REMOTE_ARTIFACT=$(echo $BUILD_ARTIFACT | sed 's/.*\///g')
+
     echo "Info  : Uploading $BUILD_ARTIFACT to Nordix Artifactory"
     curl -s -S \
         -H "X-JFrog-Art-Api:$NORDIX_ARM_TOKEN" \
@@ -39,8 +42,8 @@ if [[ "$EXECUTION_MODE" == "packaging" || "$EXECUTION_MODE" == "offline-deployme
         -H "X-Checksum-Sha1:$ARTIFACT_SHASUM" \
         -H "X-Checksum-Sha256:$ARTIFACT_SHA256SUM" \
         -T $BUILD_ARTIFACT \
-        "$NORDIX_ARTIFACT_URL/$BUILD_ARTIFACT"
-    echo "Info  : Artifact $BUILD_ARTIFACT is available on $NORDIX_ARTIFACT_URL/$BUILD_ARTIFACT"
+        "$NORDIX_ARTIFACT_URL/$REMOTE_ARTIFACT"
+    echo "Info  : Artifact $BUILD_ARTIFACT is available on $NORDIX_ARTIFACT_URL/$REMOTE_ARTIFACT"
   done
 else
   echo "Info  : Online deployment. No artifact to upload."