From d63a6e1367f282501444130ac2e13a6e0d25a69a Mon Sep 17 00:00:00 2001 From: Jinyun Ma Date: Mon, 23 Dec 2024 17:19:17 +0800 Subject: [PATCH] update QE azurestack CI jobs to run under cluster profile azurestack-qe (#60104) --- ...-installer-rehearse-azure-stack-ipi-provision-chain.yaml | 6 +++++- ...ller-rehearse-azure-stack-ipi-proxy-provision-chain.yaml | 6 +++++- ...-installer-rehearse-azure-stack-upi-provision-chain.yaml | 2 +- .../ipi/conf/azurestack/ipi-conf-azurestack-commands.sh | 2 +- .../ipi/conf/azurestack/ipi-conf-azurestack-ref.yaml | 4 ++++ 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ci-operator/step-registry/cucushift/installer/rehearse/azure/stack/ipi/provision/cucushift-installer-rehearse-azure-stack-ipi-provision-chain.yaml b/ci-operator/step-registry/cucushift/installer/rehearse/azure/stack/ipi/provision/cucushift-installer-rehearse-azure-stack-ipi-provision-chain.yaml index 8fad7649b166..58bc34bfa288 100644 --- a/ci-operator/step-registry/cucushift/installer/rehearse/azure/stack/ipi/provision/cucushift-installer-rehearse-azure-stack-ipi-provision-chain.yaml +++ b/ci-operator/step-registry/cucushift/installer/rehearse/azure/stack/ipi/provision/cucushift-installer-rehearse-azure-stack-ipi-provision-chain.yaml @@ -23,8 +23,12 @@ chain: documentation: |- The resource group of boot image vhd. - name: RHCOS_VHD_STORAGE_ACCOUNT - default: "vhdsa" + default: "vhdsaqe" documentation: |- The storage aaccount of boot image vhd. + - name: BASE_DOMAIN_RESOURCE_GROUP_NAME + default: "os4-common" + documentation: |- + The base domain resource group name documentation: |- Create an IPI cluster on Azure Stack Hub for QE e2e tests. diff --git a/ci-operator/step-registry/cucushift/installer/rehearse/azure/stack/ipi/proxy/provision/cucushift-installer-rehearse-azure-stack-ipi-proxy-provision-chain.yaml b/ci-operator/step-registry/cucushift/installer/rehearse/azure/stack/ipi/proxy/provision/cucushift-installer-rehearse-azure-stack-ipi-proxy-provision-chain.yaml index a6720ff664cb..a7f9f008232e 100644 --- a/ci-operator/step-registry/cucushift/installer/rehearse/azure/stack/ipi/proxy/provision/cucushift-installer-rehearse-azure-stack-ipi-proxy-provision-chain.yaml +++ b/ci-operator/step-registry/cucushift/installer/rehearse/azure/stack/ipi/proxy/provision/cucushift-installer-rehearse-azure-stack-ipi-proxy-provision-chain.yaml @@ -34,8 +34,12 @@ chain: documentation: |- The resource group of boot image vhd. - name: RHCOS_VHD_STORAGE_ACCOUNT - default: "vhdsa" + default: "vhdsaqe" documentation: |- The storage aaccount of boot image vhd. + - name: BASE_DOMAIN_RESOURCE_GROUP_NAME + default: "os4-common" + documentation: |- + The base domain resource group name documentation: |- Create an IPI cluster behind proxy on Azure Stack Hub for QE e2e tests. diff --git a/ci-operator/step-registry/cucushift/installer/rehearse/azure/stack/upi/provision/cucushift-installer-rehearse-azure-stack-upi-provision-chain.yaml b/ci-operator/step-registry/cucushift/installer/rehearse/azure/stack/upi/provision/cucushift-installer-rehearse-azure-stack-upi-provision-chain.yaml index 578590a12427..e3fd410abc8b 100644 --- a/ci-operator/step-registry/cucushift/installer/rehearse/azure/stack/upi/provision/cucushift-installer-rehearse-azure-stack-upi-provision-chain.yaml +++ b/ci-operator/step-registry/cucushift/installer/rehearse/azure/stack/upi/provision/cucushift-installer-rehearse-azure-stack-upi-provision-chain.yaml @@ -23,7 +23,7 @@ chain: documentation: |- The resource group of boot image vhd. - name: RHCOS_VHD_STORAGE_ACCOUNT - default: "vhdsa" + default: "vhdsaqe" documentation: |- The storage aaccount of boot image vhd. documentation: |- diff --git a/ci-operator/step-registry/ipi/conf/azurestack/ipi-conf-azurestack-commands.sh b/ci-operator/step-registry/ipi/conf/azurestack/ipi-conf-azurestack-commands.sh index 86c583ea8e13..52ff924171a4 100644 --- a/ci-operator/step-registry/ipi/conf/azurestack/ipi-conf-azurestack-commands.sh +++ b/ci-operator/step-registry/ipi/conf/azurestack/ipi-conf-azurestack-commands.sh @@ -43,7 +43,7 @@ baseDomain: ${BASE_DOMAIN} credentialsMode: Manual platform: azure: - baseDomainResourceGroupName: openshiftInstallerRG + baseDomainResourceGroupName: ${BASE_DOMAIN_RESOURCE_GROUP_NAME} region: ${LEASED_RESOURCE} cloudName: AzureStackCloud armEndpoint: ${ENDPOINT} diff --git a/ci-operator/step-registry/ipi/conf/azurestack/ipi-conf-azurestack-ref.yaml b/ci-operator/step-registry/ipi/conf/azurestack/ipi-conf-azurestack-ref.yaml index 343cc3aac9a5..e872239352c7 100644 --- a/ci-operator/step-registry/ipi/conf/azurestack/ipi-conf-azurestack-ref.yaml +++ b/ci-operator/step-registry/ipi/conf/azurestack/ipi-conf-azurestack-ref.yaml @@ -35,5 +35,9 @@ ref: default: "mtcazs.wwtatc.com" documentation: |- The endpoint suffix for storage accounts. + - name: BASE_DOMAIN_RESOURCE_GROUP_NAME + default: "openshiftInstallerRG" + documentation: |- + The base domain resource group name documentation: |- The IPI ASH configure step generates the Azure Stack Hub specific install-config.yaml contents based on the cluster profile and optional input files.