From: Fatih Degirmenci Date: Tue, 14 Jul 2020 17:31:39 +0000 (+0000) Subject: engine: Use multi-worker heat template in CI X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=fe2f9926fb077e9c66a943c7ee4b51e6ac622dfe;p=infra%2Fcicd.git 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 7834f1b09..4daf2ef67 100644 --- 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 827fb09b2..edcf4175e 100644 --- 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 cab7e12d2..42e3e3e7b 100644 --- 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 c34477e04..610fb6352 100644 --- 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 659cfd222..deab83305 100644 --- 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 1f0f7b161..2c1604899 100755 --- 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