X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fengine%2Fscripts%2Fgenerate-change-metadata.sh;h=2ad1e5fece6a4c3c07ecbefb0cb953aebdf8c986;hb=de51df03efb9fc0cfc2d0ca5c757727c6c6c044e;hp=680042298c9d76194c63112107b38e268112d05d;hpb=bd007e1ae6dc49eb1c0e47442fe8a9226fd1a5a9;p=infra%2Fcicd.git

diff --git a/jjb/engine/scripts/generate-change-metadata.sh b/jjb/engine/scripts/generate-change-metadata.sh
index 68004229..2ad1e5fe 100755
--- a/jjb/engine/scripts/generate-change-metadata.sh
+++ b/jjb/engine/scripts/generate-change-metadata.sh
@@ -19,10 +19,6 @@
 # ============LICENSE_END=========================================================
 
 
-# NOTES (fdegir): this script only works for
-# - infra/engine
-# - infra/provisioner/heat
-
 set -o nounset
 set -o errexit
 set -o pipefail
@@ -34,8 +30,6 @@ if [[ "$GERRIT_PROJECT" != "infra/engine" ]]; then
   echo "Info : Cloning infra/engine repository"
   git clone -q https://gerrit.nordix.org/infra/engine.git "$WORKSPACE"
   cd "$WORKSPACE"
-  # TODO (fdegir): this is temporarily here to develop the jobs
-  git fetch "https://gerrit.nordix.org/infra/engine" refs/changes/23/4823/18 && git checkout FETCH_HEAD
 fi
 
 # file to record change metadata
@@ -44,23 +38,28 @@ fi
 
 echo "Info  : Generating change metadata"
 
-# TODO (fdegir): this should match to the branch of the job for {stack}-verify jobs
-export STACK_VERSION=master
-
 # determine the project
 # this scripts is used by all engine repos so we need to determine what this change is for
 export ENGINE_COMPONENT="${GERRIT_PROJECT//*\//}"
 
+echo "Info  : Setting STACK_TYPE and STACK_VERSION"
 if [[ "$GERRIT_PROJECT" =~ /stack/ ]]; then
+  # set vars
   export STACK_TYPE="$ENGINE_COMPONENT"
-  echo "Info  : Setting STACK_TYPE, STACK_VERSION and STACK_REFSPEC"
+  export STACK_VERSION="$GERRIT_PATCHSET_REVISION"
+  export STACK_REFSPEC="$GERRIT_REFSPEC"
+
+  # log info to console
   echo "        STACK_TYPE=$STACK_TYPE"
   echo "        STACK_VERSION=$GERRIT_PATCHSET_REVISION"
   echo "        STACK_REFSPEC=$GERRIT_REFSPEC"
+
+  # record vars to properties file
   echo "STACK_TYPE=$STACK_TYPE" >> "$CHANGE_METADATA_FILE"
-  echo "STACK_VERSION=$GERRIT_PATCHSET_REVISION" >> "$CHANGE_METADATA_FILE"
-  echo "STACK_REFSPEC=$GERRIT_REFSPEC" >> "$CHANGE_METADATA_FILE"
+  echo "STACK_VERSION=$STACK_VERSION" >> "$CHANGE_METADATA_FILE"
+  echo "STACK_REFSPEC=$STACK_REFSPEC" >> "$CHANGE_METADATA_FILE"
 elif [[ "$GERRIT_PROJECT" =~ /installer/ ]]; then
+  # set vars
   case "${ENGINE_COMPONENT}" in
     kolla)
       export STACK_TYPE="openstack"
@@ -73,19 +72,31 @@ elif [[ "$GERRIT_PROJECT" =~ /installer/ ]]; then
       ;;
     *) echo "ERROR : Invalid engine component $ENGINE_COMPONENT"; exit 1;;
   esac
+  export STACK_VERSION="$GERRIT_BRANCH"
 
-  echo "Info  : Setting STACK_TYPE, STACK_VERSION and STACK_REFSPEC"
+  # log info to console
   echo "        STACK_TYPE=$STACK_TYPE"
   echo "        STACK_VERSION=$STACK_VERSION"
   echo "        NORDIX_$(echo $ENGINE_COMPONENT | tr a-z A-Z)_VERSION=$GERRIT_PATCHSET_REVISION"
   echo "        NORDIX_$(echo $ENGINE_COMPONENT | tr a-z A-Z)_REFSPEC=$GERRIT_REFSPEC"
+
+  # record vars to properties file
   echo "STACK_TYPE=$STACK_TYPE" >> "$CHANGE_METADATA_FILE"
   echo "STACK_VERSION=$STACK_VERSION" >> "$CHANGE_METADATA_FILE"
   echo "NORDIX_$(echo $ENGINE_COMPONENT | tr a-z A-Z)_VERSION=$GERRIT_PATCHSET_REVISION" >> "$CHANGE_METADATA_FILE"
   echo "NORDIX_$(echo $ENGINE_COMPONENT | tr a-z A-Z)_REFSPEC=$GERRIT_REFSPEC" >> "$CHANGE_METADATA_FILE"
 else
+  # set vars
   export STACK_TYPE=kubernetes
-  export STACK_VERSION=$STACK_VERSION
+  export STACK_VERSION=$GERRIT_BRANCH
+
+  # log info to console
+  echo "        STACK_TYPE=$STACK_TYPE"
+  echo "        STACK_VERSION=$STACK_VERSION"
+  echo "        NORDIX_$(echo $ENGINE_COMPONENT | tr a-z A-Z)_VERSION=$GERRIT_PATCHSET_REVISION"
+  echo "        NORDIX_$(echo $ENGINE_COMPONENT | tr a-z A-Z)_REFSPEC=$GERRIT_REFSPEC"
+
+  # record vars to properties file
   echo "STACK_TYPE=kubernetes" >> "$CHANGE_METADATA_FILE"
   echo "STACK_VERSION=$STACK_VERSION" >> "$CHANGE_METADATA_FILE"
   echo "NORDIX_$(echo $ENGINE_COMPONENT | tr a-z A-Z)_VERSION=$GERRIT_PATCHSET_REVISION" >> "$CHANGE_METADATA_FILE"
@@ -96,8 +107,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}-ubuntu1804.bsx"
-export BUILD_ARTIFACTS="${STACK_TYPE}-ubuntu1804.bsx"
+export INSTALLER_FILE="${STACK_TYPE}-${DISTRO}.bsx"
+export BUILD_ARTIFACTS="${STACK_TYPE}-${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"
 
@@ -105,6 +116,7 @@ cat << EOF >> "$CHANGE_METADATA_FILE"
 BUILD_IDENTIFIER=$BUILD_IDENTIFIER
 BUILD_DATE=$(date '+%Y%m%d%H%M')
 BUILT_BY=$BUILD_URL
+DISTRO=$DISTRO
 CI_LOOP=$CI_LOOP
 ENGINE_SHA=$(git rev-parse HEAD)
 INSTALLER_FILE=${STACK_TYPE}-ubuntu1804.bsx