From 23d93465e829d68df90f9576a7ba6c71b90442a5 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Thu, 2 Nov 2023 15:08:46 -0700 Subject: [PATCH] ci-operator/config/openshift/cincinnati-operator: operator-e2e-old-ocp-published-graph-data, etc. Moving to a recent Go builder, based on [1] and: $ oc -n ocp get -o json imagestream builder | jq -r '.status.tags[] | select(.items | length > 0) | .items[0].created + " " + .tag' | sort | grep golang ... 2023-11-02T19:53:15Z rhel-8-golang-1.18-openshift-4.11 2023-11-02T19:53:23Z rhel-8-golang-1.17-openshift-4.11 2023-11-02T20:49:19Z rhel-8-golang-1.19-openshift-4.13 2023-11-02T20:49:25Z rhel-9-golang-1.19-openshift-4.13 2023-11-02T21:54:25Z rhel-9-golang-1.20-openshift-4.14 2023-11-02T21:54:46Z rhel-8-golang-1.20-openshift-4.14 2023-11-02T21:55:24Z rhel-8-golang-1.19-openshift-4.14 2023-11-02T21:55:29Z rhel-9-golang-1.19-openshift-4.14 I'd tried dropping the build_root stanza, because we didn't seem to need the functionality it delivers [2]. But that removal caused failures like [3]: Failed to load CI Operator configuration" error="invalid ci-operator config: invalid configuration: when 'images' are specified 'build_root' is required and must have image_stream_tag, project_image or from_repository set" source-file=ci-operator/config/openshift/cincinnati-operator/openshift-cincinnati-operator-master.yaml And [2] docs a need for Git, which apparently the UBI images don't have. So I'm using a Go image here still, even though we don't need Go, and although that means some tedious bumping to keep up with RHEL and Go versions instead of floating. The operators stanza doc'ed in [4] remains largely unchanged, although I did rename 'cincinnati_operand_latest' to 'cincinnati-operand', because these tests use a single operand image, and there is no need to distinguish between multiple operand images with "latest". The image used for operator-sdk (which I bump to an OpenShift 4.14 base) and its use are doc'ed in [5]. The 4.14 cluster-claim pool I'm transitioning to is listed as healthy in [6]. For the end-to-end tests, we install the operator via the test suite, so we do not need the SDK bits. I've dropped OPERATOR_IMAGE, because we are well past the transition initiated by eae9d3813b (ci-operator/config/openshift/cincinnati-operator: Set RELATED_IMAGE_*, 2021-04-05, #17435) and openshift/cincinnati-operator@799d18525b (Changing the name to make OSBS auto repo/registry replacements to work, 2021-04-06, openshift/cincinnati-operator#104). I'm consistently using the current Cincinnati operand instead of the pinned one, because we ship the OpenShift Update Service Operator as a bundle with the operator and operand, and while it might be useful to grow update-between-OSUS-releases test coverage, we do not expect long durations of new operators coexisting with old-image operand pods. And we never expect new operators to touch Deployments with old operand images, except to bump them to new operand images. We'd been using digest-pinned operand images here since efcafb613f (ci-operator/config/openshift/cincinnati-operator: Move e2e-operator to multi-step, 2020-10-06, #12486), where I said: In a future pivot we'll pull the operand image out of CI too, instead of hard-coding. But with this change we at least move the hard-coding into the CI repository. 4f46d7e84b (cincinnati-operator: test operator against released OSUS version and latest master, 2022-01-11, #25152) brought in that floating operand image, but neglected, for reasons that I am not clear on, did not drop the digest-pinned operand. I'm dropping it now. With "which operand image" removed as a differentiator, the remaining differentiators for the end-to-end tests are: * Which host OpenShift? * To protect from "new operators require new platform capabilities not present in older OpenShift releases", we have an old-ocp job. It's currently 4.11 for the oldest supported release [7]. * To protect from "new operators still use platform capabilities that have been removed from development branches of OpenShift", we have a new-ocp job. It's currently 4.14, as the most modern openshift-ci pool in [6], but if there was a 4.15 openshift-ci pool I'd us that to ensure we work on dev-branch engineering candidates like 4.15.0-ec.1. * To protect against "HyperShift does something the operator does not expect", we have a hypershift job. I'd prefer to defer "which version?" to the workflow, because we do not expect HyperShift-specific difference to evolve much between 4.y releases, while the APIs used by the operator (Deployments, Services, Routes, etc.) might. But perhaps I'm wrong, and we will see more API evolution during HyperShift minor versions. And in any case, today 4.14 fails with [8]: Unable to apply 4.14.1: some cluster operators are not available so in the short term I'm going with 4.13, but with a generic name so we only have to bump one place as HyperShift support improves. * I'm not worrying about enumerating all the current 4.y options like we had done before. That is more work to maintain, and renaming required jobs confuses Prow and requires an /override of the removed job. It seems unlikely that we work on 4.old, break on some 4.middle, and work again on 4.dev. Again, we can always revisit this if we change our minds about the exposure. * Which graph-data? * To protect against "I updated my OSUS without changing the graph-data image, and it broke", we have published-graph-data jobs. These consume images that were built by previous postsubmits in the cincinnati-graph-data repository. * We could theoretically also add coverage for older forms of graph-data images we suspect customers might be using. I'm punting this kind of thing to possible future work, if we decide the exposure is significant enough to warrant ongoing CI coverage. * To allow testing new features like serving signatures, we have a local-graph-data job. This consumes a graph-data image built from steps in the operator repository, allowing convenient testing of changes that simultaneously tweak the operator and how the graph-data image is built. For example, [9] injects an image signature into graph-data, and updates graph-data to serve it. I'm setting a GRAPH_DATA environment variable to 'local' to allow the test suite to easily distinguish this case. [1]: https://docs.ci.openshift.org/docs/architecture/images/#ci-images [2]: https://docs.ci.openshift.org/docs/architecture/ci-operator/#build-root-image [3]: https://prow.ci.openshift.org/view/gs/origin-ci-test/pr-logs/pull/openshift_release/45245/pull-ci-openshift-release-master-generated-config/1720218786344210432 [4]: https://docs.ci.openshift.org/docs/how-tos/testing-operator-sdk-operators/#building-operator-bundles [5]: https://docs.ci.openshift.org/docs/how-tos/testing-operator-sdk-operators/#simple-operator-installation [6]: https://docs.ci.openshift.org/docs/how-tos/cluster-claim/#existing-cluster-pools [7]: https://access.redhat.com/support/policy/updates/openshift/#dates [8]: https://prow.ci.openshift.org/view/gs/origin-ci-test/pr-logs/pull/openshift_release/45245/rehearse-45245-pull-ci-openshift-cincinnati-operator-master-operator-e2e-hypershift-local-graph-data/1720287506777247744 [9]: https://github.com/openshift/cincinnati-operator/pull/176 --- .../openshift-cincinnati-operator-master.yaml | 269 ++------ ...cincinnati-operator-master-presubmits.yaml | 572 +----------------- 2 files changed, 62 insertions(+), 779 deletions(-) diff --git a/ci-operator/config/openshift/cincinnati-operator/openshift-cincinnati-operator-master.yaml b/ci-operator/config/openshift/cincinnati-operator/openshift-cincinnati-operator-master.yaml index 247b5e7c964f6..5ac90040c037d 100644 --- a/ci-operator/config/openshift/cincinnati-operator/openshift-cincinnati-operator-master.yaml +++ b/ci-operator/config/openshift/cincinnati-operator/openshift-cincinnati-operator-master.yaml @@ -1,32 +1,40 @@ base_images: - base: - name: "4.12" - namespace: ocp - tag: base - cincinnati_operand_latest: + cincinnati-operand: name: cincinnati-build-root namespace: cincinnati-ci tag: deploy - graphdata: - name: cincinnati-graph-data - namespace: cincinnati-ci-public - tag: stable + golang: + name: builder + namespace: ocp + tag: rhel-9-golang-1.20-openshift-4.14 operator-sdk: - name: "4.13" + name: "4.14" namespace: origin tag: operator-sdk + published-cincinnati-graph-data: + name: cincinnati-graph-data + namespace: cincinnati-ci-public + tag: stable + ubi: + name: ubi + namespace: ocp + tag: "9" build_root: image_stream_tag: - name: release - namespace: openshift - tag: golang-1.18 + name: builder + namespace: ocp + tag: rhel-9-golang-1.20-openshift-4.14 images: - dockerfile_path: build/Dockerfile - from: base + from: ubi + inputs: + golang: + as: + - registry.ci.openshift.org/openshift/release:golang-1.18 to: cincinnati-operator - dockerfile_path: dev/Dockerfile - from: base - to: cincinnati-graph-data-container + from: ubi + to: local-cincinnati-graph-data operator: bundles: - as: cincinnati-bundle @@ -34,22 +42,14 @@ operator: skip_building_index: true substitutions: - pullspec: quay.io/cincinnati/cincinnati:latest - with: pipeline:cincinnati_operand_latest + with: pipeline:cincinnati-operand - pullspec: controller:latest with: pipeline:cincinnati-operator releases: latest: - release: - channel: candidate - version: "4.14" - thirteen: release: channel: candidate version: "4.13" - twelve: - release: - channel: candidate - version: "4.12" resources: '*': limits: @@ -74,7 +74,7 @@ tests: owner: openshift-ci product: ocp timeout: 1h0m0s - version: "4.13" + version: "4.14" steps: test: - as: install @@ -92,64 +92,7 @@ tests: cpu: 500m memory: 1000Mi workflow: generic-claim -- as: operator-e2e-410 - cluster_claim: - architecture: amd64 - cloud: aws - owner: openshift-ci - product: ocp - timeout: 1h0m0s - version: "4.10" - steps: - test: - - as: e2e-test - cli: latest - commands: | - make func-test \ - RELATED_IMAGE_OPERAND=registry.redhat.io/openshift-update-service/openshift-update-service-rhel8@sha256:0e67daa2313ac7695b53de468ca0a540988befe1dfa5c9036eb05e21fd9f107a \ - OPENSHIFT_BUILD_NAMESPACE= - dependencies: - - env: OPERATOR_IMAGE - name: pipeline:cincinnati-operator - - env: RELATED_IMAGE_OPERATOR - name: pipeline:cincinnati-operator - - env: GRAPH_DATA_IMAGE - name: pipeline:cincinnati-graph-data-container - from: src - resources: - requests: - cpu: 100m - memory: 200Mi - workflow: generic-claim -- as: operator-e2e-latest-osus-410 - cluster_claim: - architecture: amd64 - cloud: aws - owner: openshift-ci - product: ocp - timeout: 1h0m0s - version: "4.10" - steps: - test: - - as: e2e-test - cli: latest - commands: make func-test OPENSHIFT_BUILD_NAMESPACE= - dependencies: - - env: OPERATOR_IMAGE - name: pipeline:cincinnati-operator - - env: RELATED_IMAGE_OPERATOR - name: pipeline:cincinnati-operator - - env: GRAPH_DATA_IMAGE - name: graphdata - - env: RELATED_IMAGE_OPERAND - name: cincinnati_operand_latest - from: src - resources: - requests: - cpu: 100m - memory: 200Mi - workflow: generic-claim -- as: operator-e2e-411 +- as: operator-e2e-old-ocp-published-graph-data cluster_claim: architecture: amd64 cloud: aws @@ -163,152 +106,49 @@ tests: cli: latest commands: | make func-test \ - RELATED_IMAGE_OPERAND=registry.redhat.io/openshift-update-service/openshift-update-service-rhel8@sha256:0e67daa2313ac7695b53de468ca0a540988befe1dfa5c9036eb05e21fd9f107a \ OPENSHIFT_BUILD_NAMESPACE= dependencies: - - env: OPERATOR_IMAGE - name: pipeline:cincinnati-operator - env: RELATED_IMAGE_OPERATOR name: pipeline:cincinnati-operator + - env: RELATED_IMAGE_OPERAND + name: pipeline:cincinnati-operand - env: GRAPH_DATA_IMAGE - name: pipeline:cincinnati-graph-data-container + name: pipeline:published-cincinnati-graph-data from: src resources: requests: cpu: 100m memory: 200Mi workflow: generic-claim -- as: operator-e2e-latest-osus-411 +- as: operator-e2e-new-ocp-published-graph-data cluster_claim: architecture: amd64 cloud: aws owner: openshift-ci product: ocp timeout: 1h0m0s - version: "4.11" - steps: - test: - - as: e2e-test - cli: latest - commands: make func-test OPENSHIFT_BUILD_NAMESPACE= - dependencies: - - env: OPERATOR_IMAGE - name: pipeline:cincinnati-operator - - env: RELATED_IMAGE_OPERATOR - name: pipeline:cincinnati-operator - - env: GRAPH_DATA_IMAGE - name: graphdata - - env: RELATED_IMAGE_OPERAND - name: cincinnati_operand_latest - from: src - resources: - requests: - cpu: 100m - memory: 200Mi - workflow: generic-claim -- as: operator-e2e-412 + version: "4.14" steps: - allow_best_effort_post_steps: true - cluster_profile: aws-2 - dependencies: - RELEASE_IMAGE_LATEST: release:twelve test: - as: e2e-test cli: latest commands: | make func-test \ - RELATED_IMAGE_OPERAND=registry.redhat.io/openshift-update-service/openshift-update-service-rhel8@sha256:0e67daa2313ac7695b53de468ca0a540988befe1dfa5c9036eb05e21fd9f107a \ OPENSHIFT_BUILD_NAMESPACE= dependencies: - - env: OPERATOR_IMAGE - name: pipeline:cincinnati-operator - - env: RELATED_IMAGE_OPERATOR - name: pipeline:cincinnati-operator - - env: GRAPH_DATA_IMAGE - name: pipeline:cincinnati-graph-data-container - from: src - resources: - requests: - cpu: 100m - memory: 200Mi - workflow: hypershift-hostedcluster-workflow -- as: operator-e2e-latest-osus-412 - steps: - allow_best_effort_post_steps: true - cluster_profile: aws-2 - dependencies: - RELEASE_IMAGE_LATEST: release:twelve - test: - - as: e2e-test - cli: latest - commands: make func-test OPENSHIFT_BUILD_NAMESPACE= - dependencies: - - env: OPERATOR_IMAGE - name: pipeline:cincinnati-operator - env: RELATED_IMAGE_OPERATOR name: pipeline:cincinnati-operator - - env: GRAPH_DATA_IMAGE - name: graphdata - env: RELATED_IMAGE_OPERAND - name: cincinnati_operand_latest - from: src - resources: - requests: - cpu: 100m - memory: 200Mi - workflow: hypershift-hostedcluster-workflow -- as: operator-e2e-413 - steps: - allow_best_effort_post_steps: true - cluster_profile: aws-2 - dependencies: - RELEASE_IMAGE_LATEST: release:thirteen - test: - - as: e2e-test - cli: latest - commands: | - make func-test \ - RELATED_IMAGE_OPERAND=registry.redhat.io/openshift-update-service/openshift-update-service-rhel8@sha256:0e67daa2313ac7695b53de468ca0a540988befe1dfa5c9036eb05e21fd9f107a \ - OPENSHIFT_BUILD_NAMESPACE= - dependencies: - - env: OPERATOR_IMAGE - name: pipeline:cincinnati-operator - - env: RELATED_IMAGE_OPERATOR - name: pipeline:cincinnati-operator - - env: GRAPH_DATA_IMAGE - name: pipeline:cincinnati-graph-data-container - from: src - resources: - requests: - cpu: 100m - memory: 200Mi - workflow: hypershift-hostedcluster-workflow -- as: operator-e2e-latest-osus-413 - steps: - allow_best_effort_post_steps: true - cluster_profile: aws-2 - dependencies: - RELEASE_IMAGE_LATEST: release:thirteen - test: - - as: e2e-test - cli: latest - commands: make func-test OPENSHIFT_BUILD_NAMESPACE= - dependencies: - - env: OPERATOR_IMAGE - name: pipeline:cincinnati-operator - - env: RELATED_IMAGE_OPERATOR - name: pipeline:cincinnati-operator + name: pipeline:cincinnati-operand - env: GRAPH_DATA_IMAGE - name: graphdata - - env: RELATED_IMAGE_OPERAND - name: cincinnati_operand_latest + name: pipeline:published-cincinnati-graph-data from: src resources: requests: cpu: 100m memory: 200Mi - workflow: hypershift-hostedcluster-workflow -- as: operator-e2e-414 + workflow: generic-claim +- as: operator-e2e-hypershift-local-graph-data steps: allow_best_effort_post_steps: true cluster_profile: aws-2 @@ -317,38 +157,19 @@ tests: cli: latest commands: | make func-test \ - RELATED_IMAGE_OPERAND=registry.redhat.io/openshift-update-service/openshift-update-service-rhel8@sha256:0e67daa2313ac7695b53de468ca0a540988befe1dfa5c9036eb05e21fd9f107a \ - OPENSHIFT_BUILD_NAMESPACE= + OPENSHIFT_BUILD_NAMESPACE= \ dependencies: - - env: OPERATOR_IMAGE - name: pipeline:cincinnati-operator - - env: RELATED_IMAGE_OPERATOR - name: pipeline:cincinnati-operator - - env: GRAPH_DATA_IMAGE - name: pipeline:cincinnati-graph-data-container - from: src - resources: - requests: - cpu: 100m - memory: 200Mi - workflow: hypershift-hostedcluster-workflow -- as: operator-e2e-latest-osus-414 - steps: - allow_best_effort_post_steps: true - cluster_profile: aws-2 - test: - - as: e2e-test - cli: latest - commands: make func-test OPENSHIFT_BUILD_NAMESPACE= - dependencies: - - env: OPERATOR_IMAGE - name: pipeline:cincinnati-operator - env: RELATED_IMAGE_OPERATOR name: pipeline:cincinnati-operator - - env: GRAPH_DATA_IMAGE - name: graphdata - env: RELATED_IMAGE_OPERAND - name: cincinnati_operand_latest + name: pipeline:cincinnati-operand + - env: GRAPH_DATA_IMAGE + name: pipeline:local-cincinnati-graph-data + env: + - default: local + documentation: Let the test suite know it has a locally-built graph-data image, + so it can enable custom testing. + name: GRAPH_DATA from: src resources: requests: diff --git a/ci-operator/jobs/openshift/cincinnati-operator/openshift-cincinnati-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cincinnati-operator/openshift-cincinnati-operator-master-presubmits.yaml index 6a045db304e7d..44bc2984b0db5 100644 --- a/ci-operator/jobs/openshift/cincinnati-operator/openshift-cincinnati-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cincinnati-operator/openshift-cincinnati-operator-master-presubmits.yaml @@ -235,151 +235,13 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )install-bundle,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^master$ - - ^master- - cluster: build01 - context: ci/prow/operator-e2e-410 - decorate: true - decoration_config: - skip_cloning: true - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cincinnati-operator-master-operator-e2e-410 - rerun_command: /test operator-e2e-410 - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=operator-e2e-410 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/hive-hive-credentials - name: hive-hive-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: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: hive-hive-credentials - secret: - secretName: hive-hive-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( | .* )operator-e2e-410,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^master$ - - ^master- - cluster: build01 - context: ci/prow/operator-e2e-411 - decorate: true - decoration_config: - skip_cloning: true - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cincinnati-operator-master-operator-e2e-411 - rerun_command: /test operator-e2e-411 - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=operator-e2e-411 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/hive-hive-credentials - name: hive-hive-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: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: hive-hive-credentials - secret: - secretName: hive-hive-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( | .* )operator-e2e-411,?($|\s.*) - agent: kubernetes always_run: true branches: - ^master$ - ^master- cluster: build03 - context: ci/prow/operator-e2e-412 + context: ci/prow/operator-e2e-hypershift-local-graph-data decorate: true decoration_config: skip_cloning: true @@ -388,8 +250,8 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cincinnati-operator-master-operator-e2e-412 - rerun_command: /test operator-e2e-412 + name: pull-ci-openshift-cincinnati-operator-master-operator-e2e-hypershift-local-graph-data + rerun_command: /test operator-e2e-hypershift-local-graph-data spec: containers: - args: @@ -398,8 +260,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/operator-e2e-412-cluster-profile - - --target=operator-e2e-412 + - --secret-dir=/usr/local/operator-e2e-hypershift-local-graph-data-cluster-profile + - --target=operator-e2e-hypershift-local-graph-data command: - ci-operator image: ci-operator:latest @@ -415,7 +277,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/operator-e2e-412-cluster-profile + - mountPath: /usr/local/operator-e2e-hypershift-local-graph-data-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -452,182 +314,22 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )operator-e2e-412,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^master$ - - ^master- - cluster: build03 - context: ci/prow/operator-e2e-413 - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws-2 - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cincinnati-operator-master-operator-e2e-413 - rerun_command: /test operator-e2e-413 - 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/operator-e2e-413-cluster-profile - - --target=operator-e2e-413 - 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/operator-e2e-413-cluster-profile - name: cluster-profile - - 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: cluster-profile - secret: - secretName: cluster-secrets-aws-2 - - 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( | .* )operator-e2e-413,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^master$ - - ^master- - cluster: build03 - context: ci/prow/operator-e2e-414 - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws-2 - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cincinnati-operator-master-operator-e2e-414 - rerun_command: /test operator-e2e-414 - 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/operator-e2e-414-cluster-profile - - --target=operator-e2e-414 - 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/operator-e2e-414-cluster-profile - name: cluster-profile - - 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: cluster-profile - secret: - secretName: cluster-secrets-aws-2 - - 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( | .* )operator-e2e-414,?($|\s.*) + trigger: (?m)^/test( | .* )operator-e2e-hypershift-local-graph-data,?($|\s.*) - agent: kubernetes always_run: true branches: - ^master$ - ^master- cluster: build01 - context: ci/prow/operator-e2e-latest-osus-410 + context: ci/prow/operator-e2e-new-ocp-published-graph-data decorate: true decoration_config: skip_cloning: true labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cincinnati-operator-master-operator-e2e-latest-osus-410 - rerun_command: /test operator-e2e-latest-osus-410 + name: pull-ci-openshift-cincinnati-operator-master-operator-e2e-new-ocp-published-graph-data + rerun_command: /test operator-e2e-new-ocp-published-graph-data spec: containers: - args: @@ -636,7 +338,7 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=operator-e2e-latest-osus-410 + - --target=operator-e2e-new-ocp-published-graph-data command: - ci-operator image: ci-operator:latest @@ -681,22 +383,22 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )operator-e2e-latest-osus-410,?($|\s.*) + trigger: (?m)^/test( | .* )operator-e2e-new-ocp-published-graph-data,?($|\s.*) - agent: kubernetes always_run: true branches: - ^master$ - ^master- cluster: build01 - context: ci/prow/operator-e2e-latest-osus-411 + context: ci/prow/operator-e2e-old-ocp-published-graph-data decorate: true decoration_config: skip_cloning: true labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cincinnati-operator-master-operator-e2e-latest-osus-411 - rerun_command: /test operator-e2e-latest-osus-411 + name: pull-ci-openshift-cincinnati-operator-master-operator-e2e-old-ocp-published-graph-data + rerun_command: /test operator-e2e-old-ocp-published-graph-data spec: containers: - args: @@ -705,7 +407,7 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=operator-e2e-latest-osus-411 + - --target=operator-e2e-old-ocp-published-graph-data command: - ci-operator image: ci-operator:latest @@ -750,247 +452,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )operator-e2e-latest-osus-411,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^master$ - - ^master- - cluster: build03 - context: ci/prow/operator-e2e-latest-osus-412 - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws-2 - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cincinnati-operator-master-operator-e2e-latest-osus-412 - rerun_command: /test operator-e2e-latest-osus-412 - 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/operator-e2e-latest-osus-412-cluster-profile - - --target=operator-e2e-latest-osus-412 - 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/operator-e2e-latest-osus-412-cluster-profile - name: cluster-profile - - 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: cluster-profile - secret: - secretName: cluster-secrets-aws-2 - - 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( | .* )operator-e2e-latest-osus-412,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^master$ - - ^master- - cluster: build03 - context: ci/prow/operator-e2e-latest-osus-413 - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws-2 - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cincinnati-operator-master-operator-e2e-latest-osus-413 - rerun_command: /test operator-e2e-latest-osus-413 - 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/operator-e2e-latest-osus-413-cluster-profile - - --target=operator-e2e-latest-osus-413 - 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/operator-e2e-latest-osus-413-cluster-profile - name: cluster-profile - - 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: cluster-profile - secret: - secretName: cluster-secrets-aws-2 - - 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( | .* )operator-e2e-latest-osus-413,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^master$ - - ^master- - cluster: build03 - context: ci/prow/operator-e2e-latest-osus-414 - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws-2 - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cincinnati-operator-master-operator-e2e-latest-osus-414 - rerun_command: /test operator-e2e-latest-osus-414 - 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/operator-e2e-latest-osus-414-cluster-profile - - --target=operator-e2e-latest-osus-414 - 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/operator-e2e-latest-osus-414-cluster-profile - name: cluster-profile - - 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: cluster-profile - secret: - secretName: cluster-secrets-aws-2 - - 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( | .* )operator-e2e-latest-osus-414,?($|\s.*) + trigger: (?m)^/test( | .* )operator-e2e-old-ocp-published-graph-data,?($|\s.*) - agent: kubernetes always_run: true branches: