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

Backport 34ae47a22629 the real one #3064

Conversation

vrothberg
Copy link
Member

  • backport commit 34ae47a
  • bump to v1.19.8
  • bump to v1.19.9-dev

@nalind @rhatdan PTAL

I want that in containers/podman#9630. Vendoring master barks as the F33 images need an updated libcap.

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vrothberg

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

@vrothberg
Copy link
Member Author

[+0241s] # github.com/containers/buildah/copier [github.com/containers/buildah/copier.test]
[+0241s] copier/copier_linux_test.go:114:10: t.TempDir undefined (type *testing.T has no field or method TempDir)
[+0241s] copier/copier_test.go:494:13: t.TempDir undefined (type *testing.T has no field or method TempDir)
[+0241s] copier/copier_test.go:533:13: t.TempDir undefined (type *testing.T has no field or method TempDir)
[+0241s] copier/copier_test.go:557:13: t.TempDir undefined (type *testing.T has no field or method TempDir)
[+0262s] === RUN   TestNoop

That's a method in the standard lib. Looks like the CI images in the release-1.19 branch are (too) outdated.

I see some commits in main which bumped the images there but I am absolutely not sure if I can just cherry-pick them here.

@cevich PTAL

@nalind
Copy link
Member

nalind commented Mar 5, 2021

[+0241s] # github.com/containers/buildah/copier [github.com/containers/buildah/copier.test]
[+0241s] copier/copier_linux_test.go:114:10: t.TempDir undefined (type *testing.T has no field or method TempDir)
[+0241s] copier/copier_test.go:494:13: t.TempDir undefined (type *testing.T has no field or method TempDir)
[+0241s] copier/copier_test.go:533:13: t.TempDir undefined (type *testing.T has no field or method TempDir)
[+0241s] copier/copier_test.go:557:13: t.TempDir undefined (type *testing.T has no field or method TempDir)
[+0262s] === RUN   TestNoop

That's a method in the standard lib. Looks like the CI images in the release-1.19 branch are (too) outdated.

Whoops, those were introduced in Go 1.15 and I replaced some uses of ioutil.TempDir() with it without realizing. Fedora 32 had 1.14, but Fedora 33 has 1.15.

@TomSweeneyRedHat
Copy link
Member

I don't think this should go into RHEL 8.4, and I know that @rhatdan is planning to vendor an updated Buildah into Podman for RHEl 8.4. Do we need to think about creating a new branch for RHEL 8.4? (shudder)

@rhatdan
Copy link
Member

rhatdan commented Mar 6, 2021

Since this is just for the test, it probably is less important, correct.

@vrothberg
Copy link
Member Author

Please don't block copy fixes for 8.4. It's almost impossible to untangle them and this is fixing an issue for rootless podman cp which I really want/need in 8.4 since other fixes are based on top.

@vrothberg vrothberg force-pushed the backport-34ae47a22629-the-real-one branch from 1966410 to a025d09 Compare March 8, 2021 10:17
@vrothberg
Copy link
Member Author

Whoops, those were introduced in Go 1.15 and I replaced some uses of ioutil.TempDir() with it without realizing. Fedora 32 had 1.14, but Fedora 33 has 1.15.

Changed to use ioutil.TempDir(...)

Add an IgnoreUnreadable flag to copier.GetOptions to suppress errors
from copier.Get() that would pass the os.IsPermission() test, if they're
encountered while attempting to read files or descend into directories.

Backported-by: Valentin Rothberg <[email protected]>
Signed-off-by: Nalin Dahyabhai <[email protected]>
@vrothberg vrothberg force-pushed the backport-34ae47a22629-the-real-one branch from a025d09 to be0a65f Compare March 8, 2021 11:01
buildah.go Outdated
@@ -28,7 +28,7 @@ const (
Package = "buildah"
// Version for the Package. Bump version in contrib/rpm/buildah.spec
// too.
Version = "1.19.8"
Version = "1.19.9-dev"
Copy link
Member

Choose a reason for hiding this comment

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

I don't think this PR is necessary. ON the supported branches we don't have -dev packages.

Copy link
Member Author

Choose a reason for hiding this comment

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

Dropped the specific commit 👍

@vrothberg vrothberg force-pushed the backport-34ae47a22629-the-real-one branch from be0a65f to b9f85b1 Compare March 8, 2021 12:13
 * copier: add GetOptions.IgnoreUnreadable

Signed-off-by: Valentin Rothberg <[email protected]>
@vrothberg vrothberg force-pushed the backport-34ae47a22629-the-real-one branch from b9f85b1 to d1c9523 Compare March 8, 2021 15:01
@rhatdan
Copy link
Member

rhatdan commented Mar 8, 2021

/lgtm

@openshift-merge-robot openshift-merge-robot merged commit 89ff19c into containers:release-1.19 Mar 8, 2021
@vrothberg vrothberg deleted the backport-34ae47a22629-the-real-one branch March 8, 2021 16:06
@cevich
Copy link
Member

cevich commented Mar 8, 2021

I see some commits in main which bumped the images there but I am absolutely not sure if I can just cherry-pick them here.

Most often this causes even more tests to fail, and it's not a very "kosher" thing to do on a release branch. The branches are about locking environmental things down for stability. Changing golang/glibc stuff under the covers, tends to break promises and cause baby-$DEITY to cry.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 22, 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.

7 participants