cloud-infra: Update engine cache location in jobs

[infra/cicd.git] / jjb / cloud-infra / cloud-infra-periodic-onap.yaml

diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
index a0f2fcae582e0f1c1b0b89e35b6ed59179c260ab..d3456d3ef7fd490d76e0185c77cb9c88c3b3acda 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
@@ -143,6 +143,9 @@
       - string:
           name: STACK_NAME
           default: 'nordix-cicd-{deploy-scenario}-{onap-branch}-{onap-flavor}'
+      - string:
+          name: KEYPAIR_NAME
+          default: 'keypair-nordix-cicd-{deploy-scenario}-{onap-branch}-{onap-flavor}'
       - string:
           name: HEAT_ENVIRONMENT_FILENAME
           default: "heat-environment-{cloud}-{distro}-full.yaml"
@@ -232,6 +235,7 @@
                 ONAP_FLAVOR=$ONAP_FLAVOR
                 POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
                 HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
@@ -262,6 +266,7 @@
                 TEST_TYPE=oom-healthcheck
                 POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
                 HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
@@ -293,6 +298,7 @@
                 TEST_TYPE=onap-healthcheck
                 POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
                 HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
@@ -319,6 +325,7 @@
                 TEST_TYPE=onap-healthcheck
                 POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
                 HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
@@ -345,6 +352,7 @@
                 TEST_TYPE=onap-healthcheck
                 POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
                 HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
@@ -371,6 +379,7 @@
                 TEST_TYPE=onap-healthcheck
                 POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
                 HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
@@ -397,6 +406,7 @@
                 TEST_TYPE=onap-healthcheck
                 POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
                 HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
@@ -427,6 +437,7 @@
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
                 POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
                 HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION
                 DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC
@@ -495,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:
@@ -564,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