Skip to content

NO-JIRA: Make build-args files use 5.0 version and revert repo names change#1936

Merged
openshift-merge-bot[bot] merged 3 commits into
openshift:masterfrom
dustymabe:dusty-50-updates
May 19, 2026
Merged

NO-JIRA: Make build-args files use 5.0 version and revert repo names change#1936
openshift-merge-bot[bot] merged 3 commits into
openshift:masterfrom
dustymabe:dusty-50-updates

Conversation

@dustymabe
Copy link
Copy Markdown
Member

commit b39cb0c
Author: Dusty Mabe dusty@dustymabe.com
Date: Thu May 14 16:18:56 2026 -0400

switch back to Major.Minor repo names

This is largely a revert of d0be268. Changing the repo names doesn't
work for us because our coreos/redhat-coreos internal repo with all
the repos for various versions of things name them with the version
in the repo name. i.e.  rhel-9.8-appstream

If this is still a problem where CI has out of date content in the
rhel98 repo we should work with ART to get it updated.

commit 8c406fb
Author: Dusty Mabe dusty@dustymabe.com
Date: Thu May 14 11:26:29 2026 -0400

move the OKD SIG repo to 5.0

The repo exists now.

commit 23cca9e
Author: Dusty Mabe dusty@dustymabe.com
Date: Thu May 14 11:22:11 2026 -0400

Make build-args files use 5.0 version

This didn't get updated in [1], but [2], which created
these files, was also in flight at the same time.

[1] https://github.com/openshift/os/pull/1930
[2] https://github.com/openshift/os/pull/1919

dustymabe added 3 commits May 14, 2026 11:26
This didn't get updated in [1], but [2], which created
these files, was also in flight at the same time.

[1] openshift#1930
[2] openshift#1919
The repo exists now.
This is largely a revert of d0be268. Changing the repo names doesn't
work for us because our coreos/redhat-coreos internal repo with all
the repos for various versions of things name them with the version
in the repo name. i.e.  rhel-9.8-appstream

If this is still a problem where CI has out of date content in the
rhel98 repo we should work with ART to get it updated.
@openshift-ci openshift-ci Bot requested review from prestist and tlbueno May 14, 2026 20:45
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 14, 2026
@dustymabe
Copy link
Copy Markdown
Member Author

/retest

@dustymabe
Copy link
Copy Markdown
Member Author

/retest

1 similar comment
@dustymabe
Copy link
Copy Markdown
Member Author

/retest

@dustymabe dustymabe changed the title Make build-args files use 5.0 version and revert repo names change NO-JIRA: Make build-args files use 5.0 version and revert repo names change May 16, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@dustymabe: This pull request explicitly references no jira issue.

Details

In response to this:

commit b39cb0c
Author: Dusty Mabe dusty@dustymabe.com
Date: Thu May 14 16:18:56 2026 -0400

switch back to Major.Minor repo names

This is largely a revert of d0be268. Changing the repo names doesn't
work for us because our coreos/redhat-coreos internal repo with all
the repos for various versions of things name them with the version
in the repo name. i.e. rhel-9.8-appstream

If this is still a problem where CI has out of date content in the
rhel98 repo we should work with ART to get it updated.

commit 8c406fb
Author: Dusty Mabe dusty@dustymabe.com
Date: Thu May 14 11:26:29 2026 -0400

move the OKD SIG repo to 5.0

The repo exists now.

commit 23cca9e
Author: Dusty Mabe dusty@dustymabe.com
Date: Thu May 14 11:22:11 2026 -0400

Make build-args files use 5.0 version

This didn't get updated in [1], but [2], which created
these files, was also in flight at the same time.

[1] #1930
[2] #1919

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 16, 2026
@dustymabe
Copy link
Copy Markdown
Member Author

/retest

@dustymabe
Copy link
Copy Markdown
Member Author

/retest

@redhat-chai-bot
Copy link
Copy Markdown

/retest

Triggering re-run now that https://github.com/openshift/release/pull/79475|openshift/release#79475 (ocp-5.0-rhel98.repo → CDN for 9.8 GA) has merged (14:35 UTC) and the in-cluster base-5-0-rhel98.ocp.svc.cluster.local config has had time to roll out.

(Automated retest requested from the forum-ocp-art thread.)

@hoxhaeris
Copy link
Copy Markdown

/retest

krb5-1.21.1-9.el9_8 subpackages are now present in the rhel-9.8-baseos repo on rhsm-pulp (errata 165401 has shipped). The depsolve conflict between the @System rhel-coreos-base layer and the CDN repos should now be resolved.

Packages confirmed at https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.8/x86_64/baseos/os/Packages/k/ as of 2026-05-19 17:20 UTC:

  • krb5-libs-1.21.1-9.el9_8.x86_64.rpm
  • krb5-pkinit-1.21.1-9.el9_8.x86_64.rpm
  • krb5-server-1.21.1-9.el9_8.x86_64.rpm
  • krb5-server-ldap-1.21.1-9.el9_8.x86_64.rpm
  • krb5-workstation-1.21.1-9.el9_8.x86_64.rpm

Retesting to see if the rpm-ostree depsolve now passes.

cc @U9D8C9CG3 (via Chai Bot follow-up from https://redhat-internal.enterprise.slack.com/archives/CB95J6R4N/p1778846979924059)

@redhat-chai-bot
Copy link
Copy Markdown

/retest

krb5-1.21.1-9.el9_8 (libs, workstation, pkinit, server, server-ldap) is now present in the rhel-9.8 baseos pulp repo (https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.8/x86_64/baseos/os/Packages/k/) — errata 165401 has shipped. Retesting to confirm the rpm-ostree depsolve conflict from the previous run is resolved.

cc @jlebon

@dustymabe
Copy link
Copy Markdown
Member Author

/retest

Copy link
Copy Markdown
Contributor

@aaradhak aaradhak left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label May 19, 2026
Copy link
Copy Markdown
Contributor

@marmijo marmijo left a comment

Choose a reason for hiding this comment

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

/lgtm

Copy link
Copy Markdown
Contributor

@yasminvalim yasminvalim left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 19, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aaradhak, dustymabe, marmijo, yasminvalim

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:
  • OWNERS [aaradhak,dustymabe,marmijo,yasminvalim]

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

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 19, 2026

@dustymabe: all tests passed!

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.

@dustymabe
Copy link
Copy Markdown
Member Author

/verified by CI

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label May 19, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@dustymabe: This PR has been marked as verified by CI.

Details

In response to this:

/verified by CI

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-merge-bot openshift-merge-bot Bot merged commit 439f6e9 into openshift:master May 19, 2026
3 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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants