X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fengine%2Fscripts%2Fgenerate-change-metadata.sh;h=c9d287bd6e8578bdc43c8d427b7845dcc198c17a;hb=9f2d4dc236f14048646350f92b9bb8b2a9cee5c9;hp=f02b348065852c588a19c8ba101bba678358bbda;hpb=459c348dc363fab68f05fdb874147be83b7fa8ec;p=infra%2Fcicd.git

diff --git a/jjb/engine/scripts/generate-change-metadata.sh b/jjb/engine/scripts/generate-change-metadata.sh
index f02b3480..c9d287bd 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
@@ -44,23 +40,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,20 +74,33 @@ 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"
   echo "NORDIX_$(echo $ENGINE_COMPONENT | tr a-z A-Z)_REFSPEC=$GERRIT_REFSPEC" >> "$CHANGE_METADATA_FILE"
 fi