diff --git a/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master.yaml b/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master.yaml index 14b1c2cde4612..863c4d6c00416 100644 --- a/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master.yaml @@ -152,26 +152,6 @@ tests: requests: cpu: 100m workflow: ipi-gcp -- always_run: false - as: e2e-gcp-operator-encryption-kms - optional: true - run_if_changed: ^(vendor/github.com/openshift/library-go/pkg/operator/encryption)|^(test/e2e-encryption-kms)|^(test/library/encryption) - steps: - cluster_profile: openshift-org-gcp - env: - FEATURE_SET: TechPreviewNoUpgrade - test: - - chain: etcd-encryption-vault-setup - - as: test - cli: latest - commands: | - make test-e2e-encryption-kms JUNITFILE=${ARTIFACT_DIR}/junit_report.xml --warn-undefined-variables - from: src - resources: - requests: - cpu: 100m - timeout: 4h0m0s - workflow: ipi-gcp - as: e2e-oidc-techpreview run_if_changed: ^(pkg/controllers/externaloidc)|^(test/e2e-oidc) steps: @@ -307,7 +287,7 @@ tests: workflow: ipi-aws timeout: 2h0m0s - always_run: false - as: e2e-aws-operator-encryption-kms-ote + as: e2e-aws-operator-encryption-kms optional: true run_if_changed: ^(vendor/github.com/openshift/library-go/pkg/operator/encryption)|^(test/e2e-encryption-kms)|^(test/library/encryption) steps: diff --git a/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-main.yaml b/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-main.yaml index 0fe822643bf41..0c05cc7a57061 100644 --- a/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-main.yaml +++ b/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-main.yaml @@ -133,26 +133,6 @@ tests: as: e2e-gcp-operator-encryption-kms optional: true run_if_changed: ^(vendor/github.com/openshift/library-go/pkg/operator/encryption)|^(test/e2e-encryption-kms)|^(test/library/encryption) - steps: - cluster_profile: openshift-org-gcp - env: - FEATURE_SET: TechPreviewNoUpgrade - test: - - chain: etcd-encryption-vault-setup - - as: test - cli: latest - commands: | - make test-e2e-encryption-kms JUNITFILE=${ARTIFACT_DIR}/junit_report.xml --warn-undefined-variables - from: src - resources: - requests: - cpu: 100m - timeout: 4h0m0s - workflow: ipi-gcp -- always_run: false - as: e2e-gcp-operator-encryption-kms-ote - optional: true - run_if_changed: ^(vendor/github.com/openshift/library-go/pkg/operator/encryption)|^(test/e2e-encryption-kms)|^(test/library/encryption) steps: cluster_profile: openshift-org-gcp env: diff --git a/ci-operator/jobs/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master-presubmits.yaml index a869ed9be642d..fb18627581eca 100644 --- a/ci-operator/jobs/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master-presubmits.yaml @@ -5,7 +5,7 @@ presubmits: branches: - ^master$ - ^master- - cluster: build02 + cluster: build01 context: ci/prow/e2e-agnostic decorate: true decoration_config: @@ -175,7 +175,7 @@ presubmits: branches: - ^master$ - ^master- - cluster: build02 + cluster: build01 context: ci/prow/e2e-agnostic-upgrade decorate: true decoration_config: @@ -432,7 +432,7 @@ presubmits: - ^master$ - ^master- cluster: build01 - context: ci/prow/e2e-aws-operator-encryption-kms-ote + context: ci/prow/e2e-aws-operator-encryption-kms decorate: true decoration_config: sparse_checkout_files: @@ -444,9 +444,9 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-authentication-operator-master-e2e-aws-operator-encryption-kms-ote + name: pull-ci-openshift-cluster-authentication-operator-master-e2e-aws-operator-encryption-kms optional: true - rerun_command: /test e2e-aws-operator-encryption-kms-ote + rerun_command: /test e2e-aws-operator-encryption-kms run_if_changed: ^(vendor/github.com/openshift/library-go/pkg/operator/encryption)|^(test/e2e-encryption-kms)|^(test/library/encryption) spec: containers: @@ -456,7 +456,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator-encryption-kms-ote + - --target=e2e-aws-operator-encryption-kms command: - ci-operator env: @@ -512,7 +512,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator-encryption-kms-ote,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator-encryption-kms,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -1295,7 +1295,7 @@ presubmits: branches: - ^master$ - ^master- - cluster: build13 + cluster: build04 context: ci/prow/e2e-console-login decorate: true decoration_config: @@ -1379,7 +1379,7 @@ presubmits: branches: - ^master$ - ^master- - cluster: build13 + cluster: build04 context: ci/prow/e2e-gcp-operator-disruptive decorate: true decoration_config: @@ -1463,93 +1463,7 @@ presubmits: branches: - ^master$ - ^master- - cluster: build13 - context: ci/prow/e2e-gcp-operator-encryption-kms - decorate: true - decoration_config: - sparse_checkout_files: - - .ci-operator.yaml - - Dockerfile.rhel7 - labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-gcp - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-authentication-operator-master-e2e-gcp-operator-encryption-kms - optional: true - rerun_command: /test e2e-gcp-operator-encryption-kms - run_if_changed: ^(vendor/github.com/openshift/library-go/pkg/operator/encryption)|^(test/e2e-encryption-kms)|^(test/library/encryption) - 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=e2e-gcp-operator-encryption-kms - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - 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 - trigger: (?m)^/test( | .* )e2e-gcp-operator-encryption-kms,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^master$ - - ^master- - cluster: build13 + cluster: build04 context: ci/prow/e2e-gcp-operator-encryption-perf decorate: true decoration_config: @@ -1634,7 +1548,7 @@ presubmits: branches: - ^master$ - ^master- - cluster: build13 + cluster: build04 context: ci/prow/e2e-gcp-operator-encryption-rotation decorate: true decoration_config: @@ -1719,7 +1633,7 @@ presubmits: branches: - ^master$ - ^master- - cluster: build13 + cluster: build04 context: ci/prow/e2e-oidc decorate: true decoration_config: @@ -1803,7 +1717,7 @@ presubmits: branches: - ^master$ - ^master- - cluster: build13 + cluster: build04 context: ci/prow/e2e-oidc-techpreview decorate: true decoration_config: @@ -1888,7 +1802,7 @@ presubmits: branches: - ^master$ - ^master- - cluster: build13 + cluster: build04 context: ci/prow/e2e-operator decorate: true decoration_config: @@ -1972,7 +1886,7 @@ presubmits: branches: - ^master$ - ^master- - cluster: build13 + cluster: build04 context: ci/prow/e2e-operator-encryption decorate: true decoration_config: @@ -2057,7 +1971,7 @@ presubmits: branches: - ^master$ - ^master- - cluster: build02 + cluster: build01 context: ci/prow/images decorate: true decoration_config: @@ -2201,7 +2115,7 @@ presubmits: branches: - ^master$ - ^master- - cluster: build02 + cluster: build01 context: ci/prow/okd-scos-images decorate: true decoration_config: @@ -2260,7 +2174,7 @@ presubmits: branches: - ^master$ - ^master- - cluster: build02 + cluster: build01 context: ci/prow/test-operator-integration decorate: true decoration_config: @@ -2325,7 +2239,7 @@ presubmits: branches: - ^master$ - ^master- - cluster: build02 + cluster: build01 context: ci/prow/unit decorate: true decoration_config: @@ -2390,7 +2304,7 @@ presubmits: branches: - ^master$ - ^master- - cluster: build02 + cluster: build01 context: ci/prow/verify decorate: true decoration_config: @@ -2455,7 +2369,7 @@ presubmits: branches: - ^master$ - ^master- - cluster: build02 + cluster: build01 context: ci/prow/verify-bindata decorate: true decoration_config: @@ -2520,7 +2434,7 @@ presubmits: branches: - ^master$ - ^master- - cluster: build02 + cluster: build01 context: ci/prow/verify-deps decorate: true decoration_config: diff --git a/ci-operator/jobs/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-main-presubmits.yaml b/ci-operator/jobs/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-main-presubmits.yaml index fe16e8109b8f6..5e5f04d720be9 100644 --- a/ci-operator/jobs/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-main-presubmits.yaml @@ -345,7 +345,7 @@ presubmits: branches: - ^main$ - ^main- - cluster: build08 + cluster: build04 context: ci/prow/e2e-gcp-operator-encryption-kms decorate: true decoration_config: @@ -426,92 +426,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-gcp-operator-encryption-kms,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^main$ - - ^main- - cluster: build08 - context: ci/prow/e2e-gcp-operator-encryption-kms-ote - decorate: true - decoration_config: - sparse_checkout_files: - - .ci-operator.yaml - - Dockerfile - labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-gcp - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-openshift-apiserver-operator-main-e2e-gcp-operator-encryption-kms-ote - optional: true - rerun_command: /test e2e-gcp-operator-encryption-kms-ote - run_if_changed: ^(vendor/github.com/openshift/library-go/pkg/operator/encryption)|^(test/e2e-encryption-kms)|^(test/library/encryption) - 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=e2e-gcp-operator-encryption-kms-ote - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - 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 - trigger: (?m)^/test( | .* )e2e-gcp-operator-encryption-kms-ote,?($|\s.*) - agent: kubernetes always_run: false branches: