Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-1.24] bump github.com/containers/storage from v1.38.3 to v1.38.5 #4084

Closed
wants to merge 1 commit into from

Conversation

nalind
Copy link
Member

@nalind nalind commented Jun 30, 2022

What type of PR is this?

/kind other

What this PR does / why we need it:

Update github.com/containers/storage from v1.38.3 to v1.38.5, pulling in cherry-picked containers/storage#1244 and containers/storage#1274.

How to verify it

Attempt a buildah build using overlay with mount_program=/usr/bin/fuse-overlayfs when the storage root is itself on a virtiofs mount point.

Which issue(s) this PR fixes:

None

Special notes for your reviewer:

This is a bit tricky to set up for CI, but if you're root on a Fedora 36 system, fuse-overlayfs over fuse-overlayfs seems to be close enough to be able to verify it if you're root if you're careful about the base image:

mkdir /var/tmp/{upper,work,lower}
fuse-overlayfs -o upperdir=/var/tmp/upper,lowerdir=/var/tmp/lower,workdir=/var/tmp/work /var/lib/containers
cat > buildfile << EOF
FROM alpine
RUN pwd
EOF
buildah --storage-driver overlay --storage-opt mount_program=/usr/bin/fuse-overlayfs build -f buildfile

Does this PR introduce a user-facing change?

None

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 30, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nalind

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:

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

@nalind nalind force-pushed the bump-storage-1.24 branch 5 times, most recently from 9c664b3 to cd7a4c1 Compare June 30, 2022 20:46
@rhatdan
Copy link
Member

rhatdan commented Jun 30, 2022

/lgtm
/hold

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 30, 2022

New changes are detected. LGTM label has been removed.

@nalind nalind force-pushed the bump-storage-1.24 branch 12 times, most recently from cc1917a to 31b50b6 Compare June 30, 2022 21:52
Update github.com/containers/storage from v1.38.3 to v1.38.5.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
@gkurz
Copy link

gkurz commented Jul 12, 2022

/retest

@gkurz
Copy link

gkurz commented Jul 12, 2022

Hi @rhatdan, is it possible to retry the smoke test ?

@rhatdan
Copy link
Member

rhatdan commented Jul 12, 2022

Restarted.

@gkurz
Copy link

gkurz commented Jul 12, 2022

Restarted.

@rhatdan Thanks but it seems to be failing again...

@rhatdan
Copy link
Member

rhatdan commented Jul 12, 2022

@cevich Any idea what is happening here?

@cevich
Copy link
Member

cevich commented Jul 12, 2022

That's bad. I just checked, and there's no release-1.24 Cirrus-Cron build setup.. Meaning the meta task hasn't run and the VM images may have been pruned. Let me see if I can recover them...

@cevich
Copy link
Member

cevich commented Jul 12, 2022

...sigh, we're screwd on the c4764556961513472 images, they're gone-gone. This is at least partly or fully my fault...I clearly wasn't paying attention and should have added that cirrus-cron job to keep them alive. I've also had on my TODO list for a while to add some kind of "don't ever deprecate this image" mechanism 😢

Plan B: Is there a podman release branch that roughly corresponds to the buildah 1.24 timeframe? Assuming so, we can simply steal the image ID from that podman branch and use it here.

@rhatdan
Copy link
Member

rhatdan commented Jul 12, 2022

SGTM

@cevich
Copy link
Member

cevich commented Jul 12, 2022

Poking around I found the podman v4.0 branch is using identical OS versions (packages may be a bit newer or older). More importantly, the images are still alive. Use c5814666029957120 here (in .cirrus.yml) and the tests should start working. I'll also go ahead and add this branch into the cirrus-cron list to prevent this happening again.

@rhatdan rhatdan closed this Jul 12, 2022
@nalind nalind deleted the bump-storage-1.24 branch July 14, 2022 15:14
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 7, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants