engine: Use multi-worker heat template in CI

Also remove obsolete HEAT_ENVIRONMENT_FILE parameter and env
variable since heat env file is not provided as PDF using -p.

Change-Id: I3086426937b3b44ee36f7b2b6ba7a2732e298e02

diff --git a/jjb/cloud-infra/engine-jobs/engine-verify-deploy-test.yaml b/jjb/cloud-infra/engine-jobs/engine-verify-deploy-test.yaml
index 7834f1b09b99b94a12ad9ca317c9bb30ca158fea..4daf2ef67e6c44dcdf7c62aeb9096b5fd0f5511f 100644 (file)
--- a/jjb/cloud-infra/engine-jobs/engine-verify-deploy-test.yaml
+++ b/jjb/cloud-infra/engine-jobs/engine-verify-deploy-test.yaml
@@ -58,7 +58,7 @@
           provisioner-type: 'heat'
           slave-type: 'jumphost'
           gated-projects: 'infra/engine|infra/provisioner/heat'
-          pdf: "https://gerrit.nordix.org/gitweb?p=infra/provisioner/heat.git;a=blob_plain;f=playbooks/roles/create-stack/files/heat-environment-city-ubuntu1804.yaml"
+          pdf: "https://gerrit.nordix.org/gitweb?p=infra/provisioner/heat.git;a=blob_plain;f=playbooks/roles/create-stack/files/heat-environment-ci-city-ubuntu1804.yaml"
           idf: "https://gerrit.nordix.org/gitweb?p=infra/provisioner/heat.git;a=blob_plain;f=playbooks/roles/create-stack/files/heat-idf.yaml"
 
     distro:
@@ -113,10 +113,6 @@
           name: IDF
           default: '{idf}'
           description: 'IDF file to use for deployment'
-      - string:
-          name: HEAT_ENVIRONMENT_FILENAME
-          default: 'heat-environment-{cloud}-{distro}.yaml'
-          description: 'Name of heat-environment file to use.'
       - string:
           name: HEAT_STACK_NAME
           default: "nordix-cicd-verify-engine-{environment-type}-{distro}-$GERRIT_CHANGE_NUMBER"

diff --git a/jjb/cloud-infra/ironic-jobs/ironic-verify-provision.yaml b/jjb/cloud-infra/ironic-jobs/ironic-verify-provision.yaml
index 827fb09b2916e3bfcaf3869c368fb84987c90725..edcf4175ec4184ad454054bee71a536fa52f9fc6 100644 (file)
--- a/jjb/cloud-infra/ironic-jobs/ironic-verify-provision.yaml
+++ b/jjb/cloud-infra/ironic-jobs/ironic-verify-provision.yaml
@@ -103,10 +103,6 @@
           name: IDF
           default: '{idf}'
           description: 'IDF file to use for deployment'
-      - string:
-          name: HEAT_ENVIRONMENT_FILENAME
-          default: 'heat-environment-{cloud}-{distro}.yaml'
-          description: 'Name of heat-environment file to use.'
       - string:
           name: HEAT_STACK_NAME
           default: "nordix-cicd-verify-ironic-{environment-type}-{distro}-$GERRIT_CHANGE_NUMBER"

diff --git a/jjb/cloud-infra/kubernetes-jobs/kubernetes-verify-deploy-test.yaml b/jjb/cloud-infra/kubernetes-jobs/kubernetes-verify-deploy-test.yaml
index cab7e12d2e4eacd7ad8e1b47bb6cdf37d38c5b52..42e3e3e7b710910164b9ec8dd9ee23e6aee499c9 100644 (file)
--- a/jjb/cloud-infra/kubernetes-jobs/kubernetes-verify-deploy-test.yaml
+++ b/jjb/cloud-infra/kubernetes-jobs/kubernetes-verify-deploy-test.yaml
@@ -70,7 +70,7 @@
           provisioner-type: 'heat'
           slave-type: 'jumphost'
           gated-projects: 'infra/stack/kubernetes|infra/installer/kubespray'
-          pdf: "https://gerrit.nordix.org/gitweb?p=infra/provisioner/heat.git;a=blob_plain;f=playbooks/roles/create-stack/files/heat-environment-city-ubuntu1804.yaml"
+          pdf: "https://gerrit.nordix.org/gitweb?p=infra/provisioner/heat.git;a=blob_plain;f=playbooks/roles/create-stack/files/heat-environment-ci-city-ubuntu1804.yaml"
           idf: "https://gerrit.nordix.org/gitweb?p=infra/provisioner/heat.git;a=blob_plain;f=playbooks/roles/create-stack/files/heat-idf.yaml"
 
     distro:
@@ -125,10 +125,6 @@
           name: IDF
           default: '{idf}'
           description: 'IDF file to use for deployment'
-      - string:
-          name: HEAT_ENVIRONMENT_FILENAME
-          default: 'heat-environment-{cloud}-{distro}.yaml'
-          description: 'Name of heat-environment file to use.'
       - string:
           name: HEAT_STACK_NAME
           default: "nordix-cicd-verify-kubernetes-{environment-type}-{distro}-$GERRIT_CHANGE_NUMBER"

diff --git a/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml b/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
index c34477e0452ff72337be79af755c40b6b87fb432..610fb6352c12b71544bf3d519fdbeb05ce9de0dc 100644 (file)
--- a/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
@@ -58,7 +58,7 @@
           provisioner-type: 'heat'
           slave-type: 'jumphost'
           gated-projects: 'infra/stack/onap|infra/installer/oom'
-          pdf: "https://gerrit.nordix.org/gitweb?p=infra/provisioner/heat.git;a=blob_plain;f=playbooks/roles/create-stack/files/heat-environment-city-ubuntu1804.yaml"
+          pdf: "https://gerrit.nordix.org/gitweb?p=infra/provisioner/heat.git;a=blob_plain;f=playbooks/roles/create-stack/files/heat-environment-ci-city-ubuntu1804.yaml"
           idf: "https://gerrit.nordix.org/gitweb?p=infra/provisioner/heat.git;a=blob_plain;f=playbooks/roles/create-stack/files/heat-idf.yaml"
 
     distro:
@@ -113,10 +113,6 @@
           name: IDF
           default: '{idf}'
           description: 'IDF file to use for deployment'
-      - string:
-          name: HEAT_ENVIRONMENT_FILENAME
-          default: 'heat-environment-{cloud}-{distro}.yaml'
-          description: 'Name of heat-environment file to use.'
       - string:
           name: HEAT_STACK_NAME
           default: "nordix-cicd-verify-onap-{environment-type}-{distro}-$GERRIT_CHANGE_NUMBER"

diff --git a/jjb/cloud-infra/openstack-jobs/openstack-verify-deploy-test.yaml b/jjb/cloud-infra/openstack-jobs/openstack-verify-deploy-test.yaml
index 659cfd2224f86fa1c8e2dfd7c533f34b1c9431de..deab833051408cc75f19a2806f4303e8ba7a573e 100644 (file)
--- a/jjb/cloud-infra/openstack-jobs/openstack-verify-deploy-test.yaml
+++ b/jjb/cloud-infra/openstack-jobs/openstack-verify-deploy-test.yaml
@@ -110,10 +110,6 @@
           name: IDF
           default: '{idf}'
           description: 'IDF file to use for deployment'
-      - string:
-          name: HEAT_ENVIRONMENT_FILENAME
-          default: 'heat-environment-{cloud}-{distro}.yaml'
-          description: 'Name of heat-environment file to use.'
       - string:
           name: HEAT_STACK_NAME
           default: "nordix-cicd-verify-openstack-{environment-type}-{distro}-$GERRIT_CHANGE_NUMBER"

diff --git a/jjb/cloud-infra/scripts/deploy.sh b/jjb/cloud-infra/scripts/deploy.sh
index 1f0f7b16118446f07c771a0bc876e733e6616284..2c160489917cc78d3dd1e4b891fbed47f2820165 100755 (executable)
--- a/jjb/cloud-infra/scripts/deploy.sh
+++ b/jjb/cloud-infra/scripts/deploy.sh
@@ -44,9 +44,8 @@ else
   ENGINE_ROOT_DIR="$WORKSPACE"
 fi
 
-# NOTE (fdegir): for bifrost based deployments, we don't need these files so we fake them
+# NOTE (fdegir): for bifrost based deployments, we don't need openrc file so we fake it
 OPENRC_FILE=${OPENRC_FILE:-/tmp/openrc}
-HEAT_ENVIRONMENT_FILENAME=${HEAT_ENVIRONMENT_FILENAME:-/tmp/heat}
 
 /bin/cp -f $OPENRC_FILE /tmp/openrc