Skip to content

Exclude coreutils-single from E4S baseos repo to fix lockfile conflicts#11251

Open
pruan-rht wants to merge 1 commit into
openshift-eng:openshift-4.23from
pruan-rht:fix-coreutils-single-conflict-4.23
Open

Exclude coreutils-single from E4S baseos repo to fix lockfile conflicts#11251
pruan-rht wants to merge 1 commit into
openshift-eng:openshift-4.23from
pruan-rht:fix-coreutils-single-conflict-4.23

Conversation

@pruan-rht

Copy link
Copy Markdown
Contributor

Summary

  • The E4S 9.8 baseos repo provides both coreutils and coreutils-single, which are mutually exclusive
  • rpm-lockfile-prototype cannot resolve this conflict when generating lockfiles for images like dpu-marvell-cp-agent
  • Adds excludepkgs: coreutils-single* to repos/rhel-9-baseos-rpms.yml to prevent the conflict

Test plan

  • Verify dpu-marvell-cp-agent lockfile generation succeeds on next build cycle
  • Check no other images regress (OCP images use coreutils, never coreutils-single)

Resolves: ART-20309

🤖 Generated with Claude Code

The E4S 9.8 baseos repo provides both coreutils and coreutils-single,
which are mutually exclusive. rpm-lockfile-prototype cannot resolve this
conflict when generating lockfiles for images like dpu-marvell-cp-agent.

Resolves: ART-20309

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED
@openshift-ci

openshift-ci Bot commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign adobes1 for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

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.

1 participant