X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fengine%2Fscripts%2Fgenerate-change-metadata.sh;h=219c186a52809c0a8c5ae1b2bc48960033b1e0aa;hb=refs%2Fchanges%2F64%2F5264%2F3;hp=c9d287bd6e8578bdc43c8d427b7845dcc198c17a;hpb=9f2d4dc236f14048646350f92b9bb8b2a9cee5c9;p=infra%2Fcicd.git

diff --git a/jjb/engine/scripts/generate-change-metadata.sh b/jjb/engine/scripts/generate-change-metadata.sh
index c9d287bd..219c186a 100755
--- a/jjb/engine/scripts/generate-change-metadata.sh
+++ b/jjb/engine/scripts/generate-change-metadata.sh
@@ -30,12 +30,10 @@ 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
- export CHANGE_METADATA_FILE="$WORKSPACE/change.properties"
+export CHANGE_METADATA_FILE="$WORKSPACE/change.properties"
 /bin/rm -f "$CHANGE_METADATA_FILE"
 
 echo "Info  : Generating change metadata"
@@ -53,11 +51,13 @@ if [[ "$GERRIT_PROJECT" =~ /stack/ ]]; then
 
   # log info to console
   echo "        STACK_TYPE=$STACK_TYPE"
+  echo "        DEPLOY_SCENARIO=$DEPLOY_SCENARIO"
   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 "DEPLOY_SCENARIO=$DEPLOY_SCENARIO" >> "$CHANGE_METADATA_FILE"
   echo "STACK_VERSION=$STACK_VERSION" >> "$CHANGE_METADATA_FILE"
   echo "STACK_REFSPEC=$STACK_REFSPEC" >> "$CHANGE_METADATA_FILE"
 elif [[ "$GERRIT_PROJECT" =~ /installer/ ]]; then
@@ -65,12 +65,15 @@ elif [[ "$GERRIT_PROJECT" =~ /installer/ ]]; then
   case "${ENGINE_COMPONENT}" in
     kolla)
       export STACK_TYPE="openstack"
+      echo "Info  : Deploy scenario is overriden by job to $DEPLOY_SCENARIO"
       ;;
     kubespray)
       export STACK_TYPE="kubernetes"
+      echo "Info  : Deploy scenario is overriden by job to $DEPLOY_SCENARIO"
       ;;
     oom)
       export STACK_TYPE="onap"
+      echo "Info  : Deploy scenario is overriden by job to $DEPLOY_SCENARIO"
       ;;
     *) echo "ERROR : Invalid engine component $ENGINE_COMPONENT"; exit 1;;
   esac
@@ -78,12 +81,14 @@ elif [[ "$GERRIT_PROJECT" =~ /installer/ ]]; then
 
   # log info to console
   echo "        STACK_TYPE=$STACK_TYPE"
+  echo "        DEPLOY_SCENARIO=$DEPLOY_SCENARIO"
   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 "DEPLOY_SCENARIO=$DEPLOY_SCENARIO" >> "$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"
@@ -94,12 +99,14 @@ else
 
   # log info to console
   echo "        STACK_TYPE=$STACK_TYPE"
+  echo "        DEPLOY_SCENARIO=$DEPLOY_SCENARIO"
   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_TYPE=$STACK_TYPE" >> "$CHANGE_METADATA_FILE"
+  echo "DEPLOY_SCENARIO=$DEPLOY_SCENARIO" >> "$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"
@@ -109,8 +116,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"
 
@@ -118,6 +125,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