From 38c05d6e8d5592ba2889ca8dc1b4250d03c9f144 Mon Sep 17 00:00:00 2001
From: David Hurta <dhurta@redhat.com>
Date: Thu, 27 Feb 2025 17:13:25 +0100
Subject: [PATCH 1/2] cvo: Add e2e-agnostic-operator-devpreview job

The Cluster Version Operator repository is starting to develop
DevPreview functionalities.

We do have the e2e-agnostic-usc-devpreview job, which configures
a running Default cluster to a configured DevPreview cluster
using [1] script. However, other being developed features may even
impact the cluster installation; thus, add a job to verify the
changes on DevPreview installed clusters. Run CVO integration
tests to check against respective regressions in a reliable way
instead of running the default step.

The job will help us to verify small changes on DevPreview PRs quickly.
The job will help us to detect respective regressions sooner.

[1]: https://github.com/openshift/cluster-version-operator/blob/main/hack/test-usc-integration.sh
---
 .../openshift-cluster-version-operator-main.yaml  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-main.yaml b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-main.yaml
index 5821383318817..57aff2390a125 100644
--- a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-main.yaml
+++ b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-main.yaml
@@ -165,6 +165,21 @@ tests:
     env:
       FEATURE_SET: TechPreviewNoUpgrade
     workflow: openshift-upgrade-azure
+- as: e2e-agnostic-operator-devpreview
+  optional: true
+  steps:
+    cluster_profile: azure4
+    env:
+      FEATURE_SET: DevPreviewNoUpgrade
+    test:
+    - as: e2e-test
+      commands: hack/test-integration.sh
+      from: src
+      resources:
+        requests:
+          cpu: 100m
+          memory: 200Mi
+    workflow: openshift-e2e-azure
 zz_generated_metadata:
   branch: main
   org: openshift

From 02ac3f6bbdb9823bd8bd2886ac81565703d4f58f Mon Sep 17 00:00:00 2001
From: David Hurta <dhurta@redhat.com>
Date: Wed, 12 Mar 2025 16:29:40 +0100
Subject: [PATCH 2/2] Run `make jobs`

---
 ...ster-version-operator-main-presubmits.yaml | 73 +++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-main-presubmits.yaml b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-main-presubmits.yaml
index ce10061e3664e..947b45be2feb3 100644
--- a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-main-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-main-presubmits.yaml
@@ -73,6 +73,79 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-agnostic-operator,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^main$
+    - ^main-
+    cluster: build06
+    context: ci/prow/e2e-agnostic-operator-devpreview
+    decorate: true
+    labels:
+      ci-operator.openshift.io/cloud: azure4
+      ci-operator.openshift.io/cloud-cluster-profile: azure4
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-cluster-version-operator-main-e2e-agnostic-operator-devpreview
+    optional: true
+    rerun_command: /test e2e-agnostic-operator-devpreview
+    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-agnostic-operator-devpreview
+        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: /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-agnostic-operator-devpreview,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches: