Revert "stackrox: master: use automation-flavor for OCP 4 (#44623)" (#44860)

This reverts commit f126154.

Author: gavin-stackrox

ci-operator/config/stackrox/stackrox/stackrox-stackrox-master__ocp-4-10.yaml

@@ -1,8 +1,4 @@
 base_images:
-  ocp-4:
-    name: automation-flavors
-    namespace: stackrox
-    tag: openshift-4-0.8.3
   ubi-minimal:
     name: ubi-minimal
     namespace: ocp
@@ -12,6 +8,11 @@ build_root:
     name: apollo-ci
     namespace: stackrox
     tag: stackrox-test-0.3.59
+releases:
+  latest:
+    release:
+      channel: stable
+      version: "4.10"
 resources:
   '*':
     requests:
@@ -23,117 +24,141 @@ tests:
   optional: true
   run_if_changed: ^((generated|image|operator|pkg|make|deploy|scripts)/.*|Makefile|status\.sh|COLLECTOR_VERSION|EXPECTED_GO_VERSION)
   steps:
+    cluster_profile: aws
     env:
       COLLECTION_METHOD: core_bpf
-      OCP_VERSION: ocp/stable-4.10
       TEST_SUITE: ocp-qa-e2e-tests
-    workflow: stackrox-automation-flavors-ocp-4-e2e
+    test:
+    - ref: stackrox-e2e
+    workflow: ipi-aws
   timeout: 5h0m0s
 - as: ebpf-qa-e2e-tests
   optional: true
   run_if_changed: ^COLLECTOR_VERSION
   steps:
+    cluster_profile: aws
     env:
       COLLECTION_METHOD: ebpf
-      OCP_VERSION: ocp/stable-4.10
       TEST_SUITE: ocp-qa-e2e-tests
-    workflow: stackrox-automation-flavors-ocp-4-e2e
+    test:
+    - ref: stackrox-e2e
+    workflow: ipi-aws
   timeout: 5h0m0s
 - as: operator-e2e-tests
   optional: true
   run_if_changed: ^((generated|image|operator|pkg|make|deploy|scripts)/.*|Makefile|status\.sh|COLLECTOR_VERSION|EXPECTED_GO_VERSION)
   steps:
+    cluster_profile: aws
     env:
-      OCP_VERSION: ocp/stable-4.10
       TEST_SUITE: ocp-operator-e2e-tests
-    workflow: stackrox-automation-flavors-ocp-4-e2e
+    test:
+    - ref: stackrox-e2e
+    workflow: ipi-aws
   timeout: 5h0m0s
 - as: sensor-integration-tests
   optional: true
   steps:
+    cluster_profile: aws
     env:
       COLLECTION_METHOD: core_bpf
-      OCP_VERSION: ocp/stable-4.10
       TEST_SUITE: ocp-sensor-integration-tests
-    workflow: stackrox-automation-flavors-ocp-4-e2e
+    test:
+    - ref: stackrox-e2e
+    workflow: ipi-aws
   timeout: 5h0m0s
 - as: ui-e2e-tests
   optional: true
   run_if_changed: ^ui/
   steps:
+    cluster_profile: aws
     env:
       COLLECTION_METHOD: core_bpf
-      OCP_VERSION: ocp/stable-4.10
       TEST_SUITE: ocp-ui-e2e-tests
-    workflow: stackrox-automation-flavors-ocp-4-e2e
+    test:
+    - ref: stackrox-e2e
+    workflow: ipi-aws
   timeout: 5h0m0s
 - as: compliance-e2e-tests
   optional: true
   run_if_changed: ^(compliance|central\/compliance.*)
   steps:
+    cluster_profile: aws
     env:
       COLLECTION_METHOD: core_bpf
-      OCP_VERSION: ocp/stable-4.10
       TEST_SUITE: ocp-compliance-e2e-tests
-    workflow: stackrox-automation-flavors-ocp-4-e2e
+    test:
+    - ref: stackrox-e2e
+    workflow: ipi-aws
   timeout: 5h0m0s
 - always_run: false
   as: sensor-profiling
   optional: true
   steps:
+    cluster_profile: aws
     env:
       COLLECTION_METHOD: core_bpf
-      OCP_VERSION: ocp/stable-4.10
       TEST_SUITE: ocp-sensor-profiling
-    workflow: stackrox-automation-flavors-ocp-4-e2e
+    test:
+    - ref: stackrox-e2e
+    workflow: ipi-aws
   timeout: 2h0m0s
 - as: merge-qa-e2e-tests
   postsubmit: true
   skip_if_only_changed: ^ui/
   steps:
+    cluster_profile: aws
     env:
       COLLECTION_METHOD: core_bpf
-      OCP_VERSION: ocp/stable-4.10
       TEST_SUITE: ocp-qa-e2e-tests
-    workflow: stackrox-automation-flavors-ocp-4-e2e
+    test:
+    - ref: stackrox-e2e
+    workflow: ipi-aws
   timeout: 5h0m0s
 - as: merge-ebpf-qa-e2e-tests
   postsubmit: true
   run_if_changed: ^COLLECTOR_VERSION
   steps:
+    cluster_profile: aws
     env:
       COLLECTION_METHOD: ebpf
-      OCP_VERSION: ocp/stable-4.10
       TEST_SUITE: ocp-qa-e2e-tests
-    workflow: stackrox-automation-flavors-ocp-4-e2e
+    test:
+    - ref: stackrox-e2e
+    workflow: ipi-aws
   timeout: 5h0m0s
 - as: merge-operator-e2e-tests
   postsubmit: true
   run_if_changed: ^((generated|image|operator|pkg|make|deploy|scripts)/.*|Makefile|status\.sh|COLLECTOR_VERSION|EXPECTED_GO_VERSION)
   steps:
+    cluster_profile: aws
     env:
-      OCP_VERSION: ocp/stable-4.10
       TEST_SUITE: ocp-operator-e2e-tests
-    workflow: stackrox-automation-flavors-ocp-4-e2e
+    test:
+    - ref: stackrox-e2e
+    workflow: ipi-aws
   timeout: 5h0m0s
 - as: merge-ui-e2e-tests
   postsubmit: true
   steps:
+    cluster_profile: aws
     env:
       COLLECTION_METHOD: core_bpf
-      OCP_VERSION: ocp/stable-4.10
       TEST_SUITE: ocp-ui-e2e-tests
-    workflow: stackrox-automation-flavors-ocp-4-e2e
+    test:
+    - ref: stackrox-e2e
+    workflow: ipi-aws
   timeout: 5h0m0s
 - as: merge-compliance-e2e-tests
   postsubmit: true
   run_if_changed: ^(compliance|central\/compliance.*)
   steps:
+    cluster_profile: aws
     env:
       COLLECTION_METHOD: core_bpf
-      OCP_VERSION: ocp/stable-4.10
       TEST_SUITE: ocp-compliance-e2e-tests
-    workflow: stackrox-automation-flavors-ocp-4-e2e
+    test:
+    - ref: stackrox-e2e
+    workflow: ipi-aws
   timeout: 5h0m0s
 zz_generated_metadata:
   branch: master