openshift · openshift-merge-bot · Nov 7, 2023 · Nov 2, 2023
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
@@ -1,55 +1,55 @@
 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
     dockerfile_path: bundle.Dockerfile
     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: