From: Fatih Degirmenci Date: Tue, 25 Aug 2020 11:10:12 +0000 (+0000) Subject: Set STACK_TYPE for ironic verify jobs X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F12%2F5812%2F1;p=infra%2Fcicd.git Set STACK_TYPE for ironic verify jobs Ironic verify jobs should verify the change for Ironic stack and not Kubernetes stack. This change updates the script generating change metadata to allow overriding STACK_TYPE and sets STACK_TYPE to ironic in Ironic verify job explicitly. Change-Id: I5f057cd3b8e02ec58446e422924061c31c2b3ec1 --- diff --git a/jjb/cloud-infra/ironic-jobs/ironic-verify-provision.yaml b/jjb/cloud-infra/ironic-jobs/ironic-verify-provision.yaml index 84ee3eb5..91d5efff 100644 --- a/jjb/cloud-infra/ironic-jobs/ironic-verify-provision.yaml +++ b/jjb/cloud-infra/ironic-jobs/ironic-verify-provision.yaml @@ -88,6 +88,10 @@ name: SLAVE_LABEL default: 'engine-{slave-type}-{environment-type}-ubuntu1804-fra' description: 'Slave label to schedule this job on.' + - string: + name: STACK_TYPE + default: 'ironic' + description: 'Stack type to verify change with' - string: name: HW_TYPE default: '{type}' diff --git a/jjb/cloud-infra/scripts/generate-change-metadata.sh b/jjb/cloud-infra/scripts/generate-change-metadata.sh index 73f88974..e2c6a0f0 100755 --- a/jjb/cloud-infra/scripts/generate-change-metadata.sh +++ b/jjb/cloud-infra/scripts/generate-change-metadata.sh @@ -141,8 +141,10 @@ elif [[ "$GERRIT_PROJECT" =~ /installer/ ]]; then echo "NORDIX_$(echo $ENGINE_COMPONENT | tr a-z A-Z)_VERSION=$GERRIT_PATCHSET_REVISION" >> "$CHANGE_METADATA_FILE" echo "NORDIX_$(echo $ENGINE_COMPONENT | tr a-z A-Z)_REFSPEC=$GERRIT_REFSPEC" >> "$CHANGE_METADATA_FILE" else + # NOTE (fdegir): if the change comes into provisioner repos, we need to set the stack type + # properly for the jobs verifying those changes # set vars - export STACK_TYPE=kubernetes + export STACK_TYPE="${STACK_TYPE:-kubernetes}" export STACK_VERSION=$GERRIT_BRANCH # record vars to properties file