Skip to content

feat: add OCP 5.0 to the version catalogue - #31

Draft
jasonmadigan wants to merge 1 commit into
mainfrom
30-add-ocp-5.0
Draft

feat: add OCP 5.0 to the version catalogue#31
jasonmadigan wants to merge 1 commit into
mainfrom
30-add-ocp-5.0

Conversation

@jasonmadigan

Copy link
Copy Markdown
Owner

Adds OCP 5.0 to the catalogue, as the new default.

OKD payload 5.0.0-okd-scos.ec.8
COPR pin 5.1.0_202609020534_gb19f04dec_5.0.0_okd_scos.ec.8-1.el9
Console 5.0
openshift/api release-5.0

Why the pin needed work

Three combinations were tried before one built:

  • ec.8 against the 5.0 deps mirror -- fails. Upstream main has moved to 5.1.0, so its nightly RPMs require cri-o >= 5.1.0, but 5.0-el9-beta ships cri-o 5.0.0.
  • ec.7, the newest 5.0.0-versioned build -- fails. That spec still carries the pre-renumbering bound cri-o >= 1.36.0, < 1.37.0, and no deps mirror directory ships cri-o 1.36. ec.6 has the same bound, so every 5.0.0-versioned build is stranded.
  • ec.8 against the 5.1 deps mirror -- builds.

The deps mirror directory tracks the cri-o the RPM was compiled against, not the payload version. Those coincide for 4.20 through 4.22 and diverge at 5.0, so DEPS_VERSION now overrides the mirror directory, defaulting to OCP_VERSION where they still agree.

COPR devel mode

The nightly project creates repositories manually, so its main repodata is frozen at 12 August and every build since then is only indexed under devel/. Both repos are enabled during the build with skip_if_unavailable=1, and either can satisfy the pin. They index the same physical build directories, so nothing downloads twice.

Verification

Built locally for arm64 from this branch:

  • pinned RPMs installed at the intended version-release, cri-o 5.1.0 resolved
  • existing OKD-tag guard passes
  • OLM manifests and skopeo present

release.base reports 5.1.0-0.nightly rather than a 5.0 tag. The shipped 4.22 image shows the same skew, so that field tracks main's rebase target while the OKD tag in the RPM name is the payload identity.

Not booted as a cluster. Images do not exist on GHCR until the build workflow runs.

Follow-up

  1. gh workflow run images.yml -f version=5.0
  2. Once published, bump the e2e pin from 4.22 to 5.0 and confirm the addon chain on 5.0. Left at 4.22 here so CI stays green.

Closes #30

Pins the 2 Sep nightly carrying the 5.0.0-okd-scos.ec.8 payload.

The COPR project runs in devel mode, so recent builds are only indexed
in devel/ repodata; both repos are now enabled during the build.

Upstream main has moved to 5.1.0, so its RPMs require cri-o >= 5.1.0
while the 5.0 deps mirror ships cri-o 5.0.0. The last 5.0.0-versioned
builds are unusable too: they bound cri-o < 1.37.0, and no mirror
directory ships cri-o 1.36. Adds DEPS_VERSION to point the deps mirror
at 5.1 for this version only, defaulting to OCP_VERSION elsewhere.

Closes #30

Signed-off-by: Jason Madigan <jason@jasonmadigan.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

OCP 5

1 participant