diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.14__amd64-stable.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.14__amd64-stable.yaml index 463c0a6056a8..ae06a0e30bfb 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.14__amd64-stable.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.14__amd64-stable.yaml @@ -370,6 +370,22 @@ tests: test: - chain: openshift-e2e-test-hypershift-qe workflow: rosa-aws-sts-hcp +- as: aws-rosa-hcp-sector-prod-stable-critical-f28 + cron: 23 8 28 * * + steps: + cluster_profile: aws-sd-qe + env: + CHANNEL_GROUP: stable + CLUSTER_SECTOR: canary + E2E_RUN_TAGS: '@rosa and @critical' + OCM_LOGIN_ENV: production + OPENSHIFT_VERSION: "4.14" + REGION: us-east-1 + TEST_FILTERS: ~ChkUpgrade&;~NonPreRelease&;~Serial&;~Disruptive&;~DisconnectedOnly&;~HyperShiftMGMT&;~MicroShiftOnly&;~NonHyperShiftHOST&;ROSA& + TEST_IMPORTANCE: Critical + test: + - chain: openshift-e2e-test-hypershift-qe + workflow: rosa-aws-sts-hcp - as: aws-rosa-hcp-sector-byo-kms-oidc-auditlog-prod-critical-f7 cron: 33 15 4,11,18,27 * * steps: diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15__amd64-stable.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15__amd64-stable.yaml index 214a2fd708e9..af58bb55f2e7 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15__amd64-stable.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15__amd64-stable.yaml @@ -422,6 +422,22 @@ tests: test: - chain: openshift-e2e-test-hypershift-qe workflow: rosa-aws-sts-hcp-private-proxy +- as: aws-rosa-hcp-sector-private-proxy-prod-stable-critical-f28 + cron: 12 2 27 * * + steps: + cluster_profile: aws-sd-qe + env: + CHANNEL_GROUP: stable + CLUSTER_SECTOR: canary + E2E_RUN_TAGS: '@rosa and @critical' + OCM_LOGIN_ENV: production + OPENSHIFT_VERSION: "4.15" + REGION: us-east-1 + TEST_FILTERS: ~ChkUpgrade&;~NonPreRelease&;~Serial&;~Disruptive&;~ConnectedOnly&;~HyperShiftMGMT&;~MicroShiftOnly&;~NonHyperShiftHOST&;ROSA& + TEST_IMPORTANCE: Critical + test: + - chain: openshift-e2e-test-hypershift-qe + workflow: rosa-aws-sts-hcp-private-proxy - as: aws-usgov-ipi-private-sts-f14 cron: 44 17 13,29 * * steps: diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__amd64-stable.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__amd64-stable.yaml index 84b8b8be3819..d7149decfe47 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__amd64-stable.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__amd64-stable.yaml @@ -239,6 +239,22 @@ tests: test: - chain: openshift-e2e-test-hypershift-qe workflow: rosa-aws-sts-hcp-private-proxy +- as: aws-rosa-hcp-sector-advanced-prod-stable-critical-f28 + cron: 41 23 12 * * + steps: + cluster_profile: aws-sd-qe + env: + CHANNEL_GROUP: stable + CLUSTER_SECTOR: canary + E2E_RUN_TAGS: '@rosa and @critical' + OCM_LOGIN_ENV: production + OPENSHIFT_VERSION: "4.16" + REGION: us-east-1 + TEST_FILTERS: ~ChkUpgrade&;~NonPreRelease&;~Serial&;~Disruptive&;~DisconnectedOnly&;~HyperShiftMGMT&;~MicroShiftOnly&;~NonHyperShiftHOST&;ROSA& + TEST_IMPORTANCE: Critical + test: + - chain: openshift-e2e-test-hypershift-qe + workflow: rosa-aws-sts-hcp-byo-kms-oidc-auditlog - as: aws-rosa-hcp-sector-byo-kms-oidc-auditlog-prod-critical-f7 cron: 12 14 3,10,19,26 * * steps: diff --git a/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.14-periodics.yaml b/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.14-periodics.yaml index a03c32272d4a..70c3cc25108a 100644 --- a/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.14-periodics.yaml +++ b/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.14-periodics.yaml @@ -33238,6 +33238,104 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build05 + cron: 23 8 28 * * + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: release-4.14 + org: openshift + repo: openshift-tests-private + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-sd-qe + ci-operator.openshift.io/variant: amd64-stable + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-openshift-tests-private-release-4.14-amd64-stable-aws-rosa-hcp-sector-prod-stable-critical-f28 + reporter_config: + slack: + channel: '#managed-hypershift-ci-watcher' + job_states_to_report: + - failure + - error + - success + report_template: '{{if eq .Status.State "success"}} :rainbow: Job *{{.Spec.Job}}* + ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> :rainbow: {{else}} + :volcano: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View + logs> :volcano: {{end}}' + 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 + - --oauth-token-path=/usr/local/github-credentials/oauth + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --secret-dir=/usr/local/aws-rosa-hcp-sector-prod-stable-critical-f28-cluster-profile + - --target=aws-rosa-hcp-sector-prod-stable-critical-f28 + - --variant=amd64-stable + 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/aws-rosa-hcp-sector-prod-stable-critical-f28-cluster-profile + name: cluster-profile + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /usr/local/github-credentials + name: github-credentials-openshift-ci-robot-private-git-cloner + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + 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-aws-sd-qe + - name: github-credentials-openshift-ci-robot-private-git-cloner + secret: + secretName: github-credentials-openshift-ci-robot-private-git-cloner + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator - agent: kubernetes cluster: build05 cron: 23 8 10,24 * * diff --git a/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15-periodics.yaml b/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15-periodics.yaml index 56a0c230a01d..b1b32beb1610 100644 --- a/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15-periodics.yaml +++ b/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15-periodics.yaml @@ -32729,6 +32729,104 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build05 + cron: 12 2 27 * * + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: release-4.15 + org: openshift + repo: openshift-tests-private + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-sd-qe + ci-operator.openshift.io/variant: amd64-stable + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-openshift-tests-private-release-4.15-amd64-stable-aws-rosa-hcp-sector-private-proxy-prod-stable-critical-f28 + reporter_config: + slack: + channel: '#managed-hypershift-ci-watcher' + job_states_to_report: + - failure + - error + - success + report_template: '{{if eq .Status.State "success"}} :rainbow: Job *{{.Spec.Job}}* + ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> :rainbow: {{else}} + :volcano: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View + logs> :volcano: {{end}}' + 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 + - --oauth-token-path=/usr/local/github-credentials/oauth + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --secret-dir=/usr/local/aws-rosa-hcp-sector-private-proxy-prod-stable-critical-f28-cluster-profile + - --target=aws-rosa-hcp-sector-private-proxy-prod-stable-critical-f28 + - --variant=amd64-stable + 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/aws-rosa-hcp-sector-private-proxy-prod-stable-critical-f28-cluster-profile + name: cluster-profile + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /usr/local/github-credentials + name: github-credentials-openshift-ci-robot-private-git-cloner + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + 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-aws-sd-qe + - name: github-credentials-openshift-ci-robot-private-git-cloner + secret: + secretName: github-credentials-openshift-ci-robot-private-git-cloner + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator - agent: kubernetes cluster: build05 cron: 28 6 3,10,17,26 * * diff --git a/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16-periodics.yaml b/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16-periodics.yaml index cd7f4589e90f..d51ae977e1ef 100644 --- a/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16-periodics.yaml +++ b/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16-periodics.yaml @@ -36492,6 +36492,104 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build05 + cron: 41 23 12 * * + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: release-4.16 + org: openshift + repo: openshift-tests-private + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-sd-qe + ci-operator.openshift.io/variant: amd64-stable + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-openshift-tests-private-release-4.16-amd64-stable-aws-rosa-hcp-sector-advanced-prod-stable-critical-f28 + reporter_config: + slack: + channel: '#managed-hypershift-ci-watcher' + job_states_to_report: + - failure + - error + - success + report_template: '{{if eq .Status.State "success"}} :rainbow: Job *{{.Spec.Job}}* + ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> :rainbow: {{else}} + :volcano: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View + logs> :volcano: {{end}}' + 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 + - --oauth-token-path=/usr/local/github-credentials/oauth + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --secret-dir=/usr/local/aws-rosa-hcp-sector-advanced-prod-stable-critical-f28-cluster-profile + - --target=aws-rosa-hcp-sector-advanced-prod-stable-critical-f28 + - --variant=amd64-stable + 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/aws-rosa-hcp-sector-advanced-prod-stable-critical-f28-cluster-profile + name: cluster-profile + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /usr/local/github-credentials + name: github-credentials-openshift-ci-robot-private-git-cloner + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + 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-aws-sd-qe + - name: github-credentials-openshift-ci-robot-private-git-cloner + secret: + secretName: github-credentials-openshift-ci-robot-private-git-cloner + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator - agent: kubernetes cluster: build05 cron: 12 14 3,10,19,26 * * diff --git a/ci-operator/step-registry/rosa/cluster/provision/rosa-cluster-provision-commands.sh b/ci-operator/step-registry/rosa/cluster/provision/rosa-cluster-provision-commands.sh index 8b68dfbcac4e..2e97c672ff61 100755 --- a/ci-operator/step-registry/rosa/cluster/provision/rosa-cluster-provision-commands.sh +++ b/ci-operator/step-registry/rosa/cluster/provision/rosa-cluster-provision-commands.sh @@ -332,7 +332,20 @@ if [[ "$HOSTED_CP" == "true" ]]; then exit 1 fi fi - PROVISION_SHARD_ID=$(echo "$psList" | head -n 1) + + PROVISION_SHARD_ID="" + # ensure the SC is not for ibm usage so that it could support the latest version of the hosted cluster + for ps in $psList ; do + topology=$(ocm get /api/clusters_mgmt/v1/provision_shards/${ps} | jq -r '.hypershift_config.topology') + if [[ "$topology" == "dedicated" ]] ; then + PROVISION_SHARD_ID=${ps} + fi + done + + if [[ -z "$PROVISION_SHARD_ID" ]]; then + echo "No available provision shard found! psList: $psList" + exit 1 + fi HYPERSHIFT_SWITCH="${HYPERSHIFT_SWITCH} --properties provision_shard_id:${PROVISION_SHARD_ID}" record_cluster "properties" "provision_shard_id" ${PROVISION_SHARD_ID}