diff --git a/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master.yaml b/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master.yaml index 6ce216fe07559..09cc29cf57bd0 100644 --- a/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master.yaml +++ b/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master.yaml @@ -40,17 +40,17 @@ tests: commands: make unit container: from: src -- as: e2e-aws +- as: e2e-gcp steps: - cluster_profile: aws - workflow: openshift-e2e-aws -- as: e2e-aws-serial + cluster_profile: gcp + workflow: openshift-e2e-gcp +- as: e2e-gcp-serial steps: - cluster_profile: aws - workflow: openshift-e2e-aws-serial -- as: e2e-aws-operator + cluster_profile: gcp + workflow: openshift-e2e-gcp-serial +- as: e2e-gcp-operator steps: - cluster_profile: aws + cluster_profile: gcp test: - as: test cli: latest @@ -59,10 +59,10 @@ tests: resources: requests: cpu: 100m - workflow: ipi-aws -- as: e2e-aws-console-olm + workflow: ipi-gcp +- as: e2e-gcp-console-olm steps: - cluster_profile: aws + cluster_profile: gcp test: - as: test cli: latest @@ -71,11 +71,11 @@ tests: resources: requests: cpu: 100m - workflow: ipi-aws -- as: e2e-aws-upgrade + workflow: ipi-gcp +- as: e2e-gcp-upgrade steps: - cluster_profile: aws - workflow: openshift-upgrade-aws + cluster_profile: gcp + workflow: openshift-upgrade-gcp zz_generated_metadata: branch: master org: operator-framework diff --git a/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master__okd.yaml b/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master__okd.yaml index c94ff6fd86cae..8d706d1d34d58 100644 --- a/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master__okd.yaml +++ b/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master__okd.yaml @@ -36,11 +36,11 @@ resources: cpu: 100m memory: 200Mi tests: -- as: e2e-aws +- as: e2e-gcp optional: true steps: - cluster_profile: aws - workflow: openshift-e2e-aws + cluster_profile: gcp + workflow: openshift-e2e-gcp zz_generated_metadata: branch: master org: operator-framework diff --git a/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.11.yaml b/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.11.yaml index 123b7d52250c6..fea421d776926 100644 --- a/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.11.yaml +++ b/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.11.yaml @@ -41,17 +41,17 @@ tests: commands: make unit container: from: src -- as: e2e-aws +- as: e2e-gcp steps: - cluster_profile: aws - workflow: openshift-e2e-aws -- as: e2e-aws-serial + cluster_profile: gcp + workflow: openshift-e2e-gcp +- as: e2e-gcp-serial steps: - cluster_profile: aws - workflow: openshift-e2e-aws-serial -- as: e2e-aws-operator + cluster_profile: gcp + workflow: openshift-e2e-gcp-serial +- as: e2e-gcp-operator steps: - cluster_profile: aws + cluster_profile: gcp test: - as: test cli: latest @@ -60,10 +60,10 @@ tests: resources: requests: cpu: 100m - workflow: ipi-aws -- as: e2e-aws-console-olm + workflow: ipi-gcp +- as: e2e-gcp-console-olm steps: - cluster_profile: aws + cluster_profile: gcp test: - as: test cli: latest @@ -72,11 +72,11 @@ tests: resources: requests: cpu: 100m - workflow: ipi-aws -- as: e2e-aws-upgrade + workflow: ipi-gcp +- as: e2e-gcp-upgrade steps: - cluster_profile: aws - workflow: openshift-upgrade-aws + cluster_profile: gcp + workflow: openshift-upgrade-gcp zz_generated_metadata: branch: release-4.11 org: operator-framework diff --git a/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.11__okd.yaml b/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.11__okd.yaml index 6648dd61061f3..e6dd0d172c162 100644 --- a/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.11__okd.yaml +++ b/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.11__okd.yaml @@ -37,11 +37,11 @@ resources: cpu: 100m memory: 200Mi tests: -- as: e2e-aws +- as: e2e-gcp optional: true steps: - cluster_profile: aws - workflow: openshift-e2e-aws + cluster_profile: gcp + workflow: openshift-e2e-gcp zz_generated_metadata: branch: release-4.11 org: operator-framework diff --git a/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.12.yaml b/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.12.yaml index 01e2e2ed4a5f4..40cc6dbcf8860 100644 --- a/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.12.yaml +++ b/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.12.yaml @@ -40,17 +40,17 @@ tests: commands: make unit container: from: src -- as: e2e-aws +- as: e2e-gcp steps: - cluster_profile: aws - workflow: openshift-e2e-aws -- as: e2e-aws-serial + cluster_profile: gcp + workflow: openshift-e2e-gcp +- as: e2e-gcp-serial steps: - cluster_profile: aws - workflow: openshift-e2e-aws-serial -- as: e2e-aws-operator + cluster_profile: gcp + workflow: openshift-e2e-gcp-serial +- as: e2e-gcp-operator steps: - cluster_profile: aws + cluster_profile: gcp test: - as: test cli: latest @@ -59,10 +59,10 @@ tests: resources: requests: cpu: 100m - workflow: ipi-aws -- as: e2e-aws-console-olm + workflow: ipi-gcp +- as: e2e-gcp-console-olm steps: - cluster_profile: aws + cluster_profile: gcp test: - as: test cli: latest @@ -71,11 +71,11 @@ tests: resources: requests: cpu: 100m - workflow: ipi-aws -- as: e2e-aws-upgrade + workflow: ipi-gcp +- as: e2e-gcp-upgrade steps: - cluster_profile: aws - workflow: openshift-upgrade-aws + cluster_profile: gcp + workflow: openshift-upgrade-gcp zz_generated_metadata: branch: release-4.12 org: operator-framework diff --git a/ci-operator/jobs/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master-presubmits.yaml b/ci-operator/jobs/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master-presubmits.yaml index 99ac691a083a8..cacb70f368886 100755 --- a/ci-operator/jobs/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master-presubmits.yaml +++ b/ci-operator/jobs/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master-presubmits.yaml @@ -6,15 +6,15 @@ presubmits: - ^master$ - ^master- cluster: build03 - context: ci/prow/e2e-aws + context: ci/prow/e2e-gcp decorate: true labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-operator-framework-operator-marketplace-master-e2e-aws - rerun_command: /test e2e-aws + name: pull-ci-operator-framework-operator-marketplace-master-e2e-gcp + rerun_command: /test e2e-gcp spec: containers: - args: @@ -23,8 +23,8 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-cluster-profile - - --target=e2e-aws + - --secret-dir=/usr/local/e2e-gcp-cluster-profile + - --target=e2e-gcp command: - ci-operator image: ci-operator:latest @@ -40,7 +40,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-cluster-profile + - mountPath: /usr/local/e2e-gcp-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -63,30 +63,34 @@ presubmits: secret: secretName: ci-pull-credentials - name: cluster-profile - secret: - secretName: cluster-secrets-aws + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp - name: pull-secret secret: secretName: registry-pull-credentials - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*) - agent: kubernetes always_run: true branches: - ^master$ - ^master- cluster: build03 - context: ci/prow/e2e-aws-console-olm + context: ci/prow/e2e-gcp-console-olm decorate: true labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-operator-framework-operator-marketplace-master-e2e-aws-console-olm - rerun_command: /test e2e-aws-console-olm + name: pull-ci-operator-framework-operator-marketplace-master-e2e-gcp-console-olm + rerun_command: /test e2e-gcp-console-olm spec: containers: - args: @@ -95,8 +99,8 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-console-olm-cluster-profile - - --target=e2e-aws-console-olm + - --secret-dir=/usr/local/e2e-gcp-console-olm-cluster-profile + - --target=e2e-gcp-console-olm command: - ci-operator image: ci-operator:latest @@ -112,7 +116,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-console-olm-cluster-profile + - mountPath: /usr/local/e2e-gcp-console-olm-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -135,30 +139,34 @@ presubmits: secret: secretName: ci-pull-credentials - name: cluster-profile - secret: - secretName: cluster-secrets-aws + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp - name: pull-secret secret: secretName: registry-pull-credentials - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-console-olm,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp-console-olm,?($|\s.*) - agent: kubernetes always_run: true branches: - ^master$ - ^master- cluster: build03 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-gcp-operator decorate: true labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-operator-framework-operator-marketplace-master-e2e-aws-operator - rerun_command: /test e2e-aws-operator + name: pull-ci-operator-framework-operator-marketplace-master-e2e-gcp-operator + rerun_command: /test e2e-gcp-operator spec: containers: - args: @@ -167,8 +175,8 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile - - --target=e2e-aws-operator + - --secret-dir=/usr/local/e2e-gcp-operator-cluster-profile + - --target=e2e-gcp-operator command: - ci-operator image: ci-operator:latest @@ -184,7 +192,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-operator-cluster-profile + - mountPath: /usr/local/e2e-gcp-operator-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -207,30 +215,34 @@ presubmits: secret: secretName: ci-pull-credentials - name: cluster-profile - secret: - secretName: cluster-secrets-aws + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp - name: pull-secret secret: secretName: registry-pull-credentials - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp-operator,?($|\s.*) - agent: kubernetes always_run: true branches: - ^master$ - ^master- cluster: build03 - context: ci/prow/e2e-aws-serial + context: ci/prow/e2e-gcp-serial decorate: true labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-operator-framework-operator-marketplace-master-e2e-aws-serial - rerun_command: /test e2e-aws-serial + name: pull-ci-operator-framework-operator-marketplace-master-e2e-gcp-serial + rerun_command: /test e2e-gcp-serial spec: containers: - args: @@ -239,8 +251,8 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-serial-cluster-profile - - --target=e2e-aws-serial + - --secret-dir=/usr/local/e2e-gcp-serial-cluster-profile + - --target=e2e-gcp-serial command: - ci-operator image: ci-operator:latest @@ -256,7 +268,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-serial-cluster-profile + - mountPath: /usr/local/e2e-gcp-serial-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -279,30 +291,34 @@ presubmits: secret: secretName: ci-pull-credentials - name: cluster-profile - secret: - secretName: cluster-secrets-aws + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp - name: pull-secret secret: secretName: registry-pull-credentials - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-serial,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp-serial,?($|\s.*) - agent: kubernetes always_run: true branches: - ^master$ - ^master- cluster: build03 - context: ci/prow/e2e-aws-upgrade + context: ci/prow/e2e-gcp-upgrade decorate: true labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-operator-framework-operator-marketplace-master-e2e-aws-upgrade - rerun_command: /test e2e-aws-upgrade + name: pull-ci-operator-framework-operator-marketplace-master-e2e-gcp-upgrade + rerun_command: /test e2e-gcp-upgrade spec: containers: - args: @@ -311,8 +327,8 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile - - --target=e2e-aws-upgrade + - --secret-dir=/usr/local/e2e-gcp-upgrade-cluster-profile + - --target=e2e-gcp-upgrade command: - ci-operator image: ci-operator:latest @@ -328,7 +344,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile + - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -351,15 +367,19 @@ presubmits: secret: secretName: ci-pull-credentials - name: cluster-profile - secret: - secretName: cluster-secrets-aws + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp - name: pull-secret secret: secretName: registry-pull-credentials - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-upgrade,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*) - agent: kubernetes always_run: true branches: @@ -414,17 +434,17 @@ presubmits: - ^master$ - ^master- cluster: build03 - context: ci/prow/okd-e2e-aws + context: ci/prow/okd-e2e-gcp decorate: true labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp ci-operator.openshift.io/variant: okd ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-operator-framework-operator-marketplace-master-okd-e2e-aws + name: pull-ci-operator-framework-operator-marketplace-master-okd-e2e-gcp optional: true - rerun_command: /test okd-e2e-aws + rerun_command: /test okd-e2e-gcp spec: containers: - args: @@ -433,8 +453,8 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-cluster-profile - - --target=e2e-aws + - --secret-dir=/usr/local/e2e-gcp-cluster-profile + - --target=e2e-gcp - --variant=okd command: - ci-operator @@ -451,7 +471,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-cluster-profile + - mountPath: /usr/local/e2e-gcp-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -474,15 +494,19 @@ presubmits: secret: secretName: ci-pull-credentials - name: cluster-profile - secret: - secretName: cluster-secrets-aws + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp - name: pull-secret secret: secretName: registry-pull-credentials - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )okd-e2e-aws,?($|\s.*) + trigger: (?m)^/test( | .* )okd-e2e-gcp,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.11-presubmits.yaml b/ci-operator/jobs/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.11-presubmits.yaml index 3a7aeb63a30bb..492ab2776af1b 100644 --- a/ci-operator/jobs/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.11-presubmits.yaml +++ b/ci-operator/jobs/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.11-presubmits.yaml @@ -6,15 +6,15 @@ presubmits: - ^release-4\.11$ - ^release-4\.11- cluster: build03 - context: ci/prow/e2e-aws + context: ci/prow/e2e-gcp decorate: true labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-operator-framework-operator-marketplace-release-4.11-e2e-aws - rerun_command: /test e2e-aws + name: pull-ci-operator-framework-operator-marketplace-release-4.11-e2e-gcp + rerun_command: /test e2e-gcp spec: containers: - args: @@ -23,8 +23,8 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-cluster-profile - - --target=e2e-aws + - --secret-dir=/usr/local/e2e-gcp-cluster-profile + - --target=e2e-gcp command: - ci-operator image: ci-operator:latest @@ -40,7 +40,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-cluster-profile + - mountPath: /usr/local/e2e-gcp-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -63,30 +63,34 @@ presubmits: secret: secretName: ci-pull-credentials - name: cluster-profile - secret: - secretName: cluster-secrets-aws + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp - name: pull-secret secret: secretName: registry-pull-credentials - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*) - agent: kubernetes always_run: true branches: - ^release-4\.11$ - ^release-4\.11- cluster: build03 - context: ci/prow/e2e-aws-console-olm + context: ci/prow/e2e-gcp-console-olm decorate: true labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-operator-framework-operator-marketplace-release-4.11-e2e-aws-console-olm - rerun_command: /test e2e-aws-console-olm + name: pull-ci-operator-framework-operator-marketplace-release-4.11-e2e-gcp-console-olm + rerun_command: /test e2e-gcp-console-olm spec: containers: - args: @@ -95,8 +99,8 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-console-olm-cluster-profile - - --target=e2e-aws-console-olm + - --secret-dir=/usr/local/e2e-gcp-console-olm-cluster-profile + - --target=e2e-gcp-console-olm command: - ci-operator image: ci-operator:latest @@ -112,7 +116,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-console-olm-cluster-profile + - mountPath: /usr/local/e2e-gcp-console-olm-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -135,30 +139,34 @@ presubmits: secret: secretName: ci-pull-credentials - name: cluster-profile - secret: - secretName: cluster-secrets-aws + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp - name: pull-secret secret: secretName: registry-pull-credentials - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-console-olm,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp-console-olm,?($|\s.*) - agent: kubernetes always_run: true branches: - ^release-4\.11$ - ^release-4\.11- cluster: build03 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-gcp-operator decorate: true labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-operator-framework-operator-marketplace-release-4.11-e2e-aws-operator - rerun_command: /test e2e-aws-operator + name: pull-ci-operator-framework-operator-marketplace-release-4.11-e2e-gcp-operator + rerun_command: /test e2e-gcp-operator spec: containers: - args: @@ -167,8 +175,8 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile - - --target=e2e-aws-operator + - --secret-dir=/usr/local/e2e-gcp-operator-cluster-profile + - --target=e2e-gcp-operator command: - ci-operator image: ci-operator:latest @@ -184,7 +192,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-operator-cluster-profile + - mountPath: /usr/local/e2e-gcp-operator-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -207,30 +215,34 @@ presubmits: secret: secretName: ci-pull-credentials - name: cluster-profile - secret: - secretName: cluster-secrets-aws + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp - name: pull-secret secret: secretName: registry-pull-credentials - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp-operator,?($|\s.*) - agent: kubernetes always_run: true branches: - ^release-4\.11$ - ^release-4\.11- cluster: build03 - context: ci/prow/e2e-aws-serial + context: ci/prow/e2e-gcp-serial decorate: true labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-operator-framework-operator-marketplace-release-4.11-e2e-aws-serial - rerun_command: /test e2e-aws-serial + name: pull-ci-operator-framework-operator-marketplace-release-4.11-e2e-gcp-serial + rerun_command: /test e2e-gcp-serial spec: containers: - args: @@ -239,8 +251,8 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-serial-cluster-profile - - --target=e2e-aws-serial + - --secret-dir=/usr/local/e2e-gcp-serial-cluster-profile + - --target=e2e-gcp-serial command: - ci-operator image: ci-operator:latest @@ -256,7 +268,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-serial-cluster-profile + - mountPath: /usr/local/e2e-gcp-serial-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -279,30 +291,34 @@ presubmits: secret: secretName: ci-pull-credentials - name: cluster-profile - secret: - secretName: cluster-secrets-aws + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp - name: pull-secret secret: secretName: registry-pull-credentials - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-serial,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp-serial,?($|\s.*) - agent: kubernetes always_run: true branches: - ^release-4\.11$ - ^release-4\.11- cluster: build03 - context: ci/prow/e2e-aws-upgrade + context: ci/prow/e2e-gcp-upgrade decorate: true labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-operator-framework-operator-marketplace-release-4.11-e2e-aws-upgrade - rerun_command: /test e2e-aws-upgrade + name: pull-ci-operator-framework-operator-marketplace-release-4.11-e2e-gcp-upgrade + rerun_command: /test e2e-gcp-upgrade spec: containers: - args: @@ -311,8 +327,8 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile - - --target=e2e-aws-upgrade + - --secret-dir=/usr/local/e2e-gcp-upgrade-cluster-profile + - --target=e2e-gcp-upgrade command: - ci-operator image: ci-operator:latest @@ -328,7 +344,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile + - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -351,15 +367,19 @@ presubmits: secret: secretName: ci-pull-credentials - name: cluster-profile - secret: - secretName: cluster-secrets-aws + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp - name: pull-secret secret: secretName: registry-pull-credentials - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-upgrade,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*) - agent: kubernetes always_run: true branches: @@ -413,17 +433,17 @@ presubmits: - ^release-4\.11$ - ^release-4\.11- cluster: build03 - context: ci/prow/okd-e2e-aws + context: ci/prow/okd-e2e-gcp decorate: true labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp ci-operator.openshift.io/variant: okd ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-operator-framework-operator-marketplace-release-4.11-okd-e2e-aws + name: pull-ci-operator-framework-operator-marketplace-release-4.11-okd-e2e-gcp optional: true - rerun_command: /test okd-e2e-aws + rerun_command: /test okd-e2e-gcp spec: containers: - args: @@ -432,8 +452,8 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-cluster-profile - - --target=e2e-aws + - --secret-dir=/usr/local/e2e-gcp-cluster-profile + - --target=e2e-gcp - --variant=okd command: - ci-operator @@ -450,7 +470,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-cluster-profile + - mountPath: /usr/local/e2e-gcp-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -473,15 +493,19 @@ presubmits: secret: secretName: ci-pull-credentials - name: cluster-profile - secret: - secretName: cluster-secrets-aws + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp - name: pull-secret secret: secretName: registry-pull-credentials - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )okd-e2e-aws,?($|\s.*) + trigger: (?m)^/test( | .* )okd-e2e-gcp,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.12-presubmits.yaml b/ci-operator/jobs/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.12-presubmits.yaml index 54fe9f51903e6..27aaf278178cd 100644 --- a/ci-operator/jobs/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.12-presubmits.yaml +++ b/ci-operator/jobs/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.12-presubmits.yaml @@ -6,15 +6,15 @@ presubmits: - ^release-4\.12$ - ^release-4\.12- cluster: build03 - context: ci/prow/e2e-aws + context: ci/prow/e2e-gcp decorate: true labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-operator-framework-operator-marketplace-release-4.12-e2e-aws - rerun_command: /test e2e-aws + name: pull-ci-operator-framework-operator-marketplace-release-4.12-e2e-gcp + rerun_command: /test e2e-gcp spec: containers: - args: @@ -23,8 +23,8 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-cluster-profile - - --target=e2e-aws + - --secret-dir=/usr/local/e2e-gcp-cluster-profile + - --target=e2e-gcp command: - ci-operator image: ci-operator:latest @@ -40,7 +40,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-cluster-profile + - mountPath: /usr/local/e2e-gcp-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -63,30 +63,34 @@ presubmits: secret: secretName: ci-pull-credentials - name: cluster-profile - secret: - secretName: cluster-secrets-aws + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp - name: pull-secret secret: secretName: registry-pull-credentials - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*) - agent: kubernetes always_run: true branches: - ^release-4\.12$ - ^release-4\.12- cluster: build03 - context: ci/prow/e2e-aws-console-olm + context: ci/prow/e2e-gcp-console-olm decorate: true labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-operator-framework-operator-marketplace-release-4.12-e2e-aws-console-olm - rerun_command: /test e2e-aws-console-olm + name: pull-ci-operator-framework-operator-marketplace-release-4.12-e2e-gcp-console-olm + rerun_command: /test e2e-gcp-console-olm spec: containers: - args: @@ -95,8 +99,8 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-console-olm-cluster-profile - - --target=e2e-aws-console-olm + - --secret-dir=/usr/local/e2e-gcp-console-olm-cluster-profile + - --target=e2e-gcp-console-olm command: - ci-operator image: ci-operator:latest @@ -112,7 +116,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-console-olm-cluster-profile + - mountPath: /usr/local/e2e-gcp-console-olm-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -135,30 +139,34 @@ presubmits: secret: secretName: ci-pull-credentials - name: cluster-profile - secret: - secretName: cluster-secrets-aws + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp - name: pull-secret secret: secretName: registry-pull-credentials - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-console-olm,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp-console-olm,?($|\s.*) - agent: kubernetes always_run: true branches: - ^release-4\.12$ - ^release-4\.12- cluster: build03 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-gcp-operator decorate: true labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-operator-framework-operator-marketplace-release-4.12-e2e-aws-operator - rerun_command: /test e2e-aws-operator + name: pull-ci-operator-framework-operator-marketplace-release-4.12-e2e-gcp-operator + rerun_command: /test e2e-gcp-operator spec: containers: - args: @@ -167,8 +175,8 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile - - --target=e2e-aws-operator + - --secret-dir=/usr/local/e2e-gcp-operator-cluster-profile + - --target=e2e-gcp-operator command: - ci-operator image: ci-operator:latest @@ -184,7 +192,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-operator-cluster-profile + - mountPath: /usr/local/e2e-gcp-operator-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -207,30 +215,34 @@ presubmits: secret: secretName: ci-pull-credentials - name: cluster-profile - secret: - secretName: cluster-secrets-aws + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp - name: pull-secret secret: secretName: registry-pull-credentials - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp-operator,?($|\s.*) - agent: kubernetes always_run: true branches: - ^release-4\.12$ - ^release-4\.12- cluster: build03 - context: ci/prow/e2e-aws-serial + context: ci/prow/e2e-gcp-serial decorate: true labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-operator-framework-operator-marketplace-release-4.12-e2e-aws-serial - rerun_command: /test e2e-aws-serial + name: pull-ci-operator-framework-operator-marketplace-release-4.12-e2e-gcp-serial + rerun_command: /test e2e-gcp-serial spec: containers: - args: @@ -239,8 +251,8 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-serial-cluster-profile - - --target=e2e-aws-serial + - --secret-dir=/usr/local/e2e-gcp-serial-cluster-profile + - --target=e2e-gcp-serial command: - ci-operator image: ci-operator:latest @@ -256,7 +268,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-serial-cluster-profile + - mountPath: /usr/local/e2e-gcp-serial-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -279,30 +291,34 @@ presubmits: secret: secretName: ci-pull-credentials - name: cluster-profile - secret: - secretName: cluster-secrets-aws + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp - name: pull-secret secret: secretName: registry-pull-credentials - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-serial,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp-serial,?($|\s.*) - agent: kubernetes always_run: true branches: - ^release-4\.12$ - ^release-4\.12- cluster: build03 - context: ci/prow/e2e-aws-upgrade + context: ci/prow/e2e-gcp-upgrade decorate: true labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-operator-framework-operator-marketplace-release-4.12-e2e-aws-upgrade - rerun_command: /test e2e-aws-upgrade + name: pull-ci-operator-framework-operator-marketplace-release-4.12-e2e-gcp-upgrade + rerun_command: /test e2e-gcp-upgrade spec: containers: - args: @@ -311,8 +327,8 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile - - --target=e2e-aws-upgrade + - --secret-dir=/usr/local/e2e-gcp-upgrade-cluster-profile + - --target=e2e-gcp-upgrade command: - ci-operator image: ci-operator:latest @@ -328,7 +344,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile + - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -351,15 +367,19 @@ presubmits: secret: secretName: ci-pull-credentials - name: cluster-profile - secret: - secretName: cluster-secrets-aws + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp - name: pull-secret secret: secretName: registry-pull-credentials - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-upgrade,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*) - agent: kubernetes always_run: true branches: