From fcf1625b33c598f764eac0bcd21d98568683abab Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Tue, 7 May 2019 11:00:11 +0200 Subject: [PATCH] Write change.properties file for scenario-verify jobs Change-Id: Ia27182ee90377c470835745763427e05e21a03d6 --- jjb/cloud-infra/cloud-infra-macros.yaml | 4 ++-- jjb/cloud-infra/determine-scenario.sh | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/jjb/cloud-infra/cloud-infra-macros.yaml b/jjb/cloud-infra/cloud-infra-macros.yaml index a7185aef8..268c9877a 100644 --- a/jjb/cloud-infra/cloud-infra-macros.yaml +++ b/jjb/cloud-infra/cloud-infra-macros.yaml @@ -52,6 +52,8 @@ - builder: name: 'cloud-infra-determine-scenario-macro' builders: + - shell: + !include-raw: ./wait-for-pkg-manager.sh - shell: !include-raw: ./determine-scenario.sh - inject: @@ -62,8 +64,6 @@ - builder: name: 'cloud-infra-scenario-deploy-macro' builders: - - shell: - !include-raw: ./wait-for-pkg-manager.sh - shell: !include-raw: ./prepare-for-scenario-deploy.sh - shell: diff --git a/jjb/cloud-infra/determine-scenario.sh b/jjb/cloud-infra/determine-scenario.sh index e9d764991..d3ef11f78 100644 --- a/jjb/cloud-infra/determine-scenario.sh +++ b/jjb/cloud-infra/determine-scenario.sh @@ -71,5 +71,17 @@ export PROJECT_GIT_URL=$GIT_BASE_HTTPS/$GERRIT_PROJECT override_installer_scenario echo "Writing change metadata to $WORKSPACE/change.properties" +cat << EOF > $WORKSPACE/change.properties +PROJECT_GIT_URL=$GIT_BASE_HTTPS/$GERRIT_PROJECT +DEPLOY_SCENARIO=$DEPLOY_SCENARIO +INSTALLER_TYPE=$INSTALLER_TYPE +GERRIT_PATCHSET_REVISION=$GERRIT_PATCHSET_REVISION +GERRIT_REFSPEC=$GERRIT_REFSPEC= +EOF + +echo "Content of change.properties" +echo "-------------------------------------------------------------------------" +cat $WORKSPACE/change.properties +echo "-------------------------------------------------------------------------" # vim: set ts=2 sw=2 expandtab: -- 2.25.1