From e0cadaa128beea0a58b51a41f4bc56b95d4de710 Mon Sep 17 00:00:00 2001 From: Michael Pruitt Date: Thu, 11 Jun 2026 13:32:42 -0500 Subject: [PATCH 1/4] INTEROP-9141: Onboard stolostron/console-e2e image for OPP interop --- .../config/stolostron/console-e2e/OWNERS | 14 +++++++++++ .../stolostron-console-e2e-main.yaml | 25 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 ci-operator/config/stolostron/console-e2e/OWNERS create mode 100644 ci-operator/config/stolostron/console-e2e/stolostron-console-e2e-main.yaml diff --git a/ci-operator/config/stolostron/console-e2e/OWNERS b/ci-operator/config/stolostron/console-e2e/OWNERS new file mode 100644 index 0000000000000..5d780dc3bc097 --- /dev/null +++ b/ci-operator/config/stolostron/console-e2e/OWNERS @@ -0,0 +1,14 @@ +# DO NOT EDIT; this file is auto-generated using https://github.com/openshift/ci-tools. +# Fetched from https://github.com/stolostron/console-e2e root OWNERS +# If the repo had OWNERS_ALIASES then the aliases were expanded +# Logins who are not members of 'openshift' organization were filtered out +# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md + +approvers: +- dtthuynh +- almen-ng +options: {} +reviewers: +- dtthuynh +- almen-ng +- atifshafi diff --git a/ci-operator/config/stolostron/console-e2e/stolostron-console-e2e-main.yaml b/ci-operator/config/stolostron/console-e2e/stolostron-console-e2e-main.yaml new file mode 100644 index 0000000000000..31e7828346c02 --- /dev/null +++ b/ci-operator/config/stolostron/console-e2e/stolostron-console-e2e-main.yaml @@ -0,0 +1,25 @@ +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: rhel-8-release-golang-1.17-openshift-4.11 +images: + items: + - dockerfile_path: Dockerfile.interop + to: console-e2e +promotion: + to: + - name: main + namespace: acm-qe +prowgen: + expose: true + private: true +resources: + '*': + requests: + cpu: 100m + memory: 200Mi +zz_generated_metadata: + branch: main + org: stolostron + repo: console-e2e From 46123a9d9258fe916ec06afa074b03b3f4206964 Mon Sep 17 00:00:00 2001 From: Michael Pruitt Date: Fri, 12 Jun 2026 08:23:13 -0500 Subject: [PATCH 2/4] INTEROP-9141: Add generated Prow job manifests for console-e2e Run `make jobs` to generate presubmit and postsubmit YAML from the ci-operator config added in the previous commit. --- ...olostron-console-e2e-main-postsubmits.yaml | 70 +++++++++++++++++++ ...tolostron-console-e2e-main-presubmits.yaml | 65 +++++++++++++++++ 2 files changed, 135 insertions(+) create mode 100644 ci-operator/jobs/stolostron/console-e2e/stolostron-console-e2e-main-postsubmits.yaml create mode 100644 ci-operator/jobs/stolostron/console-e2e/stolostron-console-e2e-main-presubmits.yaml diff --git a/ci-operator/jobs/stolostron/console-e2e/stolostron-console-e2e-main-postsubmits.yaml b/ci-operator/jobs/stolostron/console-e2e/stolostron-console-e2e-main-postsubmits.yaml new file mode 100644 index 0000000000000..7cfc010c671ac --- /dev/null +++ b/ci-operator/jobs/stolostron/console-e2e/stolostron-console-e2e-main-postsubmits.yaml @@ -0,0 +1,70 @@ +postsubmits: + stolostron/console-e2e: + - agent: kubernetes + always_run: true + branches: + - ^main$ + cluster: build01 + decorate: true + decoration_config: + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + sparse_checkout_files: + - Dockerfile.interop + labels: + ci-operator.openshift.io/is-promotion: "true" + ci.openshift.io/generator: prowgen + max_concurrency: 1 + name: branch-ci-stolostron-console-e2e-main-images + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson + - --oauth-token-path=/usr/local/github-credentials/oauth + - --promote + - --report-credentials-file=/etc/report/credentials + - --target=[images] + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /usr/local/github-credentials + name: github-credentials-openshift-ci-robot-private-git-cloner + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/push-secret + name: push-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: push-secret + secret: + secretName: registry-push-credentials-ci-central + - name: result-aggregator + secret: + secretName: result-aggregator diff --git a/ci-operator/jobs/stolostron/console-e2e/stolostron-console-e2e-main-presubmits.yaml b/ci-operator/jobs/stolostron/console-e2e/stolostron-console-e2e-main-presubmits.yaml new file mode 100644 index 0000000000000..71ac92c0908a2 --- /dev/null +++ b/ci-operator/jobs/stolostron/console-e2e/stolostron-console-e2e-main-presubmits.yaml @@ -0,0 +1,65 @@ +presubmits: + stolostron/console-e2e: + - agent: kubernetes + always_run: true + branches: + - ^main$ + - ^main- + cluster: build01 + context: ci/prow/images + decorate: true + decoration_config: + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + sparse_checkout_files: + - Dockerfile.interop + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-stolostron-console-e2e-main-images + rerun_command: /test images + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --oauth-token-path=/usr/local/github-credentials/oauth + - --report-credentials-file=/etc/report/credentials + - --target=[images] + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /usr/local/github-credentials + name: github-credentials-openshift-ci-robot-private-git-cloner + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )images,?($|\s.*) From 0784509974db59c3919cced47d904a6b4384a28b Mon Sep 17 00:00:00 2001 From: Michael Pruitt Date: Fri, 12 Jun 2026 08:28:34 -0500 Subject: [PATCH 3/4] Fix OWNERS: use cspi-qe-ocp-lp alias, remove non-org users Remove almen-ng and atifshafi (not openshift org members). Add cspi-qe-ocp-lp team alias matching other interop test configs. Retain dtthuynh as product-side owner. --- ci-operator/config/stolostron/console-e2e/OWNERS | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/ci-operator/config/stolostron/console-e2e/OWNERS b/ci-operator/config/stolostron/console-e2e/OWNERS index 5d780dc3bc097..f63bba8e57153 100644 --- a/ci-operator/config/stolostron/console-e2e/OWNERS +++ b/ci-operator/config/stolostron/console-e2e/OWNERS @@ -1,14 +1,7 @@ -# DO NOT EDIT; this file is auto-generated using https://github.com/openshift/ci-tools. -# Fetched from https://github.com/stolostron/console-e2e root OWNERS -# If the repo had OWNERS_ALIASES then the aliases were expanded -# Logins who are not members of 'openshift' organization were filtered out -# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md - approvers: +- cspi-qe-ocp-lp - dtthuynh -- almen-ng options: {} reviewers: +- cspi-qe-ocp-lp - dtthuynh -- almen-ng -- atifshafi From cebaef25e1450e8cda74cefe431b68ff3247b6c2 Mon Sep 17 00:00:00 2001 From: Michael Pruitt Date: Fri, 12 Jun 2026 09:30:31 -0500 Subject: [PATCH 4/4] Add OWNERS to jobs directory for stolostron/console-e2e The ci/prow/owners check requires OWNERS files in both config and jobs directories. Copies the same OWNERS from ci-operator/config/. --- ci-operator/jobs/stolostron/console-e2e/OWNERS | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 ci-operator/jobs/stolostron/console-e2e/OWNERS diff --git a/ci-operator/jobs/stolostron/console-e2e/OWNERS b/ci-operator/jobs/stolostron/console-e2e/OWNERS new file mode 100644 index 0000000000000..f63bba8e57153 --- /dev/null +++ b/ci-operator/jobs/stolostron/console-e2e/OWNERS @@ -0,0 +1,7 @@ +approvers: +- cspi-qe-ocp-lp +- dtthuynh +options: {} +reviewers: +- cspi-qe-ocp-lp +- dtthuynh