Moved lane to a separate workflow

ci-operator/config/openshift-kni/numaresources-operator/openshift-kni-numaresources-operator-main.yaml

@@ -187,40 +187,25 @@ tests:
     env:
       PROJECT_NAME: numaresources-operator
     workflow: openshift-ci-security
-- as: e2e-in-cluster-build
+- as: e2e-operator-upgrade
   steps:
     cluster_profile: aws-telco
+    dependencies:
+      OO_BUNDLE: numaresources-operator-bundle
+      OO_BUNDLE_OLD: numaresources-operator-bundle-4.17
     env:
       BASE_DOMAIN: telco5g-ci.devcluster.openshift.com
     test:
-    - as: install
-      cli: latest
-      commands: |
-        oc create namespace numaresources-operator
-        operator-sdk run bundle -n numaresources-operator --security-context-config restricted "$OO_BUNDLE_OLD"
-        oc wait --for condition=Available -n numaresources-operator deployment numaresources-controller-manager
-      dependencies:
-      - env: OO_BUNDLE_OLD
-        name: numaresources-operator-bundle-4.17
-      from: operator-sdk
-      resources:
-        requests:
-          cpu: 1000m
-          memory: 500Mi
-    - as: upgrade
+    - ref: telco5g-nrop-install
+    - ref: telco5g-nrop-upgrade
+    - as: e2e-test
       cli: latest
-      commands: |
-        operator-sdk run bundle-upgrade --timeout=10m --security-context-config restricted -n numaresources-operator "$OO_BUNDLE"
-        oc wait --for condition=Available -n numaresources-operator deployment numaresources-controller-manager
-        (! oc get machineconfig | grep -q "^51-numaresourcesoperator" || { echo "Unexpected numaresourcesoperator MachineConfig found"; exit 1; })
-      dependencies:
-      - env: OO_BUNDLE
-        name: numaresources-operator-bundle
-      from: operator-sdk
+      commands: make test-e2e
+      from: src
       resources:
         requests:
-          cpu: 1000m
-          memory: 500Mi
+          cpu: 500m
+          memory: 1Gi
     workflow: ipi-aws
 zz_generated_metadata:
   branch: main

ci-operator/jobs/openshift-kni/numaresources-operator/openshift-kni-numaresources-operator-main-presubmits.yaml

@@ -343,7 +343,7 @@ presubmits:
     - ^main$
     - ^main-
     cluster: build05
-    context: ci/prow/e2e-in-cluster-build
+    context: ci/prow/e2e-operator-upgrade
     decorate: true
     decoration_config:
       skip_cloning: true
@@ -353,8 +353,8 @@ presubmits:
       ci.openshift.io/generator: prowgen
       job-release: "4.18"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-kni-numaresources-operator-main-e2e-in-cluster-build
-    rerun_command: /test e2e-in-cluster-build
+    name: pull-ci-openshift-kni-numaresources-operator-main-e2e-operator-upgrade
+    rerun_command: /test e2e-operator-upgrade
     spec:
       containers:
       - args:
@@ -363,7 +363,7 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=e2e-in-cluster-build
+        - --target=e2e-operator-upgrade
         command:
         - ci-operator
         image: ci-operator:latest
@@ -411,7 +411,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-in-cluster-build,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-operator-upgrade,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:

ci-operator/step-registry/telco5g/nrop/OWNERS

@@ -0,0 +1,6 @@
+approvers:
+- ffromani
+- shajmakh
+- swatisehgal
+- Tal-or
+- yanirq

ci-operator/step-registry/telco5g/nrop/install/OWNERS

@@ -0,0 +1,6 @@
+approvers:
+- ffromani
+- shajmakh
+- swatisehgal
+- Tal-or
+- yanirq

ci-operator/step-registry/telco5g/nrop/install/telco5g-nrop-install-commands.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+oc create namespace numaresources-operator
+operator-sdk run bundle -n numaresources-operator --security-context-config restricted "$OO_BUNDLE_OLD"
+oc wait --for condition=Available -n numaresources-operator deployment numaresources-controller-manager

ci-operator/step-registry/telco5g/nrop/install/telco5g-nrop-install-ref.metadata.json

@@ -0,0 +1,12 @@
+{
+	"path": "telco5g/nrop/install/telco5g-nrop-install-ref.yaml",
+	"owners": {
+		"approvers": [
+			"ffromani",
+			"shajmakh",
+			"swatisehgal",
+			"Tal-or",
+			"yanirq"
+		]
+	}
+}

ci-operator/step-registry/telco5g/nrop/install/telco5g-nrop-install-ref.yaml

@@ -0,0 +1,12 @@
+ref:
+  as: telco5g-nrop-install
+  cli: latest
+  commands: telco5g-nrop-install-commands.sh
+  dependencies:
+    - env: OO_BUNDLE_OLD
+      name: ${OO_BUNDLE_OLD}
+  from: operator-sdk
+  resources:
+    requests:
+      cpu: 1000m
+      memory: 500Mi

ci-operator/step-registry/telco5g/nrop/upgrade/OWNERS

@@ -0,0 +1,6 @@
+approvers:
+- ffromani
+- shajmakh
+- swatisehgal
+- Tal-or
+- yanirq

ci-operator/step-registry/telco5g/nrop/upgrade/telco5g-nrop-upgrade-commands.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+operator-sdk run bundle-upgrade --timeout=10m --security-context-config restricted -n numaresources-operator "$OO_BUNDLE"
+oc wait --for condition=Available -n numaresources-operator deployment numaresources-controller-manager

ci-operator/step-registry/telco5g/nrop/upgrade/telco5g-nrop-upgrade-ref.metadata.json

@@ -0,0 +1,12 @@
+{
+	"path": "telco5g/nrop/upgrade/telco5g-nrop-upgrade-ref.yaml",
+	"owners": {
+		"approvers": [
+			"ffromani",
+			"shajmakh",
+			"swatisehgal",
+			"Tal-or",
+			"yanirq"
+		]
+	}
+}

ci-operator/step-registry/telco5g/nrop/upgrade/telco5g-nrop-upgrade-ref.yaml

@@ -0,0 +1,12 @@
+ref:
+  as: telco5g-nrop-upgrade
+  cli: latest
+  commands: telco5g-nrop-upgrade-commands.sh
+  dependencies:
+    - env: OO_BUNDLE
+      name: ${OO_BUNDLE}
+  from: operator-sdk
+  resources:
+    requests:
+      cpu: 1000m
+      memory: 500Mi