Promote catalogd out of TechPreview

Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>

Author: Per Goncalves da Silva

ci-operator/config/openshift/operator-framework-catalogd/openshift-operator-framework-catalogd-main.yaml

@@ -71,12 +71,10 @@ tests:
   commands: commitchecker --start ${PULL_BASE_SHA:-main}
   container:
     from: commitchecker
-- as: openshift-e2e-aws-techpreview
+- as: openshift-e2e-aws
   skip_if_only_changed: ^docs/|\.md$|^(?:.*\/)?(?:\.gitignore|DOWNSTREAM_OWNERS|DOWNSTREAM_OWNERS_ALIASES|LICENSE|DCO|CODEOWNERS)|\.golangci\.yaml|\.goreleaser\.yml|\.markdownlint.yaml|^\.github|Tiltfile$
   steps:
     cluster_profile: aws
-    env:
-      FEATURE_SET: TechPreviewNoUpgrade
     test:
     - as: upstream-e2e
       commands: make -C openshift test-e2e

ci-operator/config/openshift/operator-framework-catalogd/openshift-operator-framework-catalogd-release-4.18.yaml

@@ -72,12 +72,10 @@ tests:
   commands: commitchecker --start ${PULL_BASE_SHA:-main}
   container:
     from: commitchecker
-- as: openshift-e2e-aws-techpreview
+- as: openshift-e2e-aws
   skip_if_only_changed: ^docs/|\.md$|^(?:.*\/)?(?:\.gitignore|DOWNSTREAM_OWNERS|DOWNSTREAM_OWNERS_ALIASES|LICENSE|DCO|CODEOWNERS)|\.golangci\.yaml|\.goreleaser\.yml|\.markdownlint.yaml|^\.github|Tiltfile$
   steps:
     cluster_profile: aws
-    env:
-      FEATURE_SET: TechPreviewNoUpgrade
     test:
     - as: upstream-e2e
       commands: make -C openshift test-e2e

ci-operator/config/openshift/operator-framework-catalogd/openshift-operator-framework-catalogd-release-4.19.yaml

@@ -71,12 +71,10 @@ tests:
   commands: commitchecker --start ${PULL_BASE_SHA:-main}
   container:
     from: commitchecker
-- as: openshift-e2e-aws-techpreview
+- as: openshift-e2e-aws
   skip_if_only_changed: ^docs/|\.md$|^(?:.*\/)?(?:\.gitignore|DOWNSTREAM_OWNERS|DOWNSTREAM_OWNERS_ALIASES|LICENSE|DCO|CODEOWNERS)|\.golangci\.yaml|\.goreleaser\.yml|\.markdownlint.yaml|^\.github|Tiltfile$
   steps:
     cluster_profile: aws
-    env:
-      FEATURE_SET: TechPreviewNoUpgrade
     test:
     - as: upstream-e2e
       commands: make -C openshift test-e2e

ci-operator/jobs/openshift/operator-framework-catalogd/openshift-operator-framework-catalogd-main-presubmits.yaml

@@ -133,7 +133,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )okd-scos-e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^main$
     - ^main-
@@ -147,7 +147,6 @@ presubmits:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-operator-framework-catalogd-main-okd-scos-images
-    optional: true
     rerun_command: /test okd-scos-images
     spec:
       containers:
@@ -197,15 +196,15 @@ presubmits:
     - ^main$
     - ^main-
     cluster: build09
-    context: ci/prow/openshift-e2e-aws-techpreview
+    context: ci/prow/openshift-e2e-aws
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-operator-framework-catalogd-main-openshift-e2e-aws-techpreview
-    rerun_command: /test openshift-e2e-aws-techpreview
+    name: pull-ci-openshift-operator-framework-catalogd-main-openshift-e2e-aws
+    rerun_command: /test openshift-e2e-aws
     skip_if_only_changed: ^docs/|\.md$|^(?:.*\/)?(?:\.gitignore|DOWNSTREAM_OWNERS|DOWNSTREAM_OWNERS_ALIASES|LICENSE|DCO|CODEOWNERS)|\.golangci\.yaml|\.goreleaser\.yml|\.markdownlint.yaml|^\.github|Tiltfile$
     spec:
       containers:
@@ -215,7 +214,7 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=openshift-e2e-aws-techpreview
+        - --target=openshift-e2e-aws
         command:
         - ci-operator
         image: ci-operator:latest
@@ -263,7 +262,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )openshift-e2e-aws-techpreview,?($|\s.*)
+    trigger: (?m)^/test( | .* )openshift-e2e-aws,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:

ci-operator/jobs/openshift/operator-framework-catalogd/openshift-operator-framework-catalogd-release-4.18-presubmits.yaml

@@ -59,15 +59,15 @@ presubmits:
     - ^release-4\.18$
     - ^release-4\.18-
     cluster: build03
-    context: ci/prow/openshift-e2e-aws-techpreview
+    context: ci/prow/openshift-e2e-aws
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-operator-framework-catalogd-release-4.18-openshift-e2e-aws-techpreview
-    rerun_command: /test openshift-e2e-aws-techpreview
+    name: pull-ci-openshift-operator-framework-catalogd-release-4.18-openshift-e2e-aws
+    rerun_command: /test openshift-e2e-aws
     skip_if_only_changed: ^docs/|\.md$|^(?:.*\/)?(?:\.gitignore|DOWNSTREAM_OWNERS|DOWNSTREAM_OWNERS_ALIASES|LICENSE|DCO|CODEOWNERS)|\.golangci\.yaml|\.goreleaser\.yml|\.markdownlint.yaml|^\.github|Tiltfile$
     spec:
       containers:
@@ -77,7 +77,7 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=openshift-e2e-aws-techpreview
+        - --target=openshift-e2e-aws
         command:
         - ci-operator
         image: ci-operator:latest
@@ -125,7 +125,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )openshift-e2e-aws-techpreview,?($|\s.*)
+    trigger: (?m)^/test( | .* )openshift-e2e-aws,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:

ci-operator/jobs/openshift/operator-framework-catalogd/openshift-operator-framework-catalogd-release-4.19-presubmits.yaml

@@ -60,15 +60,15 @@ presubmits:
     - ^release-4\.19$
     - ^release-4\.19-
     cluster: build03
-    context: ci/prow/openshift-e2e-aws-techpreview
+    context: ci/prow/openshift-e2e-aws
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-operator-framework-catalogd-release-4.19-openshift-e2e-aws-techpreview
-    rerun_command: /test openshift-e2e-aws-techpreview
+    name: pull-ci-openshift-operator-framework-catalogd-release-4.19-openshift-e2e-aws
+    rerun_command: /test openshift-e2e-aws
     skip_if_only_changed: ^docs/|\.md$|^(?:.*\/)?(?:\.gitignore|DOWNSTREAM_OWNERS|DOWNSTREAM_OWNERS_ALIASES|LICENSE|DCO|CODEOWNERS)|\.golangci\.yaml|\.goreleaser\.yml|\.markdownlint.yaml|^\.github|Tiltfile$
     spec:
       containers:
@@ -78,7 +78,7 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=openshift-e2e-aws-techpreview
+        - --target=openshift-e2e-aws
         command:
         - ci-operator
         image: ci-operator:latest
@@ -126,7 +126,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )openshift-e2e-aws-techpreview,?($|\s.*)
+    trigger: (?m)^/test( | .* )openshift-e2e-aws,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches: