From 14186ca28e01a35937eeb61e7168eb8e3161b507 Mon Sep 17 00:00:00 2001 From: Brent Baude Date: Tue, 17 Mar 2020 15:44:39 -0500 Subject: fix timeout file flake this is a temporary fix for the flake that has been troubling us. once conmon is in fedora 30 and 31 stable, we can remove this fix. the images will just need to be rebuilt. Signed-off-by: Brent Baude --- contrib/cirrus/setup_environment.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 5001ef4dd..9b4a56acd 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -47,6 +47,15 @@ case "${OS_RELEASE_ID}" in fi ;; fedora) + # This is temporary and should be removed once conmon is in stable + # and the images can be rebuilt properly. + if [[ "$OS_RELEASE_VER" -eq "30" ]]; then + dnf -y install https://kojipkgs.fedoraproject.org//packages/conmon/2.0.13/1.fc30/x86_64/conmon-2.0.13-1.fc30.x86_64.rpm + else + dnf -y install https://kojipkgs.fedoraproject.org//packages/conmon/2.0.13/1.fc31/x86_64/conmon-2.0.13-1.fc31.x86_64.rpm + fi + # End of temporary patch + # All SELinux distros need this for systemd-in-a-container setsebool container_manage_cgroup true if [[ "$ADD_SECOND_PARTITION" == "true" ]]; then -- cgit v1.2.3-54-g00ecf From d47dc63cf5b4804e5daf81f1e53d26ad7857a1e0 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Tue, 17 Mar 2020 15:20:14 -0400 Subject: Fix vendoring on master It looks like something snuck in and now make vendor fails on master. This should make things happy. Signed-off-by: Matthew Heon --- .../containers/buildah/pkg/supplemented/supplemented.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/vendor/github.com/containers/buildah/pkg/supplemented/supplemented.go b/vendor/github.com/containers/buildah/pkg/supplemented/supplemented.go index 9dd47a0e2..5e3c6291a 100644 --- a/vendor/github.com/containers/buildah/pkg/supplemented/supplemented.go +++ b/vendor/github.com/containers/buildah/pkg/supplemented/supplemented.go @@ -296,6 +296,9 @@ func (s *supplementedImageSource) Close() error { } closed[sourceInstance] = struct{}{} } + if returnErr == nil { + return nil + } return returnErr.ErrorOrNil() } @@ -340,13 +343,17 @@ func (s *supplementedImageSource) HasThreadSafeGetBlob() bool { } func (s *supplementedImageSource) GetSignatures(ctx context.Context, instanceDigest *digest.Digest) ([][]byte, error) { - var src types.ImageSource + var ( + src types.ImageSource + digest digest.Digest + ) requestInstanceDigest := instanceDigest if instanceDigest == nil { if sourceInstance, ok := s.sourceInstancesByInstance[""]; ok { src = sourceInstance } } else { + digest = *instanceDigest if sourceInstance, ok := s.sourceInstancesByInstance[*instanceDigest]; ok { src = sourceInstance } @@ -357,7 +364,7 @@ func (s *supplementedImageSource) GetSignatures(ctx context.Context, instanceDig if src != nil { return src.GetSignatures(ctx, requestInstanceDigest) } - return nil, errors.Wrapf(ErrDigestNotFound, "error finding instance for instance digest %q to read signatures", *instanceDigest) + return nil, errors.Wrapf(ErrDigestNotFound, "error finding instance for instance digest %q to read signatures", digest) } func (s *supplementedImageSource) LayerInfosForCopy(ctx context.Context, instanceDigest *digest.Digest) ([]types.BlobInfo, error) { -- cgit v1.2.3-54-g00ecf