Release RPM: Fetch from Podman upstream PR #64

lsm5 · 2024-12-27T08:26:51Z

This commit will allow fetching the podman rpm from the upstream Podman release PR's (or any PR for that matter) Packit copr job.

At this point, the upstream PR is assumed to have passed system tests using the rpms generated in its copr job.

The copr created by Packit on the Podman release PR will be preserved indefinitely.

Fetch rpm from upstream podman PR's copr build job

openshift-ci · 2024-12-27T08:26:57Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lsm5

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

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [lsm5]

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

lsm5 · 2024-12-27T09:24:07Z

Installing 1 packages:
  podman-102:5.4.0~dev-1.20241226125652340763.pr24369.370.a4e73e784.fc41.x86_64 (@commandline)
Updating: podman;102:5.4.0~dev-1.20241226125652340763.pr24369.370.a4e73e784.fc41;x86_64;local
Cleanup: podman;5:5.3.0-1.fc41;x86_64;installed

as seen here

lsm5 · 2025-01-03T13:57:23Z

I'll be on PTO Jan 6-13, so if we can't wait until I return, feel free to take this PR forward. I hope getting rid of the second commit in this PR will be good enough for the main branch.

lsm5 · 2025-01-15T10:50:05Z

@baude @Luap99 @ashley-cui PTAL

lsm5 · 2025-01-27T15:30:59Z

podman-rpm-info-vars.sh

@@ -2,10 +2,10 @@

 # Set to "dev" to pull from the podman-next copr, set to "release"
 # to pull the ext rom from the fedora build system based of the versions below.
-export PODMAN_RPM_TYPE="dev"
+export PODMAN_RPM_TYPE="release"


This change has to be reverted before we merge on main. release should only be on the release branches. I added it to only show the rpm being replaced with the one from copr.

I can do the revert after I have LGTMs.

lsm5 · 2025-01-30T15:37:14Z

@Luap99 did something change in the cirrus image recently?

from the Verify libkrun test

make -C podman podman-remote
/bin/bash: go: command not found
Makefile:152: invalid `override' directive
make: go: Command not found
env: go: No such file or directory
env: go: No such file or directory
Makefile:191: *** Required variable NATIVE_GOOS value is undefined, whitespace, or empty.  Stop.

Exit status: 2

Luap99 · 2025-01-30T15:39:39Z

@lsm5 Yes there is a major bug in our cirrus yml...
I was in fact just looking at this already please do not rerun any tasks here. I will post a PR with the fix

Luap99 · 2025-01-30T15:44:05Z

pushed the fix to #71

lsm5 · 2025-02-04T12:53:38Z

good for review. PTAL.

build.sh

podman-image/Containerfile

Luap99 · 2025-02-04T12:59:11Z

podman-image/Containerfile

 # 1. For dev builds, replace aardvark-dns, conmon, crun, netavark, podman, containers-common
 # 2. For release builds, fetch the build from koji
 # 3. Remove moby-engine, containerd, runc, zincati for both dev and release builds
 # Note: Currently does not result in a size reduction for the container image

 RUN if [[ ${PODMAN_RPM_TYPE} == "dev" ]]; then \
+        rm /etc/yum.repos.d/podman-release-copr.repo /etc/pki/rpm-gpg/podman-release-copr.gpg; \


This is breaking exit code checks, you need to use && here

Luap99 · 2025-02-04T12:59:31Z

podman-image/Containerfile

-    rpm-ostree override remove moby-engine containerd runc && \
-    rm -fr /var/cache && \
-    ostree container commit
+        rm /etc/yum.repos.d/rhcontainerbot*.repo /etc/pki/rpm-gpg/rhcontainerbot*.gpg; \


and here again you need to use &&

Luap99 · 2025-02-04T13:00:13Z

podman-image/Containerfile

+        rpm-ostree override replace --experimental --freeze \
+        --from repo="copr:copr.fedorainfracloud.org:packit:containers-podman-${PODMAN_PR_NUM}" \
+        podman; \
+    fi; \


and this is as well is also a major problem that prevents us from checking the exit code, you need to use &&

baude · 2025-02-04T15:15:27Z

LGTM with comments resolved.

This commit will allow fetching the podman rpm from the upstream Podman release PR's (or any PR for that matter) Packit copr job. At this point, the upstream release PR is assumed to already have successful copr rpms. We do not need a new tag pushed to podman upstream in order for this to work. The copr created by Packit on the Podman release PR will be preserved indefinitely. Note: For now, the PODMAN_VERSION var will also have to be updated manually on release PRs. Signed-off-by: Lokesh Mandvekar <[email protected]>

Signed-off-by: Lokesh Mandvekar <[email protected]>

lsm5 · 2025-02-05T11:35:19Z

From the latest log:

Installing 1 packages:
  podman-102:5.4.0~dev-1.20250130152252168600.pr24369.67.9f01c0748.fc41.x86_64 (@commandline)
Updating: podman;102:5.4.0~dev-1.20250130152252168600.pr24369.67.9f01c0748.fc41;x86_64;local
Cleanup: podman;5:5.3.1-1.fc41;x86_64;installed

github-actions · 2025-02-05T11:36:52Z

Image Downloads for cirrus build 4959746681208832:

x86_64	aarch64
podman-machine.x86_64.applehv.raw.zst	podman-machine.aarch64.applehv.raw.zst
podman-machine.x86_64.hyperv.vhdx.zst	podman-machine.aarch64.hyperv.vhdx.zst
podman-machine.x86_64.qemu.qcow2.zst	podman-machine.aarch64.qemu.qcow2.zst
podman-machine.x86_64.tar	podman-machine.aarch64.tar

Everything zip

openshift-ci bot added release-note do-not-merge/work-in-progress labels Dec 27, 2024

openshift-ci bot added the approved label Dec 27, 2024

lsm5 force-pushed the main-copr-rpm-upstream branch 4 times, most recently from faac534 to aae8b2a Compare December 27, 2024 08:52

lsm5 mentioned this pull request Dec 27, 2024

[v5.3] Release RPM: Fetch from Podman release PR #51

Closed

lsm5 marked this pull request as ready for review December 27, 2024 09:22

openshift-ci bot removed the do-not-merge/work-in-progress label Dec 27, 2024

lsm5 force-pushed the main-copr-rpm-upstream branch from aae8b2a to edc857f Compare January 2, 2025 10:16

lsm5 commented Jan 27, 2025

View reviewed changes

lsm5 marked this pull request as draft January 30, 2025 13:41

openshift-ci bot added the do-not-merge/work-in-progress label Jan 30, 2025

lsm5 force-pushed the main-copr-rpm-upstream branch 3 times, most recently from 8c1ee28 to bffba27 Compare January 30, 2025 15:02

lsm5 force-pushed the main-copr-rpm-upstream branch 2 times, most recently from ee719a7 to 688deba Compare January 31, 2025 12:50

lsm5 marked this pull request as ready for review January 31, 2025 13:34

openshift-ci bot removed the do-not-merge/work-in-progress label Jan 31, 2025

lsm5 mentioned this pull request Feb 4, 2025

5.4 image is does not contain podman 5.4 #75

Closed

lsm5 force-pushed the main-copr-rpm-upstream branch from 688deba to 8207e26 Compare February 4, 2025 11:20

lsm5 force-pushed the main-copr-rpm-upstream branch from 8207e26 to a205116 Compare February 4, 2025 12:05

Luap99 reviewed Feb 4, 2025

View reviewed changes

lsm5 force-pushed the main-copr-rpm-upstream branch from a205116 to d717e52 Compare February 5, 2025 11:08

lsm5 marked this pull request as draft February 5, 2025 11:09

openshift-ci bot added the do-not-merge/work-in-progress label Feb 5, 2025

lsm5 added 2 commits February 5, 2025 16:46

[tmp] Test with rpm from PR on main branch

e904256

Signed-off-by: Lokesh Mandvekar <[email protected]>

lsm5 force-pushed the main-copr-rpm-upstream branch from d717e52 to e904256 Compare February 5, 2025 11:16

lsm5 marked this pull request as ready for review February 5, 2025 11:35

openshift-ci bot removed the do-not-merge/work-in-progress label Feb 5, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Release RPM: Fetch from Podman upstream PR #64

Release RPM: Fetch from Podman upstream PR #64

lsm5 commented Dec 27, 2024

openshift-ci bot commented Dec 27, 2024

lsm5 commented Dec 27, 2024

lsm5 commented Jan 3, 2025

lsm5 commented Jan 15, 2025

lsm5 Jan 27, 2025

lsm5 commented Jan 30, 2025

Luap99 commented Jan 30, 2025

Luap99 commented Jan 30, 2025

lsm5 commented Feb 4, 2025

Luap99 Feb 4, 2025

lsm5 Feb 5, 2025

Luap99 Feb 4, 2025

lsm5 Feb 5, 2025

Luap99 Feb 4, 2025

lsm5 Feb 5, 2025

baude commented Feb 4, 2025

lsm5 commented Feb 5, 2025

github-actions bot commented Feb 5, 2025

Release RPM: Fetch from Podman upstream PR #64

Are you sure you want to change the base?

Release RPM: Fetch from Podman upstream PR #64

Conversation

lsm5 commented Dec 27, 2024

openshift-ci bot commented Dec 27, 2024

lsm5 commented Dec 27, 2024

lsm5 commented Jan 3, 2025

lsm5 commented Jan 15, 2025

lsm5 Jan 27, 2025

Choose a reason for hiding this comment

lsm5 commented Jan 30, 2025

Luap99 commented Jan 30, 2025

Luap99 commented Jan 30, 2025

lsm5 commented Feb 4, 2025

Luap99 Feb 4, 2025

Choose a reason for hiding this comment

lsm5 Feb 5, 2025

Choose a reason for hiding this comment

Luap99 Feb 4, 2025

Choose a reason for hiding this comment

lsm5 Feb 5, 2025

Choose a reason for hiding this comment

Luap99 Feb 4, 2025

Choose a reason for hiding this comment

lsm5 Feb 5, 2025

Choose a reason for hiding this comment

baude commented Feb 4, 2025

lsm5 commented Feb 5, 2025

github-actions bot commented Feb 5, 2025