From cd884fa529c3bf0eef212677e09782b7eed11a2b Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Wed, 4 Nov 2020 12:04:13 +0100 Subject: [PATCH 1/3] Travis: bump go to 1.15.x Signed-off-by: Valentin Rothberg --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d8392a8f..eb61e02c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ matrix: - os: osx go: - - 1.13.x + - 1.15.x notifications: email: false From 65c5b0bf8d391ab19c86c0e7d337c457369ecba5 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Wed, 4 Nov 2020 12:57:24 +0100 Subject: [PATCH 2/3] integration tests: disable `ls` for logs For yet unknown reasons, Travis throws permission errors when trying to recursively list the contents of a temp directory. It passes locally, so disable the logs to unblock CI. Note, the reasons for the error are yet to be revealed. Related-issue: https://github.com/containers/skopeo/issues/1093 Signed-off-by: Valentin Rothberg --- integration/copy_test.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/integration/copy_test.go b/integration/copy_test.go index 3f8ba901..3d34fcd2 100644 --- a/integration/copy_test.go +++ b/integration/copy_test.go @@ -1114,10 +1114,12 @@ func (s *CopySuite) TestCopyVerifyingMirroredSignatures(c *check.C) { // Create a signature for mirroring-primary:primary-signed without pushing there. This should be easier than using standalone-sign. signingDir := filepath.Join(topDir, "signing-temp") assertSkopeoSucceeds(c, "", "copy", "--src-tls-verify=false", regPrefix+"primary:unsigned", "dir:"+signingDir) - c.Logf("%s", combinedOutputOfCommand(c, "ls", "-laR", signingDir)) + // Unknown error in Travis: https://github.com/containers/skopeo/issues/1093 + // c.Logf("%s", combinedOutputOfCommand(c, "ls", "-laR", signingDir)) assertSkopeoSucceeds(c, "^$", "standalone-sign", "-o", filepath.Join(signingDir, "signature-1"), filepath.Join(signingDir, "manifest.json"), "localhost:5006/myns/mirroring-primary:primary-signed", "personal@example.com") - c.Logf("%s", combinedOutputOfCommand(c, "ls", "-laR", signingDir)) + // Unknown error in Travis: https://github.com/containers/skopeo/issues/1093 + // c.Logf("%s", combinedOutputOfCommand(c, "ls", "-laR", signingDir)) assertSkopeoSucceeds(c, "", "--registries.d", registriesDir, "copy", "--dest-tls-verify=false", "dir:"+signingDir, regPrefix+"mirror:primary-signed") // Verify that a correctly signed image for the primary is accessible using the primary's reference assertSkopeoSucceeds(c, "", "--policy", policy, "--registries.d", registriesDir, "--registries-conf", "fixtures/registries.conf", "copy", "--src-tls-verify=false", regPrefix+"primary:primary-signed", dirDest) From 35daba119465b1620f9de18e2f59a17ab3b6cfdd Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Wed, 4 Nov 2020 16:53:08 +0100 Subject: [PATCH 3/3] Dockerfile: install openssl Apparently openssl was dropped from fedora. Signed-off-by: Valentin Rothberg --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 8248a222..98ad1a44 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,7 @@ RUN dnf -y update && dnf install -y make git golang golang-github-cpuguy83-md2ma which tar wget hostname util-linux bsdtar socat ethtool device-mapper iptables tree findutils nmap-ncat e2fsprogs xfsprogs lsof docker iproute \ bats jq podman runc \ golint \ + openssl \ && dnf clean all # Install two versions of the registry. The first is an older version that