Repository: openshift/release
Pull request #63254: RHIDP-6300  Update image references for RHDH e2e runners
Author: login: gustavolira
Labels: name: lgtm
description: Indicates that a PR is ready to be merged.
name: approved
description: Indicates a PR has been approved by an approver from all required OWNERS files.
name: ok-to-test
description: Indicates a non-member PR verified by an org member that is safe to test.
name: rehearsals-ack
description: Signifies that rehearsal jobs have been acknowledged
Created: 2025-03-27T10:58:04Z | Merged: 2025-03-28T15:39:38Z



Diff:
diff --git a/ci-operator/config/redhat-developer/rhdh/redhat-developer-rhdh-release-1.4.yaml b/ci-operator/config/redhat-developer/rhdh/redhat-developer-rhdh-release-1.4.yaml
index 63db498afde59..a1326d5ff7429 100644
--- a/ci-operator/config/redhat-developer/rhdh/redhat-developer-rhdh-release-1.4.yaml
+++ b/ci-operator/config/redhat-developer/rhdh/redhat-developer-rhdh-release-1.4.yaml
@@ -4,10 +4,6 @@ build_root:
     namespace: openshift
     tag: golang-1.20
   use_build_cache: true
-images:
-- context_dir: .ibm/images
-  dockerfile_path: Dockerfile
-  to: showcase-e2e-runner
 releases:
   latest:
     release:
diff --git a/ci-operator/jobs/redhat-developer/rhdh/redhat-developer-rhdh-release-1.4-presubmits.yaml b/ci-operator/jobs/redhat-developer/rhdh/redhat-developer-rhdh-release-1.4-presubmits.yaml
index ef785516928cd..fde40c2e073fb 100644
--- a/ci-operator/jobs/redhat-developer/rhdh/redhat-developer-rhdh-release-1.4-presubmits.yaml
+++ b/ci-operator/jobs/redhat-developer/rhdh/redhat-developer-rhdh-release-1.4-presubmits.yaml
@@ -64,58 +64,3 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-tests,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-1\.4$
-    - ^release-1\.4-
-    cluster: build07
-    context: ci/prow/images
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-redhat-developer-rhdh-release-1.4-images
-    rerun_command: /test images
-    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=[images]
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          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.*)
diff --git a/ci-operator/step-registry/redhat-developer/rhdh/release-1.4/nightly/redhat-developer-rhdh-release-1.4-nightly-ref.yaml b/ci-operator/step-registry/redhat-developer/rhdh/release-1.4/nightly/redhat-developer-rhdh-release-1.4-nightly-ref.yaml
index 5e73b75dd1ff2..d44986f609ee1 100644
--- a/ci-operator/step-registry/redhat-developer/rhdh/release-1.4/nightly/redhat-developer-rhdh-release-1.4-nightly-ref.yaml
+++ b/ci-operator/step-registry/redhat-developer/rhdh/release-1.4/nightly/redhat-developer-rhdh-release-1.4-nightly-ref.yaml
@@ -9,7 +9,10 @@ ref:
   env:
     - name: OC_CLIENT_VERSION
       default: stable-4.16
-  from: showcase-e2e-runner
+  from_image:
+    name: rhdh-e2e-runner
+    namespace: ci
+    tag: release-1.4
   grace_period: 5m
   resources:
     limits:
diff --git a/ci-operator/step-registry/redhat-developer/rhdh/release-1.5/nightly/redhat-developer-rhdh-release-1.5-nightly-ref.yaml b/ci-operator/step-registry/redhat-developer/rhdh/release-1.5/nightly/redhat-developer-rhdh-release-1.5-nightly-ref.yaml
index 5e6356ee7ecec..926e813e567dd 100644
--- a/ci-operator/step-registry/redhat-developer/rhdh/release-1.5/nightly/redhat-developer-rhdh-release-1.5-nightly-ref.yaml
+++ b/ci-operator/step-registry/redhat-developer/rhdh/release-1.5/nightly/redhat-developer-rhdh-release-1.5-nightly-ref.yaml
@@ -9,7 +9,10 @@ ref:
   env:
     - name: OC_CLIENT_VERSION
       default: stable-4.16
-  from: showcase-e2e-runner
+  from_image:
+    name: rhdh-e2e-runner
+    namespace: ci
+    tag: release-1.5
   grace_period: 5m
   resources:
     limits:


Reviews:
user: login: zdrapela
state: COMMENTED
author_association: CONTRIBUTOR
submitted_at: 2025-03-27T13:05:07Z
user: login: gustavolira
state: COMMENTED
author_association: MEMBER
submitted_at: 2025-03-27T13:25:06Z
user: login: gustavolira
state: COMMENTED
author_association: MEMBER
submitted_at: 2025-03-27T22:18:46Z
user: login: zdrapela
state: COMMENTED
author_association: CONTRIBUTOR
submitted_at: 2025-03-28T10:19:35Z
user: login: zdrapela
state: COMMENTED
author_association: CONTRIBUTOR
submitted_at: 2025-03-28T10:28:45Z
user: login: gustavolira
state: COMMENTED
author_association: MEMBER
submitted_at: 2025-03-28T13:01:41Z
user: login: zdrapela
state: COMMENTED
author_association: CONTRIBUTOR
submitted_at: 2025-03-28T13:27:12Z
user: login: zdrapela
state: APPROVED
author_association: CONTRIBUTOR
submitted_at: 2025-03-28T13:33:06Z
user: login: josephca
state: APPROVED
author_association: CONTRIBUTOR
submitted_at: 2025-03-28T15:05:48Z

Review comments:
diff_hunk: @@ -64,58 +64,3 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-tests,?($|\s.*)
-  - agent: kubernetes
path: ci-operator/jobs/redhat-developer/rhdh/redhat-developer-rhdh-release-1.4-presubmits.yaml
user: login: zdrapela
body: Does a GitHub Action now build the RHDH images for 1.4 PR checks? Otherwise, we will still need this presubmit job. I'm just not sure how is it with 1.4, but I think it still relies on this.
created_at: 2025-03-27T13:05:07Z
author_association: CONTRIBUTOR
diff_hunk: @@ -64,58 +64,3 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-tests,?($|\s.*)
-  - agent: kubernetes
path: ci-operator/jobs/redhat-developer/rhdh/redhat-developer-rhdh-release-1.4-presubmits.yaml
user: login: gustavolira
body: this was generated automatically when I ran `make jobs` 
created_at: 2025-03-27T13:25:06Z
author_association: MEMBER
diff_hunk: @@ -64,58 +64,3 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-tests,?($|\s.*)
-  - agent: kubernetes
path: ci-operator/jobs/redhat-developer/rhdh/redhat-developer-rhdh-release-1.4-presubmits.yaml
user: login: gustavolira
body: @zdrapela  Now 1.4, 1.5 and main branch are using RHDH images from mirror
created_at: 2025-03-27T22:18:46Z
author_association: MEMBER
diff_hunk: @@ -64,58 +64,3 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-tests,?($|\s.*)
-  - agent: kubernetes
path: ci-operator/jobs/redhat-developer/rhdh/redhat-developer-rhdh-release-1.4-presubmits.yaml
user: login: zdrapela
body: They use the `rhdh-e2e-runner` image from the mirror, yes. 

But how is the `rhdh-community/rhdh` image build? Sometimes, the PR uses the `rhdh-community/rhdh:next` image. But for example [this PR](https://github.com/redhat-developer/rhdh/pull/2638) uses image `rhdh-community/rhdh:pr-2638-c31ee308` that was built specifically with the changes from the PR incorporated. This image was, to my knowledge, built by the OpenShift CI job that will be removed here. The output of this job is image with the same tag: c31ee3080f7ed2325b61a9da26158011bf7d6949, see here: https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/test-platform-results/pr-logs/pull/redhat-developer_rhdh/2638/pull-ci-redhat-developer-rhdh-release-1.4-images/1904956237905137664/artifacts/release/finished.json

If you know the image is built somewhere else, with the same tag, we can remove this job.

If you don't believe me, we can merge this PR, and create a draft PR in `redhat-developer/rhdh` repo against `release-1.4` with changes inside RHDH code. If the image is still built somewhere and the tests pass, we are good. Otherwise, we can revert the change in this PR.
created_at: 2025-03-28T10:19:35Z
author_association: CONTRIBUTOR
diff_hunk: @@ -64,58 +64,3 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-tests,?($|\s.*)
-  - agent: kubernetes
path: ci-operator/jobs/redhat-developer/rhdh/redhat-developer-rhdh-release-1.4-presubmits.yaml
user: login: zdrapela
body: This logic in 1.4 is waiting for the image to be build: https://github.com/openshift/release/blob/2e2bf0a1879efa420b3112914351c4be782b7b76/ci-operator/step-registry/redhat-developer/rhdh/release-1.4/redhat-developer-rhdh-release-1.4-commands.sh#L64-L87

Where exactly is this image built for 1.4 PRs? In OpenShift CI (that is my assumption), GitHub action ([I just don't see any](https://github.com/redhat-developer/rhdh/actions?query=branch%3Arelease-1.4)), Konflux (I think it is a case for 1.5 and later, but I'm not entirely sure here), or where?
created_at: 2025-03-28T10:28:45Z
author_association: CONTRIBUTOR
diff_hunk: @@ -64,58 +64,3 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-tests,?($|\s.*)
-  - agent: kubernetes
path: ci-operator/jobs/redhat-developer/rhdh/redhat-developer-rhdh-release-1.4-presubmits.yaml
user: login: gustavolira
body: https://github.com/redhat-developer/rhdh/blob/release-1.4/.github/workflows/pr-build-image.yaml#L66

https://github.com/redhat-developer/rhdh/blob/release-1.4/.github/actions/docker-build/action.yaml#L78


created_at: 2025-03-28T13:01:40Z
author_association: MEMBER
diff_hunk: @@ -64,58 +64,3 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-tests,?($|\s.*)
-  - agent: kubernetes
path: ci-operator/jobs/redhat-developer/rhdh/redhat-developer-rhdh-release-1.4-presubmits.yaml
user: login: zdrapela
body: Thank you. I couldn't see the actual GH Actions runs, as the filtering by branch was not working. That's why I was confused. But when I manually searched for it, it was there. We had the image built duplicated by both OpenShift CI and GitHub action. We can then get rid of the OpenShift CI job.
created_at: 2025-03-28T13:27:12Z
author_association: CONTRIBUTOR

PR comments:
user: login: openshift-ci[bot]
created_at: 2025-03-27T10:58:23Z
body: Hi @gustavolira. Thanks for your PR.

I'm waiting for a [openshift](https://github.com/orgs/openshift/people) member to verify that this patch is reasonable to test. If it is, they should reply with `/ok-to-test` on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should [join the org](https://github.com/orgs/openshift/people) to skip this step.

Once the patch is verified, the new status will be reflected by the `ok-to-test` label.

I understand the commands that are listed [here](https://go.k8s.io/bot-commands?repo=openshift%2Frelease).

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
</details>

author_association: CONTRIBUTOR
user: login: openshift-ci-robot
created_at: 2025-03-27T11:00:08Z
body: [REHEARSALNOTIFIER] 
@gustavolira: the `pj-rehearse` plugin accommodates running rehearsal tests for the changes in this PR. Expand **'Interacting with pj-rehearse'** for usage details. The following rehearsable tests have been affected by this change:

Test name | Repo | Type | Reason
--- | --- | --- | ---
pull-ci-redhat-developer-rhdh-release-1.4-e2e-tests | redhat-developer/rhdh | presubmit | Ci-operator config changed
periodic-ci-redhat-developer-rhdh-release-1.4-e2e-tests-nightly | N/A | periodic | Ci-operator config changed

Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals.

<details>
<summary>Interacting with pj-rehearse</summary>

Comment: `/pj-rehearse` to run up to 5 rehearsals
Comment: `/pj-rehearse skip` to opt-out of rehearsals
Comment: `/pj-rehearse {test-name}`, with each test separated by a space, to run one or more specific rehearsals
Comment: `/pj-rehearse more` to run up to 10 rehearsals
Comment: `/pj-rehearse max` to run up to 25 rehearsals
Comment: `/pj-rehearse auto-ack` to run up to 5 rehearsals, and add the `rehearsals-ack` label on success
Comment: `/pj-rehearse list` to get an up-to-date list of affected jobs
Comment: `/pj-rehearse abort` to abort all active rehearsals
Comment: `/pj-rehearse network-access-allowed` to allow rehearsals of tests that have the `restrict_network_access` field set to `false`. This must be executed by an `openshift` org member who is **not** the PR author

Once you are satisfied with the results of the rehearsals, comment: `/pj-rehearse ack` to unblock merge. When the `rehearsals-ack` label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the `rehearsals-ack` label removed, comment: `/pj-rehearse reject` to re-block merging.
</details>
author_association: CONTRIBUTOR
user: login: zdrapela
created_at: 2025-03-27T11:02:14Z
body: /ok-to-test
author_association: CONTRIBUTOR
user: login: openshift-ci[bot]
created_at: 2025-03-27T11:19:35Z
body: @gustavolira: all tests **passed!**


[Full PR test history](https://prow.ci.openshift.org/pr-history?org=openshift&repo=release&pr=63254). [Your PR dashboard](https://prow.ci.openshift.org/pr?query=is:pr+state:open+author:gustavolira).

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
author_association: CONTRIBUTOR
user: login: zdrapela
created_at: 2025-03-28T13:20:20Z
body: /lgtm
author_association: CONTRIBUTOR
user: login: zdrapela
created_at: 2025-03-28T13:29:13Z
body: /pj-rehearse ack
author_association: CONTRIBUTOR
user: login: openshift-ci-robot
created_at: 2025-03-28T13:29:15Z
body: @zdrapela: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.
author_association: CONTRIBUTOR
user: login: zdrapela
created_at: 2025-03-28T13:29:30Z
body: /approve
author_association: CONTRIBUTOR
user: login: josephca
created_at: 2025-03-28T15:04:57Z
body: /approve
author_association: CONTRIBUTOR
user: login: josephca
created_at: 2025-03-28T15:05:22Z
body: /lgtm
author_association: CONTRIBUTOR
user: login: openshift-ci[bot]
created_at: 2025-03-28T15:06:05Z
body: [APPROVALNOTIFIER] This PR is **APPROVED**

This pull-request has been approved by: *<a href="https://github.com/openshift/release/pull/63254#" title="Author self-approved">gustavolira</a>*, *<a href="https://github.com/openshift/release/pull/63254#pullrequestreview-2725859115" title="Approved">josephca</a>*, *<a href="https://github.com/openshift/release/pull/63254#pullrequestreview-2725554117" title="Approved">zdrapela</a>*

The full list of commands accepted by this bot can be found [here](https://go.k8s.io/bot-commands?repo=openshift%2Frelease).

The pull request process is described [here](https://git.k8s.io/community/contributors/guide/owners.md#the-code-review-process)

<details >
Needs approval from an approver in each of these files:

- ~~[ci-operator/config/redhat-developer/rhdh/OWNERS](https://github.com/openshift/release/blob/master/ci-operator/config/redhat-developer/rhdh/OWNERS)~~ [josephca]
- ~~[ci-operator/jobs/redhat-developer/rhdh/OWNERS](https://github.com/openshift/release/blob/master/ci-operator/jobs/redhat-developer/rhdh/OWNERS)~~ [josephca]
- ~~[ci-operator/step-registry/redhat-developer/rhdh/release-1.4/nightly/OWNERS](https://github.com/openshift/release/blob/master/ci-operator/step-registry/redhat-developer/rhdh/release-1.4/nightly/OWNERS)~~ [josephca,zdrapela]
- ~~[ci-operator/step-registry/redhat-developer/rhdh/release-1.5/nightly/OWNERS](https://github.com/openshift/release/blob/master/ci-operator/step-registry/redhat-developer/rhdh/release-1.5/nightly/OWNERS)~~ [josephca,zdrapela]

Approvers can indicate their approval by writing `/approve` in a comment
Approvers can cancel approval by writing `/approve cancel` in a comment
</details>
<!-- META={"approvers":[]} -->
author_association: CONTRIBUTOR