X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fxci%2Fxci-promote.sh;h=d8d61bee2153358a66e39a2f79ae19c0700f3d3b;hb=bede394dae3cc0f577a35a10880ea1f9fceeebbc;hp=3a236781996b70da2a5759cdfe9c08134f017060;hpb=c825697ac7f5afac76354faac6421e60c9827e10;p=releng.git diff --git a/jjb/xci/xci-promote.sh b/jjb/xci/xci-promote.sh index 3a2367819..d8d61bee2 100755 --- a/jjb/xci/xci-promote.sh +++ b/jjb/xci/xci-promote.sh @@ -23,13 +23,6 @@ if [[ "$GERRIT_TOPIC" =~ skip-verify|skip-deployment ]]; then exit 0 fi -# skip the deployment if the scenario is not supported on this distro -OPNFV_SCENARIO_REQUIREMENTS=$WORKSPACE/xci/opnfv-scenario-requirements.yml -if ! sed -n "/^- scenario: $DEPLOY_SCENARIO$/,/^$/p" $OPNFV_SCENARIO_REQUIREMENTS | grep -q $DISTRO; then - echo "# SKIPPED: Scenario $DEPLOY_SCENARIO is NOT supported on $DISTRO" - exit 0 -fi - # fail if promotion metadata file doesn't exist if [ ! -f $LOCAL_PROMOTION_METADATA_FILE ]; then echo "Unable to find promotion metadata file $LOCAL_PROMOTION_METADATA_FILE" @@ -37,12 +30,17 @@ if [ ! -f $LOCAL_PROMOTION_METADATA_FILE ]; then exit 1 fi +# put additional info into the metadata file so we can use that for displaying the information +echo "PROMOTED_BY=$BUILD_URL" >> $LOCAL_PROMOTION_METADATA_FILE +echo "PROMOTED_ON=$(date -u '+%F_%H:%M'UTC)" >> $LOCAL_PROMOTION_METADATA_FILE + # upload promotion metadata file to OPNFV artifact repo echo "Storing promotion metadata as $REMOTE_PROMOTION_METADATA_FILE" -gsutil cp $LOCAL_PROMOTION_METADATA_FILE $REMOTE_PROMOTION_METADATA_FILE +gsutil cp $LOCAL_PROMOTION_METADATA_FILE $REMOTE_PROMOTION_METADATA_FILE > /dev/null 2>&1 # update the file metadata on gs to prevent the use of cached version of the file -gsutil -m setmeta -r -h "Cache-Control:private, max-age=0, no-transform" \ +gsutil -m setmeta -r -h "Content-Type:text/html" \ + -h "Cache-Control:private, max-age=0, no-transform" \ $REMOTE_PROMOTION_METADATA_FILE > /dev/null 2>&1 # log the metadata to console