Skip to content

Vendor in latest containers/(common, image, storage)#5585

Merged
openshift-merge-bot[bot] merged 1 commit intocontainers:mainfrom
rhatdan:VENDOR
Jul 15, 2024
Merged

Vendor in latest containers/(common, image, storage)#5585
openshift-merge-bot[bot] merged 1 commit intocontainers:mainfrom
rhatdan:VENDOR

Conversation

@rhatdan
Copy link
Copy Markdown
Member

@rhatdan rhatdan commented Jun 11, 2024 •
edited
Loading

Testing latest changes in common, storage and image ASAP.

Needed to get buildah vendor into Podman to work correctly.

Signed-off-by: Daniel J Walsh dwalsh@redhat.com

@packit-as-a-service
Copy link
Copy Markdown

packit-as-a-service bot commented Jun 11, 2024

Ephemeral COPR build failed. @containers/packit-build please check.

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 24, 2024
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 10, 2024
@rhatdan rhatdan changed the title Vendor in latest containers/storage Testing latest changes in common, storage and image ASAP. Needed to get buildah vendor into Podman to work correctly. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Jul 10, 2024
@rhatdan rhatdan changed the title Testing latest changes in common, storage and image ASAP. Needed to get buildah vendor into Podman to work correctly. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Vendor in latest containers/(common, image, storage) Jul 10, 2024
@rhatdan
Copy link
Copy Markdown
Member Author

rhatdan commented Jul 11, 2024

@giuseppe The pigz change has changed one of the tests when running out of space on disk.

[+2438s] # Error: writing blob: storing blob to file "/var/tmp/buildah_tests.fhmvnh/buildah-test/container_images_storage3753737850/2": pigz: skipping: : corrupted -- incomplete deflate data: exit status 1

Where currently Buildah test is looking for:

@test "pull image with TMPDIR set" {
  skip_if_rootless_environment
  testdir=${TEST_SCRATCH_DIR}/buildah-test
  mkdir -p $testdir
  mount -t tmpfs -o size=1M tmpfs $testdir

  TMPDIR=$testdir run_buildah 125 pull --policy always $WITH_POLICY_JSON quay.io/libpod/alpine_nginx:latest
  expect_output --substring "no space left on device"

  run_buildah pull --policy always $WITH_POLICY_JSON quay.io/libpod/alpine_nginx:latest
  umount $testdir
  rm -rf $testdir
}

We can simply fix the tests, but the error message from pigz kinda stinks.

giuseppe added a commit to giuseppe/storage that referenced this pull request Jul 11, 2024
@giuseppe
archive: report error from input stream
69cb719 
if there is an error reading from the input stream, prefer to report
it instead of the error from the filter program itself.

We have a test in the buildah CI that expects the "no space left on
device" error that comes from the input stream, to avoid changing the
test, just fix it here.

Reported here: containers/buildah#5585

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
@giuseppe giuseppe mentioned this pull request Jul 11, 2024
Merged
@giuseppe
Copy link
Copy Markdown
Member

giuseppe commented Jul 11, 2024

this should help: containers/storage#2012

giuseppe added a commit to giuseppe/storage that referenced this pull request Jul 11, 2024
@giuseppe
archive: report error from input stream
9883769 
if there is an error reading from the input stream, prefer to report
it instead of the error from the filter program itself.

We have a test in the buildah CI that expects the "no space left on
device" error that comes from the input stream, to avoid changing the
test, just fix it here.

Reported here: containers/buildah#5585

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
giuseppe added a commit to giuseppe/storage that referenced this pull request Jul 11, 2024
@giuseppe
archive: report error from input stream
22fa550 
if there is an error reading from the input stream, prefer to report
it instead of the error from the filter program itself.

We have a test in the buildah CI that expects the "no space left on
device" error that comes from the input stream, to avoid changing the
test, just fix it here.

Reported here: containers/buildah#5585

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
@rhatdan
Vendor in latest containers/(common, storage, image)
e2f0805 
Testing latest changes in common, storage and image ASAP.

Needed to get buildah vendor into Podman to work correctly.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
@rhatdan
Copy link
Copy Markdown
Member Author

rhatdan commented Jul 12, 2024

@giuseppe @mtrmac @cgwalters PTAL
The fix by Giuseppe got the test to pass.

@rhatdan
Copy link
Copy Markdown
Member Author

rhatdan commented Jul 15, 2024

@flouthoc @giuseppe @nalind @mheon @ashley-cui @vrothberg PTAL
Can we get this merged, so we can finally update podman.

giuseppe
giuseppe approved these changes Jul 15, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@giuseppe giuseppe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Jul 15, 2024
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Jul 15, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: giuseppe, rhatdan

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:

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

@openshift-merge-bot openshift-merge-bot bot merged commit 4a82e0a into containers:main Jul 15, 2024
@edsantiago edsantiago mentioned this pull request Jul 15, 2024
Draft
@nalind nalind mentioned this pull request Jul 15, 2024
Merged
@stale-locking-app stale-locking-app bot locked as resolved and limited conversation to collaborators Oct 14, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@giuseppe giuseppe giuseppe approved these changes

Assignees

@giuseppe giuseppe

Labels

approved lgtm locked - please file new issue/PR

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@rhatdan @giuseppe @openshift-merge-robot