Skip to content

chore: fix/upgrade-osd-gcp-operator-to-ocp-4.19#75541

Merged
openshift-merge-bot[bot] merged 7 commits intoopenshift:mainfrom
Fortune-Ndlovu:fix/upgrade-osd-gcp-operator-to-ocp-4.19
Apr 8, 2026
Merged

chore: fix/upgrade-osd-gcp-operator-to-ocp-4.19#75541
openshift-merge-bot[bot] merged 7 commits intoopenshift:mainfrom
Fortune-Ndlovu:fix/upgrade-osd-gcp-operator-to-ocp-4.19

Conversation

@Fortune-Ndlovu
Copy link
Copy Markdown
Contributor

@Fortune-Ndlovu Fortune-Ndlovu commented Mar 2, 2026

the ocp ci job is using 4.15, which is only supported by RHDH 1.6 (EOL). For 1.7 or 1.8 we should use a supported version 4.16+. ref https://access.redhat.com/support/policy/updates/developerhub

This pr is also related to redhat-developer/rhdh#4531

Fixes #? https://redhat.atlassian.net/browse/RHDHBUGS-2749

Signed-off-by: Fortune-Ndlovu <fndlovu@redhat.com>
@openshift-ci openshift-ci bot requested review from albarbaro and durandom March 2, 2026 12:46
…of 4.15

Signed-off-by: Fortune-Ndlovu <fndlovu@redhat.com>
@Fortune-Ndlovu
Copy link
Copy Markdown
Contributor Author

cc/ @zdrapela for review

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 6, 2026
@openshift-merge-robot
Copy link
Copy Markdown
Contributor

PR needs rebase.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@rm3l
Copy link
Copy Markdown
Member

rm3l commented Apr 2, 2026

/cc @subhashkhileri @zdrapela

@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 2, 2026
Fortune-Ndlovu and others added 3 commits April 2, 2026 11:27
…to 4.15

Updates the main branch configuration to use OpenShift 4.18 instead of 4.19.
Reverts release-1.7, release-1.8, and release-1.9 configs back to 4.15 to maintain
compatibility with their respective RHDH versions.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
Signed-off-by: Fortune-Ndlovu <fndlovu@redhat.com>
Updates the OpenShift Dedicated version for e2e-osd-gcp-helm-nightly and
e2e-osd-gcp-operator-nightly tests from EOL version 4.17.12 to 4.18.36.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
Signed-off-by: Fortune-Ndlovu <fndlovu@redhat.com>
@Fortune-Ndlovu Fortune-Ndlovu force-pushed the fix/upgrade-osd-gcp-operator-to-ocp-4.19 branch from cd05c70 to fcdb0ca Compare April 2, 2026 11:52
Updates build_root, release version, and OSD_VERSION to 4.20 for all
RHDH main branch CI jobs.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
Signed-off-by: Fortune-Ndlovu <fndlovu@redhat.com>
@zdrapela
Copy link
Copy Markdown
Contributor

zdrapela commented Apr 2, 2026

@Fortune-Ndlovu it's good to trigger rehearsal for a job change like this 😉 . You can do it by commenting:
/pj-rehearse periodic-ci-redhat-developer-rhdh-main-e2e-osd-gcp-helm-nightly
That way you can verify it will work as expected

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@zdrapela: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@Fortune-Ndlovu
Copy link
Copy Markdown
Contributor Author

/pj-rehearse periodic-ci-redhat-developer-rhdh-main-e2e-osd-gcp-helm-nightly

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@Fortune-Ndlovu: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if exactly 4.20.0 is available on OSD-GCP, and maybe we want a newer z-stream release, like 4.20.6 or whatever is available. cc @subhashkhileri

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sounds great, while testing the following locally, are the available 4.20.x versions for OpenShift Dedicated on GCP with marketplace subscription, therefore i will update the version to 4.20.17:

$ command -v ocm && ocm version
/home/fndlovu/.local/bin/ocm
1.0.12
$ ocm list versions --channel-group=stable 2>&1 |
      grep "^4\.20\." | sort -V
4.20.0
4.20.1
4.20.2
4.20.3
4.20.4
4.20.5
4.20.6
4.20.8
4.20.10
4.20.11
4.20.12
4.20.13
4.20.14
4.20.15
4.20.16
4.20.17

@Fortune-Ndlovu
Copy link
Copy Markdown
Contributor Author

/pj-rehearse periodic-ci-redhat-developer-rhdh-main-e2e-osd-gcp-helm-nightly

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@Fortune-Ndlovu: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

Signed-off-by: Fortune-Ndlovu <fndlovu@redhat.com>
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@Fortune-Ndlovu: 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-main-cleanup-mapt-destroy-orphaned-aks-clusters redhat-developer/rhdh presubmit Ci-operator config changed
pull-ci-redhat-developer-rhdh-main-cleanup-mapt-destroy-orphaned-eks-clusters redhat-developer/rhdh presubmit Ci-operator config changed
pull-ci-redhat-developer-rhdh-main-e2e-aks-helm-nightly redhat-developer/rhdh presubmit Ci-operator config changed
pull-ci-redhat-developer-rhdh-main-e2e-aks-operator-nightly redhat-developer/rhdh presubmit Ci-operator config changed
pull-ci-redhat-developer-rhdh-main-e2e-eks-helm-nightly redhat-developer/rhdh presubmit Ci-operator config changed
pull-ci-redhat-developer-rhdh-main-e2e-eks-operator-nightly redhat-developer/rhdh presubmit Ci-operator config changed
pull-ci-redhat-developer-rhdh-main-e2e-gke-helm-nightly redhat-developer/rhdh presubmit Ci-operator config changed
pull-ci-redhat-developer-rhdh-main-e2e-gke-operator-nightly redhat-developer/rhdh presubmit Ci-operator config changed
pull-ci-redhat-developer-rhdh-main-e2e-ocp-helm redhat-developer/rhdh presubmit Ci-operator config changed
pull-ci-redhat-developer-rhdh-main-e2e-ocp-helm-nightly redhat-developer/rhdh presubmit Ci-operator config changed
pull-ci-redhat-developer-rhdh-main-e2e-ocp-helm-upgrade-nightly redhat-developer/rhdh presubmit Ci-operator config changed
pull-ci-redhat-developer-rhdh-main-e2e-ocp-operator-auth-providers-nightly redhat-developer/rhdh presubmit Ci-operator config changed
pull-ci-redhat-developer-rhdh-main-e2e-ocp-operator-nightly redhat-developer/rhdh presubmit Ci-operator config changed
pull-ci-redhat-developer-rhdh-main-e2e-ocp-v4-17-helm-nightly redhat-developer/rhdh presubmit Ci-operator config changed
pull-ci-redhat-developer-rhdh-main-e2e-ocp-v4-19-helm-nightly redhat-developer/rhdh presubmit Ci-operator config changed
pull-ci-redhat-developer-rhdh-main-e2e-ocp-v4-20-helm-nightly redhat-developer/rhdh presubmit Ci-operator config changed
pull-ci-redhat-developer-rhdh-main-e2e-ocp-v4-21-helm-nightly redhat-developer/rhdh presubmit Ci-operator config changed
pull-ci-redhat-developer-rhdh-main-e2e-osd-gcp-helm-nightly redhat-developer/rhdh presubmit Ci-operator config changed
pull-ci-redhat-developer-rhdh-main-e2e-osd-gcp-operator-nightly redhat-developer/rhdh presubmit Ci-operator config changed
periodic-ci-redhat-developer-rhdh-main-e2e-ocp-v4-21-helm-nightly N/A periodic Ci-operator config changed
periodic-ci-redhat-developer-rhdh-main-cleanup-osd-gcp-cluster N/A periodic Ci-operator config changed
periodic-ci-redhat-developer-rhdh-main-cleanup-mapt-destroy-orphaned-aks-clusters N/A periodic Ci-operator config changed
periodic-ci-redhat-developer-rhdh-main-e2e-aks-operator-nightly N/A periodic Ci-operator config changed
periodic-ci-redhat-developer-rhdh-main-e2e-aks-helm-nightly N/A periodic Ci-operator config changed
periodic-ci-redhat-developer-rhdh-main-e2e-ocp-v4-19-helm-nightly N/A periodic Ci-operator config changed

A total of 38 jobs have been affected by this change. The above listing is non-exhaustive and limited to 25 jobs.

A full list of affected jobs can be found here

Interacting with pj-rehearse

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.

@Fortune-Ndlovu
Copy link
Copy Markdown
Contributor Author

/pj-rehearse periodic-ci-redhat-developer-rhdh-main-e2e-osd-gcp-helm-nightly

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@Fortune-Ndlovu: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@zdrapela
Copy link
Copy Markdown
Contributor

zdrapela commented Apr 8, 2026

It looks like the cluster is getting created, so this PR is good. Anything else needs to be fixed in the RHDH repo.
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 8, 2026
@zdrapela
Copy link
Copy Markdown
Contributor

zdrapela commented Apr 8, 2026

@Fortune-Ndlovu I added LGTM, per my previous comment and I asked @albarbaro for approval (due to an issue with configuring the OWNERS file, we cannot approve ourselves and need to ask someone from https://github.com/openshift/release/blob/main/ci-operator/config/redhat-developer/rhdh/OWNERS).
If you're happy with the PR, you can comment /pj-reheares ack /pj-rehearse ack to get the required label for rehearsals. Then it will get auto-merged.

@albarbaro
Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 8, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: albarbaro, Fortune-Ndlovu, zdrapela

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 8, 2026
@Fortune-Ndlovu
Copy link
Copy Markdown
Contributor Author

/pj-reheares ack

@Fortune-Ndlovu
Copy link
Copy Markdown
Contributor Author

/pj-rehearsal ack

@Fortune-Ndlovu
Copy link
Copy Markdown
Contributor Author

/rehearsal-ack

@Fortune-Ndlovu
Copy link
Copy Markdown
Contributor Author

/rehearsals-ack

@zdrapela
Copy link
Copy Markdown
Contributor

zdrapela commented Apr 8, 2026

Sorry, typo on my side 😅 It should be:
/pj-rehearse ack

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@zdrapela: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-ci-robot openshift-ci-robot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Apr 8, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 8, 2026

@Fortune-Ndlovu: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/rehearse/periodic-ci-redhat-developer-rhdh-main-e2e-osd-gcp-helm-nightly fe8bade link unknown /pj-rehearse periodic-ci-redhat-developer-rhdh-main-e2e-osd-gcp-helm-nightly

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit cc13e08 into openshift:main Apr 8, 2026
13 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants