-echo "Info : Generating job metadata"
-cat << EOF > "$WORKSPACE/job.properties"
-BUILD_IDENTIFIER="$(date '+%Y%m%d%H%M')"
-PROMOTED_BY="$BUILD_URL"
-NORDIX_ARTIFACT_URL="$NORDIX_ARM_HTTPS_URL/$NORDIX_ARM_REPO/installer/oss/release/$BUILD_IDENTIFIER"
-ENGINE_SHA="$(git rev-parse HEAD)"
+# need to generate the identifier before writing it
+if [[ "$CI_LOOP" == "verify" ]]; then
+ BUILD_IDENTIFIER=$GERRIT_CHANGE_NUMBER
+elif [[ "$CI_LOOP" == "periodic" ]]; then
+ BUILD_IDENTIFIER="$(date '+%Y%m%d%H%M')"
+else
+ echo "Error : Unrecognized CI Loop $CI_LOOP"
+ exit 1
+fi
+
+echo "Info : Generating build metadata"
+cat << EOF > "$WORKSPACE/build.properties"
+BUILD_DATE=$(date '+%Y%m%d%H%M')
+BUILT_BY=$BUILD_URL
+BUILD_IDENTIFIER=$BUILD_IDENTIFIER
+CI_LOOP=$CI_LOOP
+ENGINE_SHA=$(git rev-parse HEAD)
+NORDIX_ARTIFACT_URL=$NORDIX_ARM_HTTPS_URL/$NORDIX_ARM_REPO/installer/oss/release/$BUILD_IDENTIFIER