ci-operator: add bundle name for ingress-node-firewall

ci-operator/config/openshift/ingress-node-firewall/openshift-ingress-node-firewall-master.yaml

@@ -19,7 +19,8 @@ images:
     to: ingress-node-firewall-daemon
 operator:
   bundles:
-  - dockerfile_path: bundle.Dockerfile
+  - as: ingress-node-firewall-bundle
+    dockerfile_path: bundle.Dockerfile
   substitutions:
   - pullspec: quay.io/openshift/origin-ingress-node-firewall:4.13
     with: pipeline:ingress-node-firewall

ci-operator/config/openshift/ingress-node-firewall/openshift-ingress-node-firewall-release-4.12.yaml

@@ -22,7 +22,8 @@ images:
     to: ingress-node-firewall-daemon
 operator:
   bundles:
-  - dockerfile_path: bundle.Dockerfile
+  - as: ingress-node-firewall-bundle
+    dockerfile_path: bundle.Dockerfile
   substitutions:
   - pullspec: quay.io/openshift/origin-ingress-node-firewall:4.12
     with: pipeline:ingress-node-firewall

ci-operator/config/openshift/ingress-node-firewall/openshift-ingress-node-firewall-release-4.13.yaml

@@ -22,7 +22,8 @@ images:
     to: ingress-node-firewall-daemon
 operator:
   bundles:
-  - dockerfile_path: bundle.Dockerfile
+  - as: ingress-node-firewall-bundle
+    dockerfile_path: bundle.Dockerfile
   substitutions:
   - pullspec: quay.io/openshift/origin-ingress-node-firewall:4.13
     with: pipeline:ingress-node-firewall

ci-operator/config/openshift/ingress-node-firewall/openshift-ingress-node-firewall-release-4.14.yaml

@@ -22,7 +22,8 @@ images:
     to: ingress-node-firewall-daemon
 operator:
   bundles:
-  - dockerfile_path: bundle.Dockerfile
+  - as: ingress-node-firewall-bundle
+    dockerfile_path: bundle.Dockerfile
   substitutions:
   - pullspec: quay.io/openshift/origin-ingress-node-firewall:4.13
     with: pipeline:ingress-node-firewall

ci-operator/config/openshift/ingress-node-firewall/openshift-ingress-node-firewall-release-4.15.yaml

@@ -19,7 +19,8 @@ images:
     to: ingress-node-firewall-daemon
 operator:
   bundles:
-  - dockerfile_path: bundle.Dockerfile
+  - as: ingress-node-firewall-bundle
+    dockerfile_path: bundle.Dockerfile
   substitutions:
   - pullspec: quay.io/openshift/origin-ingress-node-firewall:4.13
     with: pipeline:ingress-node-firewall

ci-operator/config/openshift/ingress-node-firewall/openshift-ingress-node-firewall-release-4.16.yaml

@@ -19,7 +19,8 @@ images:
     to: ingress-node-firewall-daemon
 operator:
   bundles:
-  - dockerfile_path: bundle.Dockerfile
+  - as: ingress-node-firewall-bundle
+    dockerfile_path: bundle.Dockerfile
   substitutions:
   - pullspec: quay.io/openshift/origin-ingress-node-firewall:4.13
     with: pipeline:ingress-node-firewall

ci-operator/config/openshift/ingress-node-firewall/openshift-ingress-node-firewall-release-4.17.yaml

@@ -19,7 +19,8 @@ images:
     to: ingress-node-firewall-daemon
 operator:
   bundles:
-  - dockerfile_path: bundle.Dockerfile
+  - as: ingress-node-firewall-bundle
+    dockerfile_path: bundle.Dockerfile
   substitutions:
   - pullspec: quay.io/openshift/origin-ingress-node-firewall:4.13
     with: pipeline:ingress-node-firewall

ci-operator/config/openshift/ingress-node-firewall/openshift-ingress-node-firewall-release-4.18.yaml

@@ -19,7 +19,8 @@ images:
     to: ingress-node-firewall-daemon
 operator:
   bundles:
-  - dockerfile_path: bundle.Dockerfile
+  - as: ingress-node-firewall-bundle
+    dockerfile_path: bundle.Dockerfile
   substitutions:
   - pullspec: quay.io/openshift/origin-ingress-node-firewall:4.13
     with: pipeline:ingress-node-firewall

ci-operator/config/openshift/ingress-node-firewall/openshift-ingress-node-firewall-release-4.19.yaml

@@ -19,7 +19,8 @@ images:
     to: ingress-node-firewall-daemon
 operator:
   bundles:
-  - dockerfile_path: bundle.Dockerfile
+  - as: ingress-node-firewall-bundle
+    dockerfile_path: bundle.Dockerfile
   substitutions:
   - pullspec: quay.io/openshift/origin-ingress-node-firewall:4.13
     with: pipeline:ingress-node-firewall

ci-operator/config/openshift/ingress-node-firewall/openshift-ingress-node-firewall-release-4.20.yaml

@@ -19,7 +19,8 @@ images:
     to: ingress-node-firewall-daemon
 operator:
   bundles:
-  - dockerfile_path: bundle.Dockerfile
+  - as: ingress-node-firewall-bundle
+    dockerfile_path: bundle.Dockerfile
   substitutions:
   - pullspec: quay.io/openshift/origin-ingress-node-firewall:4.13
     with: pipeline:ingress-node-firewall

ci-operator/config/openshift/ingress-node-firewall/openshift-ingress-node-firewall-release-4.21.yaml

@@ -19,7 +19,8 @@ images:
     to: ingress-node-firewall-daemon
 operator:
   bundles:
-  - dockerfile_path: bundle.Dockerfile
+  - as: ingress-node-firewall-bundle
+    dockerfile_path: bundle.Dockerfile
   substitutions:
   - pullspec: quay.io/openshift/origin-ingress-node-firewall:4.13
     with: pipeline:ingress-node-firewall

ci-operator/config/openshift/ingress-node-firewall/openshift-ingress-node-firewall-release-4.22.yaml

@@ -19,7 +19,8 @@ images:
     to: ingress-node-firewall-daemon
 operator:
   bundles:
-  - dockerfile_path: bundle.Dockerfile
+  - as: ingress-node-firewall-bundle
+    dockerfile_path: bundle.Dockerfile
   substitutions:
   - pullspec: quay.io/openshift/origin-ingress-node-firewall:4.13
     with: pipeline:ingress-node-firewall

ci-operator/config/openshift/ingress-node-firewall/openshift-ingress-node-firewall-release-4.23.yaml

@@ -19,7 +19,8 @@ images:
     to: ingress-node-firewall-daemon
 operator:
   bundles:
-  - dockerfile_path: bundle.Dockerfile
+  - as: ingress-node-firewall-bundle
+    dockerfile_path: bundle.Dockerfile
   substitutions:
   - pullspec: quay.io/openshift/origin-ingress-node-firewall:4.13
     with: pipeline:ingress-node-firewall

ci-operator/config/openshift/ingress-node-firewall/openshift-ingress-node-firewall-release-5.0.yaml

@@ -19,7 +19,8 @@ images:
     to: ingress-node-firewall-daemon
 operator:
   bundles:
-  - dockerfile_path: bundle.Dockerfile
+  - as: ingress-node-firewall-bundle
+    dockerfile_path: bundle.Dockerfile
   substitutions:
   - pullspec: quay.io/openshift/origin-ingress-node-firewall:4.13
     with: pipeline:ingress-node-firewall

ci-operator/config/openshift/ingress-node-firewall/openshift-ingress-node-firewall-release-5.1.yaml

@@ -19,7 +19,8 @@ images:
     to: ingress-node-firewall-daemon
 operator:
   bundles:
-  - dockerfile_path: bundle.Dockerfile
+  - as: ingress-node-firewall-bundle
+    dockerfile_path: bundle.Dockerfile
   substitutions:
   - pullspec: quay.io/openshift/origin-ingress-node-firewall:4.13
     with: pipeline:ingress-node-firewall

ci-operator/jobs/openshift/ingress-node-firewall/openshift-ingress-node-firewall-master-presubmits.yaml

@@ -6,7 +6,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build12
-    context: ci/prow/ci-index
+    context: ci/prow/ci-index-ingress-node-firewall-bundle
     decorate: true
     decoration_config:
       sparse_checkout_files:
@@ -16,15 +16,15 @@ presubmits:
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-ingress-node-firewall-master-ci-index
-    rerun_command: /test ci-index
+    name: pull-ci-openshift-ingress-node-firewall-master-ci-index-ingress-node-firewall-bundle
+    rerun_command: /test ci-index-ingress-node-firewall-bundle
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --report-credentials-file=/etc/report/credentials
-        - --target=ci-index
+        - --target=ci-index-ingress-node-firewall-bundle
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
@@ -57,7 +57,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )ci-index,?($|\s.*)
+    trigger: (?m)^/test( | .* )ci-index-ingress-node-firewall-bundle,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:

ci-operator/jobs/openshift/ingress-node-firewall/openshift-ingress-node-firewall-release-4.12-presubmits.yaml

@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build12
-    context: ci/prow/ci-index
+    context: ci/prow/ci-index-ingress-node-firewall-bundle
     decorate: true
     decoration_config:
       sparse_checkout_files:
@@ -15,15 +15,15 @@ presubmits:
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-ingress-node-firewall-release-4.12-ci-index
-    rerun_command: /test ci-index
+    name: pull-ci-openshift-ingress-node-firewall-release-4.12-ci-index-ingress-node-firewall-bundle
+    rerun_command: /test ci-index-ingress-node-firewall-bundle
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --report-credentials-file=/etc/report/credentials
-        - --target=ci-index
+        - --target=ci-index-ingress-node-firewall-bundle
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
@@ -56,7 +56,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )ci-index,?($|\s.*)
+    trigger: (?m)^/test( | .* )ci-index-ingress-node-firewall-bundle,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:

ci-operator/jobs/openshift/ingress-node-firewall/openshift-ingress-node-firewall-release-4.13-presubmits.yaml

@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build12
-    context: ci/prow/ci-index
+    context: ci/prow/ci-index-ingress-node-firewall-bundle
     decorate: true
     decoration_config:
       sparse_checkout_files:
@@ -15,15 +15,15 @@ presubmits:
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-ingress-node-firewall-release-4.13-ci-index
-    rerun_command: /test ci-index
+    name: pull-ci-openshift-ingress-node-firewall-release-4.13-ci-index-ingress-node-firewall-bundle
+    rerun_command: /test ci-index-ingress-node-firewall-bundle
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --report-credentials-file=/etc/report/credentials
-        - --target=ci-index
+        - --target=ci-index-ingress-node-firewall-bundle
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
@@ -56,7 +56,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )ci-index,?($|\s.*)
+    trigger: (?m)^/test( | .* )ci-index-ingress-node-firewall-bundle,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:

ci-operator/jobs/openshift/ingress-node-firewall/openshift-ingress-node-firewall-release-4.14-presubmits.yaml

@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.14$
     - ^release-4\.14-
     cluster: build12
-    context: ci/prow/ci-index
+    context: ci/prow/ci-index-ingress-node-firewall-bundle
     decorate: true
     decoration_config:
       sparse_checkout_files:
@@ -15,15 +15,15 @@ presubmits:
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-ingress-node-firewall-release-4.14-ci-index
-    rerun_command: /test ci-index
+    name: pull-ci-openshift-ingress-node-firewall-release-4.14-ci-index-ingress-node-firewall-bundle
+    rerun_command: /test ci-index-ingress-node-firewall-bundle
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --report-credentials-file=/etc/report/credentials
-        - --target=ci-index
+        - --target=ci-index-ingress-node-firewall-bundle
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
@@ -56,7 +56,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )ci-index,?($|\s.*)
+    trigger: (?m)^/test( | .* )ci-index-ingress-node-firewall-bundle,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:

ci-operator/jobs/openshift/ingress-node-firewall/openshift-ingress-node-firewall-release-4.15-presubmits.yaml

@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.15$
     - ^release-4\.15-
     cluster: build13
-    context: ci/prow/ci-index
+    context: ci/prow/ci-index-ingress-node-firewall-bundle
     decorate: true
     decoration_config:
       sparse_checkout_files:
@@ -16,15 +16,15 @@ presubmits:
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-ingress-node-firewall-release-4.15-ci-index
-    rerun_command: /test ci-index
+    name: pull-ci-openshift-ingress-node-firewall-release-4.15-ci-index-ingress-node-firewall-bundle
+    rerun_command: /test ci-index-ingress-node-firewall-bundle
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --report-credentials-file=/etc/report/credentials
-        - --target=ci-index
+        - --target=ci-index-ingress-node-firewall-bundle
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
@@ -57,7 +57,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )ci-index,?($|\s.*)
+    trigger: (?m)^/test( | .* )ci-index-ingress-node-firewall-bundle,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:

ci-operator/jobs/openshift/ingress-node-firewall/openshift-ingress-node-firewall-release-4.16-presubmits.yaml

@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.16$
     - ^release-4\.16-
     cluster: build13
-    context: ci/prow/ci-index
+    context: ci/prow/ci-index-ingress-node-firewall-bundle
     decorate: true
     decoration_config:
       sparse_checkout_files:
@@ -16,15 +16,15 @@ presubmits:
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-ingress-node-firewall-release-4.16-ci-index
-    rerun_command: /test ci-index
+    name: pull-ci-openshift-ingress-node-firewall-release-4.16-ci-index-ingress-node-firewall-bundle
+    rerun_command: /test ci-index-ingress-node-firewall-bundle
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --report-credentials-file=/etc/report/credentials
-        - --target=ci-index
+        - --target=ci-index-ingress-node-firewall-bundle
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
@@ -57,7 +57,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )ci-index,?($|\s.*)
+    trigger: (?m)^/test( | .* )ci-index-ingress-node-firewall-bundle,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches: