openshift · openshift-merge-robot · Dec 5, 2022 · Aug 24, 2022
diff --git a/...hift/verification-tests/openshift-verification-tests-master__installer-rehearse-4.12.yaml b/...hift/verification-tests/openshift-verification-tests-master__installer-rehearse-4.12.yaml
@@ -71,8 +71,8 @@ tests:
 - as: installer-rehearse-alibabacloud
   interval: 960h
   steps:
-    cluster_profile: alibabacloud-cn-qe
-    workflow: cucushift-installer-rehearse-alibabacloud-ipi
+    cluster_profile: alibabacloud-qe
+    workflow: cucushift-installer-rehearse-alibabacloud-ipi-private
 - as: installer-rehearse-gcp
   interval: 960h
   steps:

diff --git a/...ator/jobs/openshift/verification-tests/openshift-verification-tests-master-periodics.yaml b/...ator/jobs/openshift/verification-tests/openshift-verification-tests-master-periodics.yaml
@@ -1213,7 +1213,7 @@ periodics:
   interval: 960h
   labels:
     ci-operator.openshift.io/cloud: alibabacloud
-    ci-operator.openshift.io/cloud-cluster-profile: alibabacloud-cn-qe
+    ci-operator.openshift.io/cloud-cluster-profile: alibabacloud-qe
     ci-operator.openshift.io/variant: installer-rehearse-4.12
     ci.openshift.io/generator: prowgen
     job-release: "4.12"
@@ -1269,7 +1269,7 @@ periodics:
         secretName: ci-pull-credentials
     - name: cluster-profile
       secret:
-        secretName: cluster-secrets-alibabacloud-cn-qe
+        secretName: cluster-secrets-alibabacloud-qe
     - name: pull-secret
       secret:
         secretName: registry-pull-credentials

diff --git a/ci-operator/step-registry/alibabacloud/OWNERS b/ci-operator/step-registry/alibabacloud/OWNERS
@@ -0,0 +1,4 @@
+approvers:
+- gpei
+- jianlinliu
+- jianli-wei
diff --git a/ci-operator/step-registry/alibabacloud/deprovision/OWNERS b/ci-operator/step-registry/alibabacloud/deprovision/OWNERS
@@ -0,0 +1 @@
+../OWNERS
diff --git a/ci-operator/step-registry/alibabacloud/deprovision/bastionhost/OWNERS b/ci-operator/step-registry/alibabacloud/deprovision/bastionhost/OWNERS
@@ -0,0 +1 @@
+../OWNERS
diff --git a/...try/alibabacloud/deprovision/bastionhost/alibabacloud-deprovision-bastionhost-commands.sh b/...try/alibabacloud/deprovision/bastionhost/alibabacloud-deprovision-bastionhost-commands.sh
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+set -o nounset
+set -o errexit
+set -o pipefail
+
+if [ ! -f "${SHARED_DIR}/destroy-bastion.sh" ]; then
+  echo "No 'destroy-bastion.sh' found, aborted." && exit 0
+fi
+
+workdir="/tmp/installer"
+mkdir -p "${workdir}"
+pushd "${workdir}"
+
+if ! [ -x "$(command -v aliyun)" ]; then
+  echo "$(date -u --rfc-3339=seconds) - Downloading 'aliyun' as it's not intalled..."
+  curl -sSL "https://aliyuncli.alicdn.com/aliyun-cli-linux-latest-amd64.tgz" --output aliyun-cli-linux-latest-amd64.tgz && \
+  tar -xvf aliyun-cli-linux-latest-amd64.tgz && \
+  rm -f aliyun-cli-linux-latest-amd64.tgz
+  ALIYUN_BIN="${workdir}/aliyun"
+else
+  ALIYUN_BIN="$(which aliyun)"
+fi
+
+# copy the creds to the SHARED_DIR
+if test -f "${CLUSTER_PROFILE_DIR}/alibabacreds.ini" 
+then
+  echo "$(date -u --rfc-3339=seconds) - Copying creds from CLUSTER_PROFILE_DIR to SHARED_DIR..."
+  cp ${CLUSTER_PROFILE_DIR}/alibabacreds.ini ${SHARED_DIR}
+  cp ${CLUSTER_PROFILE_DIR}/config ${SHARED_DIR}
+  cp ${CLUSTER_PROFILE_DIR}/envvars ${SHARED_DIR}
+else
+  echo "$(date -u --rfc-3339=seconds) - Copying creds from /var/run/vault/alibaba/ to SHARED_DIR..."
+  cp /var/run/vault/alibaba/alibabacreds.ini ${SHARED_DIR}
+  cp /var/run/vault/alibaba/config ${SHARED_DIR}
+  cp /var/run/vault/alibaba/envvars ${SHARED_DIR}
+fi
+
+source ${SHARED_DIR}/envvars
+
+echo "$(date -u --rfc-3339=seconds) - 'aliyun' authentication..."
+ALIYUN_PROFILE="${SHARED_DIR}/config"
+${ALIYUN_BIN} configure set --config-path "${ALIYUN_PROFILE}"
+
+## Destroying DNS resources of mirror registry
+if [[ -f "${SHARED_DIR}/destroy-mirror-dns.sh" ]]; then
+  echo "$(date -u --rfc-3339=seconds) - Destroying DNS resources of mirror registry..."
+  sh "${SHARED_DIR}/destroy-mirror-dns.sh"
+fi
+
+## Destroy the SSH bastion
+echo "$(date -u --rfc-3339=seconds) - Destroying the bastion host..."
+sh "${SHARED_DIR}/destroy-bastion.sh"
+
+popd
+rm -rf "${workdir}"
diff --git a/...ibabacloud/deprovision/bastionhost/alibabacloud-deprovision-bastionhost-ref.metadata.json b/...ibabacloud/deprovision/bastionhost/alibabacloud-deprovision-bastionhost-ref.metadata.json
@@ -0,0 +1,10 @@
+{
+	"path": "alibabacloud/deprovision/bastionhost/alibabacloud-deprovision-bastionhost-ref.yaml",
+	"owners": {
+		"approvers": [
+			"gpei",
+			"jianlinliu",
+			"jianli-wei"
+		]
+	}
+}
diff --git a/...gistry/alibabacloud/deprovision/bastionhost/alibabacloud-deprovision-bastionhost-ref.yaml b/...gistry/alibabacloud/deprovision/bastionhost/alibabacloud-deprovision-bastionhost-ref.yaml
@@ -0,0 +1,13 @@
+ref:
+  as: alibabacloud-deprovision-bastionhost
+  from_image:
+    namespace: ocp
+    name: "4.12"
+    tag: upi-installer
+  commands: alibabacloud-deprovision-bastionhost-commands.sh
+  resources:
+    requests:
+      cpu: 10m
+      memory: 100Mi
+  documentation: |-
+    The step destroys all resources configured by "alibabacloud-provision-bastionhost". 
diff --git a/ci-operator/step-registry/alibabacloud/deprovision/vpc/OWNERS b/ci-operator/step-registry/alibabacloud/deprovision/vpc/OWNERS
@@ -0,0 +1 @@
+../OWNERS
diff --git a/...rator/step-registry/alibabacloud/deprovision/vpc/alibabacloud-deprovision-vpc-commands.sh b/...rator/step-registry/alibabacloud/deprovision/vpc/alibabacloud-deprovision-vpc-commands.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+set -o nounset
+set -o errexit
+set -o pipefail
+
+if [ ! -f "${SHARED_DIR}/destroy-vpc.sh" ]; then
+  echo "No 'destroy-vpc.sh' found, aborted." && exit 0
+fi
+
+workdir="/tmp/installer"
+mkdir -p "${workdir}"
+pushd "${workdir}"
+
+if ! [ -x "$(command -v aliyun)" ]; then
+  echo "$(date -u --rfc-3339=seconds) - Downloading 'aliyun' as it's not intalled..."
+  curl -sSL "https://aliyuncli.alicdn.com/aliyun-cli-linux-latest-amd64.tgz" --output aliyun-cli-linux-latest-amd64.tgz && \
+  tar -xvf aliyun-cli-linux-latest-amd64.tgz && \
+  rm -f aliyun-cli-linux-latest-amd64.tgz
+  ALIYUN_BIN="${workdir}/aliyun"
+else
+  ALIYUN_BIN="$(which aliyun)"
+fi
+
+# copy the creds to the SHARED_DIR
+if test -f "${CLUSTER_PROFILE_DIR}/alibabacreds.ini" 
+then
+  echo "$(date -u --rfc-3339=seconds) - Copying creds from CLUSTER_PROFILE_DIR to SHARED_DIR..."
+  cp ${CLUSTER_PROFILE_DIR}/alibabacreds.ini ${SHARED_DIR}
+  cp ${CLUSTER_PROFILE_DIR}/config ${SHARED_DIR}
+  cp ${CLUSTER_PROFILE_DIR}/envvars ${SHARED_DIR}
+else
+  echo "$(date -u --rfc-3339=seconds) - Copying creds from /var/run/vault/alibaba/ to SHARED_DIR..."
+  cp /var/run/vault/alibaba/alibabacreds.ini ${SHARED_DIR}
+  cp /var/run/vault/alibaba/config ${SHARED_DIR}
+  cp /var/run/vault/alibaba/envvars ${SHARED_DIR}
+fi
+
+source ${SHARED_DIR}/envvars
+
+echo "$(date -u --rfc-3339=seconds) - 'aliyun' authentication..."
+ALIYUN_PROFILE="${SHARED_DIR}/config"
+${ALIYUN_BIN} configure set --config-path "${ALIYUN_PROFILE}"
+
+## Destroy the VPC
+echo "$(date -u --rfc-3339=seconds) - Destroying the VPC..."
+sh "${SHARED_DIR}/destroy-vpc.sh"
+
+popd
+rm -rf "${workdir}"
diff --git a/...step-registry/alibabacloud/deprovision/vpc/alibabacloud-deprovision-vpc-ref.metadata.json b/...step-registry/alibabacloud/deprovision/vpc/alibabacloud-deprovision-vpc-ref.metadata.json
@@ -0,0 +1,10 @@
+{
+	"path": "alibabacloud/deprovision/vpc/alibabacloud-deprovision-vpc-ref.yaml",
+	"owners": {
+		"approvers": [
+			"gpei",
+			"jianlinliu",
+			"jianli-wei"
+		]
+	}
+}
diff --git a/ci-operator/step-registry/alibabacloud/deprovision/vpc/alibabacloud-deprovision-vpc-ref.yaml b/ci-operator/step-registry/alibabacloud/deprovision/vpc/alibabacloud-deprovision-vpc-ref.yaml
@@ -0,0 +1,13 @@
+ref:
+  as: alibabacloud-deprovision-vpc
+  from_image:
+    namespace: ocp
+    name: "4.12"
+    tag: upi-installer
+  commands: alibabacloud-deprovision-vpc-commands.sh
+  resources:
+    requests:
+      cpu: 10m
+      memory: 100Mi
+  documentation: |-
+    The step destroys all resources configured by "alibabacloud-provision-vpc". 
diff --git a/ci-operator/step-registry/alibabacloud/provision/OWNERS b/ci-operator/step-registry/alibabacloud/provision/OWNERS
@@ -0,0 +1 @@
+../OWNERS
diff --git a/ci-operator/step-registry/alibabacloud/provision/bastionhost/OWNERS b/ci-operator/step-registry/alibabacloud/provision/bastionhost/OWNERS
@@ -0,0 +1 @@
+../OWNERS