diff --git a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.10.yaml b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.10.yaml index 80723202ec554..42cb6a3978d5f 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.10.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.10.yaml @@ -597,6 +597,13 @@ tests: interval: 48h steps: workflow: telco5g +- as: e2e-alibaba + interval: 24h + steps: + cluster_profile: alibabacloud + env: + BASE_DOMAIN: alicloud-dev.devcluster.openshift.com + workflow: openshift-e2e-alibabacloud zz_generated_metadata: branch: master org: openshift diff --git a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.11.yaml b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.11.yaml index 18153c639a72d..eb3a544fe9d4a 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.11.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.11.yaml @@ -585,6 +585,13 @@ tests: interval: 48h steps: workflow: telco5g +- as: e2e-alibaba + interval: 24h + steps: + cluster_profile: alibabacloud + env: + BASE_DOMAIN: alicloud-dev.devcluster.openshift.com + workflow: openshift-e2e-alibabacloud zz_generated_metadata: branch: master org: openshift diff --git a/ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml index 76ad0a50d91a5..b0a1b77e6bd18 100644 --- a/ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml +++ b/ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml @@ -18879,6 +18879,82 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build04 + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: master + org: openshift + repo: release + interval: 24h + labels: + ci-operator.openshift.io/cloud: alibabacloud + ci-operator.openshift.io/cloud-cluster-profile: alibabacloud + ci-operator.openshift.io/variant: nightly-4.10 + ci.openshift.io/generator: prowgen + ci.openshift.io/no-builds: "true" + job-release: "4.10" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-release-master-nightly-4.10-e2e-alibaba + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --secret-dir=/usr/local/e2e-alibaba-cluster-profile + - --target=e2e-alibaba + - --variant=nightly-4.10 + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /usr/local/e2e-alibaba-cluster-profile + name: cluster-profile + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: cluster-profile + secret: + secretName: cluster-secrets-alibabacloud + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator - agent: kubernetes cluster: build04 decorate: true @@ -23902,6 +23978,82 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build04 + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: master + org: openshift + repo: release + interval: 24h + labels: + ci-operator.openshift.io/cloud: alibabacloud + ci-operator.openshift.io/cloud-cluster-profile: alibabacloud + ci-operator.openshift.io/variant: nightly-4.11 + ci.openshift.io/generator: prowgen + ci.openshift.io/no-builds: "true" + job-release: "4.11" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-release-master-nightly-4.11-e2e-alibaba + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --secret-dir=/usr/local/e2e-alibaba-cluster-profile + - --target=e2e-alibaba + - --variant=nightly-4.11 + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /usr/local/e2e-alibaba-cluster-profile + name: cluster-profile + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: cluster-profile + secret: + secretName: cluster-secrets-alibabacloud + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator - agent: kubernetes cluster: build04 decorate: true diff --git a/ci-operator/step-registry/gather/alibabacloud-console/gather-alibabacloud-console-commands.sh b/ci-operator/step-registry/gather/alibabacloud-console/gather-alibabacloud-console-commands.sh index b63d0e1792d09..47711587c6302 100755 --- a/ci-operator/step-registry/gather/alibabacloud-console/gather-alibabacloud-console-commands.sh +++ b/ci-operator/step-registry/gather/alibabacloud-console/gather-alibabacloud-console-commands.sh @@ -6,14 +6,12 @@ set -o pipefail trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM - +export KUBECONFIG="${SHARED_DIR}/kubeconfig" +echo "${KUBECONFIG}" if test -f "${KUBECONFIG}" then - oc --request-timeout=5s get nodes -o jsonpath --template '{range .items[*]}{.spec.providerID}{"\n"}{end}' | sed 's|.*/||' > "${TMPDIR}/node-provider-IDs.txt" & - wait "$!" - - oc --request-timeout=5s -n openshift-machine-api get machines -o jsonpath --template '{range .items[*]}{.spec.providerID}{"\n"}{end}' | sed 's|.*/||' >> "${TMPDIR}/node-provider-IDs.txt" & + oc --request-timeout=5s -n openshift-machine-api get machines -o go-template='{{range .items}}{{.status.providerStatus.instanceId}}{{"\n"}}{{end}}' >> "${TMPDIR}/node-provider-IDs.txt" & wait "$!" else echo "No kubeconfig; skipping providerID extraction." diff --git a/ci-operator/step-registry/ipi/conf/alibabacloud/cloud-creds-provision/ipi-conf-alibabacloud-cloud-creds-provision-commands.sh b/ci-operator/step-registry/ipi/conf/alibabacloud/cloud-creds-provision/ipi-conf-alibabacloud-cloud-creds-provision-commands.sh index 83585267638e5..1cef158628646 100755 --- a/ci-operator/step-registry/ipi/conf/alibabacloud/cloud-creds-provision/ipi-conf-alibabacloud-cloud-creds-provision-commands.sh +++ b/ci-operator/step-registry/ipi/conf/alibabacloud/cloud-creds-provision/ipi-conf-alibabacloud-cloud-creds-provision-commands.sh @@ -13,11 +13,11 @@ export ALIBABA_CLOUD_CREDENTIALS_FILE="${SHARED_DIR}/alibabacreds.ini" oc registry login CCO_IMAGE=$(oc adm release info --image-for='cloud-credential-operator' "${RELEASE_IMAGE_LATEST}") cd "/tmp" -oc image extract "${CCO_IMAGE}" --file="/usr/bin/ccoctl" +oc --loglevel 10 image extract -a "${CLUSTER_PROFILE_DIR}/pull-secret" "${CCO_IMAGE}" --file="/usr/bin/ccoctl" chmod 555 "/tmp/ccoctl" # extract alibabacloud credentials requests from the release image -oc adm release extract --credentials-requests --cloud=alibabacloud --to="${CR_PATH}" "${RELEASE_IMAGE_LATEST}" +oc --loglevel 10 adm release extract -a "${CLUSTER_PROFILE_DIR}/pull-secret" --credentials-requests --cloud=alibabacloud --to="${CR_PATH}" "${RELEASE_IMAGE_LATEST}" # create required credentials infrastructure and installer manifests for workload identity "/tmp/ccoctl" alibabacloud create-ram-users \ diff --git a/core-services/release-controller/_releases/priv/release-ocp-4.10.json b/core-services/release-controller/_releases/priv/release-ocp-4.10.json index 7f0303ba03061..fcc69c7d3e31b 100644 --- a/core-services/release-controller/_releases/priv/release-ocp-4.10.json +++ b/core-services/release-controller/_releases/priv/release-ocp-4.10.json @@ -9,6 +9,13 @@ "referenceMode": "source", "to": "release-priv", "verify": { + "alibaba": { + "disabled": true, + "optional": true, + "prowJob": { + "name": "periodic-ci-openshift-release-master-nightly-4.10-e2e-alibaba-priv" + } + }, "aws": { "disabled": true, "maxRetries": 3, diff --git a/core-services/release-controller/_releases/priv/release-ocp-4.11.json b/core-services/release-controller/_releases/priv/release-ocp-4.11.json index a5f32e9627855..d87069e97b48f 100644 --- a/core-services/release-controller/_releases/priv/release-ocp-4.11.json +++ b/core-services/release-controller/_releases/priv/release-ocp-4.11.json @@ -40,6 +40,13 @@ "upgrade": true, "upgradeFrom": "PreviousMinor" }, + "alibaba": { + "disabled": true, + "optional": true, + "prowJob": { + "name": "periodic-ci-openshift-release-master-nightly-4.11-e2e-alibaba-priv" + } + }, "aws": { "disabled": true, "maxRetries": 3, diff --git a/core-services/release-controller/_releases/release-ocp-4.10.json b/core-services/release-controller/_releases/release-ocp-4.10.json index 3539262ead880..a096dfb9b62fa 100644 --- a/core-services/release-controller/_releases/release-ocp-4.10.json +++ b/core-services/release-controller/_releases/release-ocp-4.10.json @@ -279,6 +279,10 @@ "driver-toolkit": { "optional":true, "prowJob":{"name":"periodic-ci-openshift-release-master-nightly-4.10-e2e-aws-driver-toolkit"} + }, + "alibaba":{ + "optional":true, + "prowJob":{"name":"periodic-ci-openshift-release-master-nightly-4.10-e2e-alibaba"} } } } diff --git a/core-services/release-controller/_releases/release-ocp-4.11.json b/core-services/release-controller/_releases/release-ocp-4.11.json index dbf4b2adc2656..a3bf5329e70c2 100644 --- a/core-services/release-controller/_releases/release-ocp-4.11.json +++ b/core-services/release-controller/_releases/release-ocp-4.11.json @@ -277,6 +277,10 @@ "vsphere-csi": { "optional":true, "prowJob":{"name":"periodic-ci-openshift-release-master-nightly-4.11-e2e-vsphere-csi"} + }, + "alibaba":{ + "optional":true, + "prowJob":{"name":"periodic-ci-openshift-release-master-nightly-4.11-e2e-alibaba"} } } }