envInject doesn't play well with variable expansion so it is fixed. [1]
Scenario support check is not necessary for promotion since the
promotion job is common for all scenarios/distros and check is done
as part of earlier distro jobs accordingly. [2]
gsutil upload is also made quiet.
Fixed version can be seen from [3].
[1] https://build.opnfv.org/ci/job/xci-merge-promote-virtual-master/2/console
[2] https://build.opnfv.org/ci/job/xci-merge-promote-virtual-master/4/console
[3] https://build.opnfv.org/ci/job/xci-merge-promote-virtual-master/5/console
Change-Id: Ie36394cab631826209dda4cea6daa456aca3c276
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
- properties-file: "$LOCAL_PROMOTION_METADATA_FILE"
+ properties-file: "/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO/scenario.properties"
- ssh-agent-wrapper
- build-timeout:
timeout: 240
- ssh-agent-wrapper
- build-timeout:
timeout: 240
-# 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"
# 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"
# upload promotion metadata file to OPNFV artifact repo
echo "Storing promotion metadata as $REMOTE_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" \
# 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" \