Skip to content

Commit b8881de

Browse files
authored
azurestack: Move to WWT environment. (#38670)
Reusing the WWT steps used by QE team to install a cluster on azurestack for the e2e-azurestack tests in order to move from the deprecated PPE environment to WWT.
1 parent 8b9b279 commit b8881de

File tree

10 files changed

+28
-44
lines changed

10 files changed

+28
-44
lines changed

ci-operator/config/openshift/installer/openshift-installer-master.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -658,17 +658,19 @@ tests:
658658
workflow: ipi-aws
659659
timeout: 6h0m0s
660660
- as: e2e-azurestack
661+
cluster: build01
661662
optional: true
662663
run_if_changed: (azure|azurestack)
663664
steps:
664-
cluster_profile: azurestack
665+
cluster_profile: azurestack-qe
665666
workflow: openshift-e2e-azurestack
666667
timeout: 6h0m0s
667668
- as: e2e-azurestack-upi
669+
cluster: build01
668670
optional: true
669671
run_if_changed: ^(upi/(azure|azurestack)/.*)
670672
steps:
671-
cluster_profile: azurestack
673+
cluster_profile: azurestack-qe
672674
workflow: openshift-e2e-azurestack-upi
673675
timeout: 6h0m0s
674676
- as: e2e-ibmcloud-ovn

ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml

+8-6
Original file line numberDiff line numberDiff line change
@@ -2877,14 +2877,15 @@ presubmits:
28772877
branches:
28782878
- ^master$
28792879
- ^master-
2880-
cluster: build04
2880+
cluster: build01
28812881
context: ci/prow/e2e-azurestack
28822882
decorate: true
28832883
decoration_config:
28842884
timeout: 6h0m0s
28852885
labels:
28862886
ci-operator.openshift.io/cloud: azurestack
2887-
ci-operator.openshift.io/cloud-cluster-profile: azurestack
2887+
ci-operator.openshift.io/cloud-cluster-profile: azurestack-qe
2888+
ci-operator.openshift.io/cluster: build01
28882889
ci.openshift.io/generator: prowgen
28892890
pj-rehearse.openshift.io/can-be-rehearsed: "true"
28902891
name: pull-ci-openshift-installer-master-e2e-azurestack
@@ -2943,7 +2944,7 @@ presubmits:
29432944
secretName: ci-pull-credentials
29442945
- name: cluster-profile
29452946
secret:
2946-
secretName: cluster-secrets-azurestack
2947+
secretName: cluster-secrets-azurestack-qe
29472948
- name: manifest-tool-local-pusher
29482949
secret:
29492950
secretName: manifest-tool-local-pusher
@@ -2959,14 +2960,15 @@ presubmits:
29592960
branches:
29602961
- ^master$
29612962
- ^master-
2962-
cluster: build04
2963+
cluster: build01
29632964
context: ci/prow/e2e-azurestack-upi
29642965
decorate: true
29652966
decoration_config:
29662967
timeout: 6h0m0s
29672968
labels:
29682969
ci-operator.openshift.io/cloud: azurestack
2969-
ci-operator.openshift.io/cloud-cluster-profile: azurestack
2970+
ci-operator.openshift.io/cloud-cluster-profile: azurestack-qe
2971+
ci-operator.openshift.io/cluster: build01
29702972
ci.openshift.io/generator: prowgen
29712973
pj-rehearse.openshift.io/can-be-rehearsed: "true"
29722974
name: pull-ci-openshift-installer-master-e2e-azurestack-upi
@@ -3025,7 +3027,7 @@ presubmits:
30253027
secretName: ci-pull-credentials
30263028
- name: cluster-profile
30273029
secret:
3028-
secretName: cluster-secrets-azurestack
3030+
secretName: cluster-secrets-azurestack-qe
30293031
- name: manifest-tool-local-pusher
30303032
secret:
30313033
secretName: manifest-tool-local-pusher

ci-operator/step-registry/azure/deprovision/resourcegroup/azure-deprovision-resourcegroup-commands.sh

+3-20
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,9 @@ AZURE_AUTH_TENANT_ID="$(<"${AZURE_AUTH_LOCATION}" jq -r .tenantId)"
1818
if [[ "${CLUSTER_TYPE}" == "azuremag" ]]; then
1919
az cloud set --name AzureUSGovernment
2020
elif [[ "${CLUSTER_TYPE}" == "azurestack" ]]; then
21-
if [ ! -f "${CLUSTER_PROFILE_DIR}/cloud_name" ]; then
22-
echo "Unable to get specific ASH cloud name!"
23-
exit 1
24-
fi
25-
cloud_name=$(< "${CLUSTER_PROFILE_DIR}/cloud_name")
26-
27-
AZURESTACK_ENDPOINT=$(cat "${SHARED_DIR}"/AZURESTACK_ENDPOINT)
28-
SUFFIX_ENDPOINT=$(cat "${SHARED_DIR}"/SUFFIX_ENDPOINT)
29-
30-
if [[ -f "${CLUSTER_PROFILE_DIR}/ca.pem" ]]; then
31-
cp "${CLUSTER_PROFILE_DIR}/ca.pem" /tmp/ca.pem
32-
cat /usr/lib64/az/lib/python*/site-packages/certifi/cacert.pem >> /tmp/ca.pem
33-
export REQUESTS_CA_BUNDLE=/tmp/ca.pem
34-
fi
35-
az cloud register \
36-
-n ${cloud_name} \
37-
--endpoint-resource-manager "${AZURESTACK_ENDPOINT}" \
38-
--suffix-storage-endpoint "${SUFFIX_ENDPOINT}"
39-
az cloud set --name ${cloud_name}
40-
az cloud update --profile 2019-03-01-hybrid
21+
# Login using the shared dir scripts created in the ipi-conf-azurestack-commands.sh
22+
chmod +x "${SHARED_DIR}/azurestack-login-script.sh"
23+
source ${SHARED_DIR}/azurestack-login-script.sh
4124
else
4225
az cloud set --name AzureCloud
4326
fi

ci-operator/step-registry/ipi/azurestack/pre/ipi-azurestack-pre-chain.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ chain:
44
- chain: ipi-conf-azurestack
55
- ref: ipi-conf-azurestack-creds
66
- ref: ipi-conf-azurestack-rhcos
7+
- ref: ipi-conf-additional-ca-azurestack
78
- chain: ipi-install
89
documentation: |-
910
The IPI setup step contains all steps that provision an OpenShift cluster

ci-operator/step-registry/ipi/conf/azurestack/ipi-conf-azurestack-ref.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ ref:
2525
These sizes are roughly consistent across all cloud providers, but we may not be able to instantiate some sizes
2626
in some regions or accounts due to quota issues.
2727
- name: AZURESTACK_ENDPOINT
28-
default: 'https://management.ppe3.stackpoc.com'
28+
default: 'https://management.mtcazs.wwtatc.com'
2929
documentation: |-
3030
The Azure Stack Hub Endpoint to connect to.
3131
- name: SUFFIX_ENDPOINT
32-
default: "ppe3.stackpoc.com"
32+
default: "mtcazs.wwtatc.com"
3333
documentation: |-
3434
The endpoint suffix for storage accounts.
3535
documentation: |-

ci-operator/step-registry/ipi/conf/azurestack/rhcos/ipi-conf-azurestack-rhcos-commands.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ suffix_endpoint=$(cat "${SHARED_DIR}/SUFFIX_ENDPOINT")
1212
chmod +x "${SHARED_DIR}/azurestack-login-script.sh"
1313
source ${SHARED_DIR}/azurestack-login-script.sh
1414

15-
# Hard-coded storage account info for PPE3 environment.
15+
# Hard-coded storage account info for WWT environment.
1616
# The resource group, storage account, & container are expected to exist.
1717
resource_group=${RHCOS_VHD_RESOURCE_GROUP}
1818
storage_account=${RHCOS_VHD_STORAGE_ACCOUNT}

ci-operator/step-registry/ipi/conf/azurestack/rhcos/ipi-conf-azurestack-rhcos-ref.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ ref:
1212
mount_path: /var/run/azurestack-cluster-secrets
1313
env:
1414
- name: RHCOS_VHD_RESOURCE_GROUP
15-
default: "rhcos-storage-rg"
15+
default: "rhcosvhd"
1616
documentation: |-
17-
The resource group of boot image vhd, the default value is for PPE3 environment.
17+
The resource group of boot image vhd, the default value is for WWT environment.
1818
- name: RHCOS_VHD_STORAGE_ACCOUNT
19-
default: "rhcosvhdsa"
19+
default: "vhdsa"
2020
documentation: |-
21-
The storage aaccount of boot image vhd, the default value is for PPE3 environment.
21+
The storage aaccount of boot image vhd, the default value is for WWT environment.
2222
documentation: |-
2323
The IPI ASH configure RHCOS step checks whether the RHCOS image specified in COREOS stream is available in the environment, uploads it if not available, and specifies the image in the install config.

ci-operator/step-registry/ipi/deprovision/azure/resourcegroup/ipi-deprovision-azure-resourcegroup-commands.sh

+3-9
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,9 @@ AZURE_AUTH_LOCATION="${CLUSTER_PROFILE_DIR}/osServicePrincipal.json"
1818
if [ "$cloud_name" == "AzureStackCloud" ]; then
1919
AZURE_AUTH_LOCATION="${SHARED_DIR}/osServicePrincipal.json"
2020

21-
AZURESTACK_ENDPOINT=$(cat ${SHARED_DIR}/AZURESTACK_ENDPOINT)
22-
SUFFIX_ENDPOINT=$(cat ${SHARED_DIR}/SUFFIX_ENDPOINT)
23-
24-
az cloud register \
25-
-n PPE \
26-
--endpoint-resource-manager "${AZURESTACK_ENDPOINT}" \
27-
--suffix-storage-endpoint "${SUFFIX_ENDPOINT}"
28-
az cloud set -n PPE
29-
az cloud update --profile 2019-03-01-hybrid
21+
# Login using the shared dir scripts created in the ipi-conf-azurestack-commands.sh
22+
chmod +x "${SHARED_DIR}/azurestack-login-script.sh"
23+
source ${SHARED_DIR}/azurestack-login-script.sh
3024
fi
3125

3226
AZURE_AUTH_CLIENT_ID="$(<"${AZURE_AUTH_LOCATION}" jq -r .clientId)"

ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-commands.sh

+1
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ azure4|azure-arm64) export TEST_PROVIDER=azure;;
131131
azurestack)
132132
export TEST_PROVIDER="none"
133133
export AZURE_AUTH_LOCATION=${SHARED_DIR}/osServicePrincipal.json
134+
export SSL_CERT_FILE="${CLUSTER_PROFILE_DIR}/ca.pem"
134135
;;
135136
vsphere)
136137
# shellcheck disable=SC1090

ci-operator/step-registry/upi/azurestack/pre/upi-azurestack-pre-chain.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ chain:
55
- chain: ipi-conf-azurestack
66
- ref: ipi-conf-azurestack-creds
77
- ref: ipi-conf-azurestack-rhcos
8+
- ref: ipi-conf-additional-ca-azurestack
89
- ref: upi-install-azurestack
910
- ref: ipi-install-times-collection
1011
documentation: >-

0 commit comments

Comments
 (0)