CNF-18836 / CNF-20367: Reconfigure repo to allow mintmaker rpm updates to work with ubi9 images by fontivan · Pull Request #3289 · openshift-kni/lifecycle-agent

fontivan · 2025-11-12T19:50:21Z

Update container_build_args.conf to use the new ubi9 image
Update Makefile to parse the new images correctly and update the targets invoking the rpm-lock tooling
Update rpms.in.yaml
- Remove now unnecessary ssl configuration
- Remove context on Dockerfile
- Add varsFromImage with reference to the same image in container_build_args.conf
Update rpms.lock.yaml with outputs from the rpm-lock script

Assisted-by: Cursor/claude-4-sonnet
AI-attribution: AIA,Primarily human-created,Human-initiated,Reviewed,Cursor/claude-4-sonnet,v1.0
For more information on AI attribution statements, see: https://aiattribution.github.io/

Background / Context

Issue / Requirement / Reason for change

Solution / Feature Overview

Implementation Details

Other Information

openshift-ci-robot · 2025-11-12T19:50:25Z

@fontivan: This pull request references CNF-20367 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

Details

In response to this:

Update container_build_args.conf to use the new ubi9 image

Update Makefile to parse the new images correctly and update the targets invoking the rpm-lock tooling

Update rpms.in.yaml

Remove now unnecessary ssl configuration

Remove context on Dockerfile

Add varsFromImage with reference to the same image in container_build_args.conf

Update rpms.lock.yaml with outputs from the rpm-lock script

Assisted-by: Cursor/claude-4-sonnet
AI-attribution: AIA,Primarily human-created,Human-initiated,Reviewed,Cursor/claude-4-sonnet,v1.0
For more information on AI attribution statements, see: https://aiattribution.github.io/

Background / Context

Issue / Requirement / Reason for change

Solution / Feature Overview

Implementation Details

Other Information

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.

fontivan · 2025-11-12T20:01:50Z

/cc @rauhersu @jc-rh @shajmakh @yanirq @abraham2512

fontivan · 2025-11-12T20:23:00Z

/hold will require several approvals

fontivan · 2025-11-13T03:22:35Z

/test ibi-e2e-flow
/test ibu-e2e-flow

.tekton/lifecycle-agent-4-21-push.yaml

fontivan · 2025-11-13T16:43:23Z

Related: rh-ecosystem-edge/recert#716

fontivan · 2025-11-13T17:07:09Z

/retest

…s to work with ubi9 images - Update container_build_args.conf to use the new ubi9 image - Update Makefile to parse the new images correctly and update the targets invoking the rpm-lock tooling - Update rpms.in.yaml - Remove now unnecessary ssl configuration - Remove context on Dockerfile - Add varsFromImage with reference to the same image in container_build_args.conf - Update rpms.lock.yaml with outputs from the rpm-lock script - Move the podman scripts to run inside a tmp/ folder inside their lock folder - Update pipeline on-cel-expressions Assisted-by: Cursor/claude-4-sonnet AI-attribution: AIA,Primarily human-created,Human-initiated,Reviewed,Cursor/claude-4-sonnet,v1.0 For more information on AI attribution statements, see: https://aiattribution.github.io/

rauhersu · 2025-11-13T20:08:31Z

/lgtm
/approve

openshift-ci · 2025-11-14T02:38:21Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jc-rh, rauhersu

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~~ [jc-rh,rauhersu]

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

fontivan · 2025-11-14T13:11:02Z

/unhold

fontivan · 2025-11-14T15:25:26Z

/cherry-pick release-4.20

fontivan · 2025-11-14T15:25:50Z

/cherry-pick release-4.19

fontivan · 2025-11-14T15:25:55Z

/cherry-pick release-4.18

fontivan · 2025-11-14T15:25:59Z

/cherry-pick release-4.17

fontivan · 2025-11-14T15:26:02Z

/cherry-pick release-4.16

fontivan · 2025-11-14T15:26:06Z

/cherry-pick release-4.14

openshift-cherrypick-robot · 2025-11-14T15:26:12Z

@fontivan: new pull request created: #3342

Details

In response to this:

/cherry-pick release-4.20

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.

openshift-cherrypick-robot · 2025-11-14T15:26:31Z

@fontivan: #3289 failed to apply on top of branch "release-4.19":

Applying: CNF-18836 / CNF-20367: Reconfigure repo to allow mintmaker rpm updates to work with ubi9 images - Update container_build_args.conf to use the new ubi9 image - Update Makefile to parse the new images correctly and update the targets invoking the rpm-lock tooling - Update rpms.in.yaml - Remove now unnecessary ssl configuration - Remove context on Dockerfile - Add varsFromImage with reference to the same image in container_build_args.conf - Update rpms.lock.yaml with outputs from the rpm-lock script - Move the podman scripts to run inside a tmp/ folder inside their lock folder - Update pipeline on-cel-expressions
Using index info to reconstruct a base tree...
M	.konflux/Dockerfile.catalog
M	.konflux/container_build_args.conf
M	.konflux/lock-runtime/rpms.in.yaml
M	.konflux/lock-runtime/rpms.lock.yaml
A	.tekton/lifecycle-agent-4-21-pull-request.yaml
A	.tekton/lifecycle-agent-4-21-push.yaml
M	Dockerfile
M	Makefile
Falling back to patching base and 3-way merge...
Auto-merging Makefile
Auto-merging Dockerfile
CONFLICT (content): Merge conflict in Dockerfile
Auto-merging .tekton/lifecycle-agent-4-19-push.yaml
Auto-merging .tekton/lifecycle-agent-4-19-pull-request.yaml
Auto-merging .konflux/lock-runtime/rpms.lock.yaml
CONFLICT (content): Merge conflict in .konflux/lock-runtime/rpms.lock.yaml
Auto-merging .konflux/lock-runtime/rpms.in.yaml
Auto-merging .konflux/container_build_args.conf
Auto-merging .konflux/Dockerfile.catalog
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 CNF-18836 / CNF-20367: Reconfigure repo to allow mintmaker rpm updates to work with ubi9 images - Update container_build_args.conf to use the new ubi9 image - Update Makefile to parse the new images correctly and update the targets invoking the rpm-lock tooling - Update rpms.in.yaml - Remove now unnecessary ssl configuration - Remove context on Dockerfile - Add varsFromImage with reference to the same image in container_build_args.conf - Update rpms.lock.yaml with outputs from the rpm-lock script - Move the podman scripts to run inside a tmp/ folder inside their lock folder - Update pipeline on-cel-expressions

Details

In response to this:

/cherry-pick release-4.19

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.

openshift-cherrypick-robot · 2025-11-14T15:26:36Z

@fontivan: #3289 failed to apply on top of branch "release-4.18":

Applying: CNF-18836 / CNF-20367: Reconfigure repo to allow mintmaker rpm updates to work with ubi9 images - Update container_build_args.conf to use the new ubi9 image - Update Makefile to parse the new images correctly and update the targets invoking the rpm-lock tooling - Update rpms.in.yaml - Remove now unnecessary ssl configuration - Remove context on Dockerfile - Add varsFromImage with reference to the same image in container_build_args.conf - Update rpms.lock.yaml with outputs from the rpm-lock script - Move the podman scripts to run inside a tmp/ folder inside their lock folder - Update pipeline on-cel-expressions
Using index info to reconstruct a base tree...
M	.konflux/Dockerfile.catalog
M	.konflux/container_build_args.conf
M	.konflux/lock-runtime/rpms.in.yaml
M	.konflux/lock-runtime/rpms.lock.yaml
A	.tekton/lifecycle-agent-4-21-pull-request.yaml
A	.tekton/lifecycle-agent-4-21-push.yaml
M	Dockerfile
M	Makefile
Falling back to patching base and 3-way merge...
Auto-merging Makefile
Auto-merging Dockerfile
CONFLICT (content): Merge conflict in Dockerfile
Auto-merging .tekton/lifecycle-agent-4-18-push.yaml
Auto-merging .tekton/lifecycle-agent-4-18-pull-request.yaml
Auto-merging .konflux/lock-runtime/rpms.lock.yaml
CONFLICT (content): Merge conflict in .konflux/lock-runtime/rpms.lock.yaml
Auto-merging .konflux/lock-runtime/rpms.in.yaml
Auto-merging .konflux/container_build_args.conf
Auto-merging .konflux/Dockerfile.catalog
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 CNF-18836 / CNF-20367: Reconfigure repo to allow mintmaker rpm updates to work with ubi9 images - Update container_build_args.conf to use the new ubi9 image - Update Makefile to parse the new images correctly and update the targets invoking the rpm-lock tooling - Update rpms.in.yaml - Remove now unnecessary ssl configuration - Remove context on Dockerfile - Add varsFromImage with reference to the same image in container_build_args.conf - Update rpms.lock.yaml with outputs from the rpm-lock script - Move the podman scripts to run inside a tmp/ folder inside their lock folder - Update pipeline on-cel-expressions

Details

In response to this:

/cherry-pick release-4.18

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.

openshift-cherrypick-robot · 2025-11-14T15:26:39Z

@fontivan: #3289 failed to apply on top of branch "release-4.17":

Patch is empty.
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To record the empty patch as an empty commit, run "git am --allow-empty".
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"

Details

In response to this:

/cherry-pick release-4.17

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.

openshift-cherrypick-robot · 2025-11-14T15:26:44Z

@fontivan: #3289 failed to apply on top of branch "release-4.16":

Applying: CNF-18836 / CNF-20367: Reconfigure repo to allow mintmaker rpm updates to work with ubi9 images - Update container_build_args.conf to use the new ubi9 image - Update Makefile to parse the new images correctly and update the targets invoking the rpm-lock tooling - Update rpms.in.yaml - Remove now unnecessary ssl configuration - Remove context on Dockerfile - Add varsFromImage with reference to the same image in container_build_args.conf - Update rpms.lock.yaml with outputs from the rpm-lock script - Move the podman scripts to run inside a tmp/ folder inside their lock folder - Update pipeline on-cel-expressions
Using index info to reconstruct a base tree...
M	.konflux/Dockerfile.catalog
M	.konflux/container_build_args.conf
M	.konflux/lock-runtime/rpms.in.yaml
M	.konflux/lock-runtime/rpms.lock.yaml
A	.tekton/lifecycle-agent-4-21-pull-request.yaml
A	.tekton/lifecycle-agent-4-21-push.yaml
M	Dockerfile
M	Makefile
Falling back to patching base and 3-way merge...
Auto-merging Makefile
Auto-merging Dockerfile
CONFLICT (content): Merge conflict in Dockerfile
Auto-merging .tekton/lifecycle-agent-4-16-push.yaml
Auto-merging .tekton/lifecycle-agent-4-16-pull-request.yaml
Auto-merging .konflux/lock-runtime/rpms.lock.yaml
CONFLICT (content): Merge conflict in .konflux/lock-runtime/rpms.lock.yaml
Auto-merging .konflux/lock-runtime/rpms.in.yaml
Auto-merging .konflux/container_build_args.conf
Auto-merging .konflux/Dockerfile.catalog
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 CNF-18836 / CNF-20367: Reconfigure repo to allow mintmaker rpm updates to work with ubi9 images - Update container_build_args.conf to use the new ubi9 image - Update Makefile to parse the new images correctly and update the targets invoking the rpm-lock tooling - Update rpms.in.yaml - Remove now unnecessary ssl configuration - Remove context on Dockerfile - Add varsFromImage with reference to the same image in container_build_args.conf - Update rpms.lock.yaml with outputs from the rpm-lock script - Move the podman scripts to run inside a tmp/ folder inside their lock folder - Update pipeline on-cel-expressions

Details

In response to this:

/cherry-pick release-4.16

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.

openshift-cherrypick-robot · 2025-11-14T15:26:47Z

@fontivan: #3289 failed to apply on top of branch "release-4.14":

Applying: CNF-18836 / CNF-20367: Reconfigure repo to allow mintmaker rpm updates to work with ubi9 images - Update container_build_args.conf to use the new ubi9 image - Update Makefile to parse the new images correctly and update the targets invoking the rpm-lock tooling - Update rpms.in.yaml - Remove now unnecessary ssl configuration - Remove context on Dockerfile - Add varsFromImage with reference to the same image in container_build_args.conf - Update rpms.lock.yaml with outputs from the rpm-lock script - Move the podman scripts to run inside a tmp/ folder inside their lock folder - Update pipeline on-cel-expressions
Using index info to reconstruct a base tree...
M	.konflux/Dockerfile.catalog
M	.konflux/container_build_args.conf
M	.konflux/lock-runtime/rpms.in.yaml
M	.konflux/lock-runtime/rpms.lock.yaml
A	.tekton/lifecycle-agent-4-21-pull-request.yaml
A	.tekton/lifecycle-agent-4-21-push.yaml
M	Dockerfile
M	Makefile
Falling back to patching base and 3-way merge...
Auto-merging Makefile
Auto-merging Dockerfile
CONFLICT (content): Merge conflict in Dockerfile
Auto-merging .tekton/lifecycle-agent-4-14-push.yaml
Auto-merging .tekton/lifecycle-agent-4-14-pull-request.yaml
Auto-merging .konflux/lock-runtime/rpms.lock.yaml
CONFLICT (content): Merge conflict in .konflux/lock-runtime/rpms.lock.yaml
Auto-merging .konflux/lock-runtime/rpms.in.yaml
Auto-merging .konflux/container_build_args.conf
Auto-merging .konflux/Dockerfile.catalog
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 CNF-18836 / CNF-20367: Reconfigure repo to allow mintmaker rpm updates to work with ubi9 images - Update container_build_args.conf to use the new ubi9 image - Update Makefile to parse the new images correctly and update the targets invoking the rpm-lock tooling - Update rpms.in.yaml - Remove now unnecessary ssl configuration - Remove context on Dockerfile - Add varsFromImage with reference to the same image in container_build_args.conf - Update rpms.lock.yaml with outputs from the rpm-lock script - Move the podman scripts to run inside a tmp/ folder inside their lock folder - Update pipeline on-cel-expressions

Details

In response to this:

/cherry-pick release-4.14

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.

openshift-ci bot requested review from danmanor and sakhoury November 12, 2025 19:50

fontivan mentioned this pull request Nov 12, 2025

CNF-18836: Reconfigure repo to allow mintmaker rpm updates to work #2990

Closed

fontivan force-pushed the sskeard/cnf-20367-cnf-18836-images-overhaul-2 branch 4 times, most recently from 77bec01 to 541ffc0 Compare November 12, 2025 19:57

openshift-ci bot requested review from abraham2512, jc-rh, rauhersu, shajmakh and yanirq November 12, 2025 20:01

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 12, 2025

rauhersu reviewed Nov 13, 2025

View reviewed changes

.tekton/lifecycle-agent-4-21-push.yaml Show resolved Hide resolved

fontivan force-pushed the sskeard/cnf-20367-cnf-18836-images-overhaul-2 branch from 541ffc0 to a6aaba0 Compare November 13, 2025 16:38

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 13, 2025

fontivan force-pushed the sskeard/cnf-20367-cnf-18836-images-overhaul-2 branch from a6aaba0 to 4c1e6de Compare November 13, 2025 16:39

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 13, 2025

fontivan mentioned this pull request Nov 13, 2025

CNF-18836 / CNF-20367: Reconfigure repo to allow mintmaker rpm updates to work with ubi9 images rh-ecosystem-edge/recert#716

Merged

fontivan force-pushed the sskeard/cnf-20367-cnf-18836-images-overhaul-2 branch from 4c1e6de to 3970065 Compare November 13, 2025 17:04

fontivan force-pushed the sskeard/cnf-20367-cnf-18836-images-overhaul-2 branch from 3970065 to a21c535 Compare November 13, 2025 18:04

openshift-ci bot assigned rauhersu Nov 13, 2025

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 13, 2025

jc-rh approved these changes Nov 14, 2025

View reviewed changes

openshift-ci bot assigned jc-rh Nov 14, 2025

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 14, 2025

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 14, 2025

openshift-merge-bot bot merged commit 180d927 into openshift-kni:main Nov 14, 2025
17 checks passed

openshift-cherrypick-robot mentioned this pull request Nov 14, 2025

[release-4.20] CNF-18836 / CNF-20367: Reconfigure repo to allow mintmaker rpm updates to work with ubi9 images #3342

Closed

Conversation

fontivan commented Nov 12, 2025

Background / Context

Issue / Requirement / Reason for change

Solution / Feature Overview

Implementation Details

Other Information

Uh oh!

openshift-ci-robot commented Nov 12, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Background / Context

Issue / Requirement / Reason for change

Solution / Feature Overview

Implementation Details

Other Information

Uh oh!

fontivan commented Nov 12, 2025

Uh oh!

fontivan commented Nov 12, 2025

Uh oh!

fontivan commented Nov 13, 2025

Uh oh!

Uh oh!

fontivan commented Nov 13, 2025

Uh oh!

fontivan commented Nov 13, 2025

Uh oh!

rauhersu commented Nov 13, 2025

Uh oh!

openshift-ci bot commented Nov 14, 2025

Uh oh!

fontivan commented Nov 14, 2025

Uh oh!

Uh oh!

fontivan commented Nov 14, 2025

Uh oh!

fontivan commented Nov 14, 2025

Uh oh!

fontivan commented Nov 14, 2025

Uh oh!

fontivan commented Nov 14, 2025

Uh oh!

fontivan commented Nov 14, 2025

Uh oh!

fontivan commented Nov 14, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 14, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 14, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 14, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 14, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 14, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 14, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

openshift-ci-robot commented Nov 12, 2025 •

edited by openshift-ci bot

Loading