Write change.properties file for scenario-verify jobs

Change-Id: Ia27182ee90377c470835745763427e05e21a03d6

diff --git a/jjb/cloud-infra/cloud-infra-macros.yaml b/jjb/cloud-infra/cloud-infra-macros.yaml
index a7185aef80f694e2c5b6b2131d96fac8c3d16348..268c9877a0acdc6234b27e7329936288a6bdba89 100644 (file)
--- 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 e9d7649913902f48edd0db2a01593168b676d4c7..d3ef11f7850b0f2a881f4f49e9268fef9bd61570 100644 (file)
--- 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: