onap-jjb: Enable daily pipelines for master

Change-Id: Ib630c8785ea95340b06224c55d2c51f0bb19470e

diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
index 6badee1cbbd59ee59c1d83f36bae719a15ea4d0d..e4d13a7d3fb4246c42b9f792f59237094be0354f 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
@@ -32,7 +32,7 @@
       - city:
           slave-label: 'city-jumphost-ubuntu1804'
           openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-onap'
-          daily-trigger: '#@midnight'
+          daily-trigger: '@midnight'
       - xerces:
           slave-label: 'xerces-jumphost-ubuntu1804'
           openrc-credentials-file: 'est-estinfra-openrcfile-xerces-lund-onap'
@@ -506,7 +506,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'
 
     wrappers:

diff --git a/jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml b/jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml
index cbda1d280821389ca80489814d5b85b2ee791e2f..52bf8f91fb17615b6157e0fc43ebf04ab1a630f1 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml
@@ -342,7 +342,7 @@
           description: 'Heat environment filename to use for creating the stack'
       - 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: 'Heat environment file location to use for creating the stack'
       - string:
           name: ENGINE_VERSION