cloud-infra: Update engine cache location in jobs

Change-Id: Ibd577fe4d6302ea9c0bbc60235fe985497066484

diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
index e4d13a7d3fb4246c42b9f792f59237094be0354f..d3456d3ef7fd490d76e0185c77cb9c88c3b3acda 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
@@ -575,7 +575,7 @@
           description: 'Type of the deployment'
       - string:
           name: HEAT_ENVIRONMENT_FILE
-          default: "file://$WORKSPACE/.cache/repos/swconfig/scenarios/$DEPLOY_SCENARIO/$INSTALLER_TYPE/role/$DEPLOY_SCENARIO/files/$HEAT_ENVIRONMENT_FILENAME"
+          default: "file:///opt/engine/.cache/repos/swconfig/scenarios/$DEPLOY_SCENARIO/$INSTALLER_TYPE/role/$DEPLOY_SCENARIO/files/$HEAT_ENVIRONMENT_FILENAME"
           description: 'Type of the deployment'
       - string:
           name: ENGINE_VERSION

diff --git a/jjb/cloud-infra/onap-deploy.sh b/jjb/cloud-infra/onap-deploy.sh
index b348bbd68c8090a3c22423438ebb2ca925a02e0e..3c210ef3ab5b66b664f372e698066869a205ed15 100644 (file)
--- a/jjb/cloud-infra/onap-deploy.sh
+++ b/jjb/cloud-infra/onap-deploy.sh
@@ -71,5 +71,5 @@ cd $WORKSPACE
   -s $DEPLOY_SCENARIO -e $HEAT_ENVIRONMENT_FILE
 
 cd $WORKSPACE
-/bin/cp $WORKSPACE/.cache/config/inventory.ini ../inventory.ini
+/bin/cp /opt/engine/.cache/config/inventory.ini ../inventory.ini
 # vim: set ts=2 sw=2 expandtab:

diff --git a/jjb/cloud-infra/scripts/spinnaker-deploy.sh b/jjb/cloud-infra/scripts/spinnaker-deploy.sh
index bef1b12a9d0f209cdf1f40f0a73bc4297a1f4542..34e6e1e9cbd9a48e73f5fa172d768d56bcff48cb 100644 (file)
--- a/jjb/cloud-infra/scripts/spinnaker-deploy.sh
+++ b/jjb/cloud-infra/scripts/spinnaker-deploy.sh
@@ -71,6 +71,6 @@ cd $WORKSPACE
   -s $DEPLOY_SCENARIO -e $HEAT_ENVIRONMENT_FILE
 
 cd $WORKSPACE
-/bin/cp $WORKSPACE/.cache/config/inventory.ini ../inventory.ini
+/bin/cp /opt/engine/.cache/config/inventory.ini ../inventory.ini
 
 # vim: set ts=2 sw=2 expandtab: