diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.21__multi-nightly.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.21__multi-nightly.yaml index 563fd42dc3835..7696ee97a455e 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.21__multi-nightly.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.21__multi-nightly.yaml @@ -2068,8 +2068,6 @@ tests: steps: cluster_profile: gcp-qe env: - FEATURE_GATES: '["GCPCustomAPIEndpointsInstall=true"]' - FEATURE_SET: CustomNoUpgrade GCP_INSTALL_USE_MINIMAL_PERMISSIONS: "yes" test: - chain: openshift-e2e-test-qe-destructive @@ -2079,8 +2077,6 @@ tests: steps: cluster_profile: gcp-qe env: - FEATURE_GATES: '["GCPCustomAPIEndpointsInstall=true"]' - FEATURE_SET: CustomNoUpgrade GCP_INSTALL_USE_MINIMAL_PERMISSIONS: "yes" OCP_ARCH: arm64 test: @@ -2095,8 +2091,6 @@ tests: CONTROL_PLANE_SERVICE_ACCOUNT: jiwei-control-plane-sa@openshift-qe.iam.gserviceaccount.com ENABLE_MIN_PERMISSION_FOR_STS: "true" EXTRACT_MANIFEST_INCLUDED: "true" - FEATURE_GATES: '["GCPCustomAPIEndpointsInstall=true"]' - FEATURE_SET: CustomNoUpgrade GCP_CCO_MANUAL_USE_MINIMAL_PERMISSIONS: "yes" test: - chain: openshift-e2e-test-qe-destructive @@ -2110,8 +2104,6 @@ tests: CONTROL_PLANE_SERVICE_ACCOUNT: jiwei-control-plane-sa@openshift-qe.iam.gserviceaccount.com ENABLE_MIN_PERMISSION_FOR_STS: "true" EXTRACT_MANIFEST_INCLUDED: "true" - FEATURE_GATES: '["GCPCustomAPIEndpointsInstall=true"]' - FEATURE_SET: CustomNoUpgrade GCP_CCO_MANUAL_USE_MINIMAL_PERMISSIONS: "yes" OCP_ARCH: arm64 test: diff --git a/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-4.21.yaml b/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-4.21.yaml index a16f327e29022..a870335c42f74 100644 --- a/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-4.21.yaml +++ b/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-4.21.yaml @@ -1066,8 +1066,6 @@ tests: env: COMPUTE_SERVICE_ACCOUNT: jiwei-worker-sa@openshift-qe.iam.gserviceaccount.com CONTROL_PLANE_SERVICE_ACCOUNT: jiwei-control-plane-sa@openshift-qe.iam.gserviceaccount.com - FEATURE_GATES: '["GCPCustomAPIEndpointsInstall=true"]' - FEATURE_SET: CustomNoUpgrade GCP_CCO_MANUAL_USE_MINIMAL_PERMISSIONS: "yes" test: - ref: cucushift-installer-check-cluster-health diff --git a/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installer-rehearse-4.21.yaml b/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installer-rehearse-4.21.yaml index 2279354e33b75..0eb2ae4eb5b0c 100644 --- a/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installer-rehearse-4.21.yaml +++ b/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installer-rehearse-4.21.yaml @@ -87,79 +87,21 @@ tests: steps: allow_skip_on_success: true cluster_profile: gcp-qe - dependencies: - OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:multi-latest env: - FEATURE_GATES: '["GCPCustomAPIEndpointsInstall=true"]' - FEATURE_SET: CustomNoUpgrade GCP_INSTALL_USE_MINIMAL_PERMISSIONS: "yes" - SLEEP_DURATION: 10m - post: - - ref: cucushift-installer-wait - - chain: cucushift-installer-rehearse-gcp-ipi-custom-endpoints-deprovision - pre: - - chain: cucushift-installer-rehearse-gcp-ipi-custom-endpoints-provision + workflow: cucushift-installer-rehearse-gcp-ipi-custom-endpoints - as: installer-rehearse-gcp-proxy cron: '@yearly' steps: allow_skip_on_success: true cluster_profile: gcp-qe - dependencies: - OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:multi-latest - dependency_overrides: - OO_INDEX: quay.io/openshift-qe-optional-operators/aosqe-index:v4.21 - env: - FEATURE_GATES: '["GCPCustomAPIEndpointsInstall=true"]' - FEATURE_SET: CustomNoUpgrade - GCP_INSTALL_USE_MINIMAL_PERMISSIONS: "yes" - SLEEP_DURATION: 10m - post: - - ref: cucushift-installer-wait - - ref: storage-destroy-csi-gcp-filestore - - chain: cucushift-installer-rehearse-gcp-ipi-custom-endpoints-proxy-whitelist-deprovision - pre: - - chain: cucushift-installer-rehearse-gcp-ipi-custom-endpoints-proxy-whitelist-provision - - chain: storage-conf-csi-optional-gcp-filestore -- as: installer-rehearse-gcp-proxy-wif - cron: '@yearly' - steps: - allow_skip_on_success: true - cluster_profile: gcp-qe - dependencies: - OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:multi-latest env: COMPUTE_SERVICE_ACCOUNT: jiwei-worker-sa@openshift-qe.iam.gserviceaccount.com CONTROL_PLANE_SERVICE_ACCOUNT: jiwei-control-plane-sa@openshift-qe.iam.gserviceaccount.com ENABLE_MIN_PERMISSION_FOR_STS: "true" EXTRACT_MANIFEST_INCLUDED: "true" - FEATURE_GATES: '["GCPCustomAPIEndpointsInstall=true"]' - FEATURE_SET: CustomNoUpgrade GCP_CCO_MANUAL_USE_MINIMAL_PERMISSIONS: "yes" - SLEEP_DURATION: 10m - post: - - ref: cucushift-installer-wait - - chain: cucushift-installer-rehearse-gcp-ipi-custom-endpoints-proxy-whitelist-cco-manual-workload-identity-deprovision - pre: - - chain: cucushift-installer-rehearse-gcp-ipi-custom-endpoints-proxy-whitelist-cco-manual-workload-identity-provision -- as: installer-rehearse-gcp-proxy-users-static - cron: '@yearly' - steps: - allow_skip_on_success: true - cluster_profile: gcp-qe - dependencies: - OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:multi-latest - env: - COMPUTE_SERVICE_ACCOUNT: jiwei-worker-sa@openshift-qe.iam.gserviceaccount.com - CONTROL_PLANE_SERVICE_ACCOUNT: jiwei-control-plane-sa@openshift-qe.iam.gserviceaccount.com - FEATURE_GATES: '["GCPCustomAPIEndpointsInstall=true"]' - FEATURE_SET: CustomNoUpgrade - GCP_CCO_MANUAL_USE_MINIMAL_PERMISSIONS: "yes" - SLEEP_DURATION: 10m - post: - - ref: cucushift-installer-wait - - chain: cucushift-installer-rehearse-gcp-ipi-custom-endpoints-proxy-whitelist-cco-manual-users-static-deprovision - pre: - - chain: cucushift-installer-rehearse-gcp-ipi-custom-endpoints-proxy-whitelist-cco-manual-users-static-provision + workflow: cucushift-installer-rehearse-gcp-ipi-custom-endpoints-proxy-whitelist-cco-manual-workload-identity - as: installer-rehearse-ibmcloud-dis cron: '@yearly' steps: diff --git a/ci-operator/jobs/openshift/verification-tests/openshift-verification-tests-main-periodics.yaml b/ci-operator/jobs/openshift/verification-tests/openshift-verification-tests-main-periodics.yaml index 07c31e93f993a..1f7bdfee87286 100644 --- a/ci-operator/jobs/openshift/verification-tests/openshift-verification-tests-main-periodics.yaml +++ b/ci-operator/jobs/openshift/verification-tests/openshift-verification-tests-main-periodics.yaml @@ -43679,156 +43679,6 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator -- agent: kubernetes - cluster: build02 - cron: '@yearly' - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: main - org: openshift - repo: verification-tests - labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: gcp-qe - ci-operator.openshift.io/variant: installer-rehearse-4.21 - ci.openshift.io/generator: prowgen - job-release: "4.21" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-verification-tests-main-installer-rehearse-4.21-installer-rehearse-gcp-proxy-users-static - 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 - - --target=installer-rehearse-gcp-proxy-users-static - - --variant=installer-rehearse-4.21 - command: - - ci-operator - image: quay-proxy.ci.openshift.org/openshift/ci:ci_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: /secrets/gcs - name: gcs-credentials - 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: 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: build02 - cron: '@yearly' - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: main - org: openshift - repo: verification-tests - labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: gcp-qe - ci-operator.openshift.io/variant: installer-rehearse-4.21 - ci.openshift.io/generator: prowgen - job-release: "4.21" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-verification-tests-main-installer-rehearse-4.21-installer-rehearse-gcp-proxy-wif - 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 - - --target=installer-rehearse-gcp-proxy-wif - - --variant=installer-rehearse-4.21 - command: - - ci-operator - image: quay-proxy.ci.openshift.org/openshift/ci:ci_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: /secrets/gcs - name: gcs-credentials - 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: 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: build08 cron: '@yearly' diff --git a/ci-operator/step-registry/cucushift/installer/rehearse/gcp/ipi/custom-endpoints/proxy/whitelist/deprovision/cucushift-installer-rehearse-gcp-ipi-custom-endpoints-proxy-whitelist-deprovision-chain.yaml b/ci-operator/step-registry/cucushift/installer/rehearse/gcp/ipi/custom-endpoints/proxy/whitelist/deprovision/cucushift-installer-rehearse-gcp-ipi-custom-endpoints-proxy-whitelist-deprovision-chain.yaml index 5ab438ebd5aea..fa07b0df45cfb 100644 --- a/ci-operator/step-registry/cucushift/installer/rehearse/gcp/ipi/custom-endpoints/proxy/whitelist/deprovision/cucushift-installer-rehearse-gcp-ipi-custom-endpoints-proxy-whitelist-deprovision-chain.yaml +++ b/ci-operator/step-registry/cucushift/installer/rehearse/gcp/ipi/custom-endpoints/proxy/whitelist/deprovision/cucushift-installer-rehearse-gcp-ipi-custom-endpoints-proxy-whitelist-deprovision-chain.yaml @@ -5,8 +5,8 @@ chain: - chain: gather-core-dump - ref: gather-gcp-console - chain: gather - - ref: gather-proxy - ref: ipi-deprovision-deprovision-in-bastion + - ref: gather-proxy - ref: gcp-deprovision-custom-endpoints - ref: gcp-deprovision-bastionhost - ref: gcp-deprovision-vpc