From e579d05f9d00ecea5e9fc6bb45559f800564585b Mon Sep 17 00:00:00 2001
From: Ronny Baturov <rbaturov@redhat.com>
Date: Tue, 7 Jan 2025 11:16:55 +0200
Subject: [PATCH] wip

---
 ...shift-kni-numaresources-operator-main.yaml |  4 --
 ...i-numaresources-operator-release-4.18.yaml | 42 +++++++++++++++++++
 .../telco5g/nrop/telco5g-nrop-workflow.yaml   | 26 ------------
 3 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/ci-operator/config/openshift-kni/numaresources-operator/openshift-kni-numaresources-operator-main.yaml b/ci-operator/config/openshift-kni/numaresources-operator/openshift-kni-numaresources-operator-main.yaml
index c9a5a1e9d3855..b5f69ad6f9445 100644
--- a/ci-operator/config/openshift-kni/numaresources-operator/openshift-kni-numaresources-operator-main.yaml
+++ b/ci-operator/config/openshift-kni/numaresources-operator/openshift-kni-numaresources-operator-main.yaml
@@ -7,10 +7,6 @@ base_images:
     name: hypershift-operator
     namespace: hypershift
     tag: latest
-  numaresources-operator-bundle-4.17:
-    name: numaresources-operator-4.17
-    namespace: ocp-kni
-    tag: numaresources-operator-bundle
   os-min9:
     name: ubi-minimal
     namespace: ocp
diff --git a/ci-operator/config/openshift-kni/numaresources-operator/openshift-kni-numaresources-operator-release-4.18.yaml b/ci-operator/config/openshift-kni/numaresources-operator/openshift-kni-numaresources-operator-release-4.18.yaml
index 62f9454fa63f4..58d0590d1578e 100644
--- a/ci-operator/config/openshift-kni/numaresources-operator/openshift-kni-numaresources-operator-release-4.18.yaml
+++ b/ci-operator/config/openshift-kni/numaresources-operator/openshift-kni-numaresources-operator-release-4.18.yaml
@@ -7,6 +7,10 @@ base_images:
     name: hypershift-operator
     namespace: hypershift
     tag: latest
+  numaresources-operator-bundle-4.17:
+    name: numaresources-operator-4.17
+    namespace: ocp-kni
+    tag: numaresources-operator-bundle
   os-min9:
     name: ubi-minimal
     namespace: ocp
@@ -197,6 +201,44 @@ tests:
 - as: e2e-operator-upgrade
   steps:
     cluster_profile: aws-telco
+    dependencies:
+      OO_BUNDLE: numaresources-operator-bundle-4.17
+      OO_BUNDLE_NEW: numaresources-operator-bundle
+    env:
+      BASE_DOMAIN: telco5g-ci.devcluster.openshift.com
+      DELETE_MC: "false"
+      OO_INSTALL_MODE: OwnNamespace
+      OO_INSTALL_NAMESPACE: openshift-numaresources
+      TEST_SUITE: ""
+      TEST_TYPE: upgrade
+      TEST_UPGRADE_OPTIONS: ""
+      USER_TAGS: |
+        ci-job-source prowci
+        ci-job-branch release-4.18
+        ci-job-fullname openshift-kni-e2e-operator-upgrade-numaresources-operator-release-4.18
+        ci-job-type e2e-operator-upgrade
+        ci-repo-name numaresources-operator
+        ci-org-name openshift-kni
+    test:
+    - ref: optional-operators-operator-sdk
+    - as: test-install-e2e
+      cli: latest
+      commands: make test-install-e2e
+      from: src
+      resources:
+        requests:
+          cpu: 500m
+          memory: 1Gi
+    - ref: openshift-e2e-test
+    - ref: telco5g-nrop-upgrade
+    - as: test-upgrade-e2e
+      cli: latest
+      commands: make test-upgrade-e2e
+      from: src
+      resources:
+        requests:
+          cpu: 500m
+          memory: 1Gi
     workflow: telco5g-nrop
 zz_generated_metadata:
   branch: release-4.18
diff --git a/ci-operator/step-registry/telco5g/nrop/telco5g-nrop-workflow.yaml b/ci-operator/step-registry/telco5g/nrop/telco5g-nrop-workflow.yaml
index 8fed656c3bba6..982d7b918d001 100644
--- a/ci-operator/step-registry/telco5g/nrop/telco5g-nrop-workflow.yaml
+++ b/ci-operator/step-registry/telco5g/nrop/telco5g-nrop-workflow.yaml
@@ -4,34 +4,8 @@ workflow:
     allow_best_effort_post_steps: true
     pre:
     - chain: ipi-aws-pre-stableinitial
-    test:
-    - as: test-install-e2e
-      cli: latest
-      commands: make test-install-e2e
-      from: src
-      resources:
-        requests:
-          cpu: 500m
-          memory: 1Gi
-    - ref: openshift-e2e-test
-    - as: test-upgrade-e2e
-      cli: latest
-      commands: make test-upgrade-e2e
-      from: src
-      resources:
-        requests:
-          cpu: 500m
-          memory: 1Gi
     post:
     - ref: openshift-e2e-test-capabilities-check
     - chain: ipi-aws-post
-    dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: "release:previous"
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: "release:latest"
-    env:
-      TEST_TYPE: upgrade
-      TEST_SUITE: ""
-      TEST_UPGRADE_OPTIONS: ""
-      DELETE_MC: "false"
   documentation: |-
     The Openshift E2E AWS workflow executes the upgrade end-to-end test suite on AWS with a default cluster configuration and Loki as log collector, exercising an upgrade during the process.