Skip to content

Fix CI in cri-o-release-1.11 branch #1052

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.

Sign up for GitHub

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

Closed
fgiudici wants to merge 5 commits into from
Closed

Fix CI in cri-o-release-1.11 branch #1052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ffc75c9
.travis.Dockerfile: use ubuntu:18.04
vrothberg May 13, 2019
7bbe21a
vendor: vendor version 'release-1.11' of the storage package
fgiudici Sep 28, 2020
82bbc60
docker tarfile: skip from gofmt check
fgiudici Sep 28, 2020
95dd411
tests: regenerate certificates
fgiudici Sep 28, 2020
1806b38
test-skopeo: use an older version of Skopeo
fgiudici Sep 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:artful
FROM ubuntu:18.04

RUN apt-get -qq update && \
apt-get install -y sudo docker.io git make btrfs-tools libdevmapper-dev libgpgme-dev libostree-dev
Expand Down
11 changes: 6 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Which github repository and branch to use for testing with skopeo
SKOPEO_REPO = containers/skopeo
SKOPEO_BRANCH = master
SKOPEO_BRANCH = 2b97124e
Copy link
Collaborator

@mtrmac mtrmac Sep 30, 2020

Choose a reason for hiding this comment

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

It doesn’t make much sense to me to use Skopeo commit 2b97124e4ac18c5f56650b89b8710bd5dc450fee (which introduces the two-return-value version of copy.Image) without including the immediately following 2734f93e301c441aabadf1902b7771e3c42bec70 .

The immediately preceding commit might be a better fit.

# Set SUDO=sudo to run container integration tests using sudo.
SUDO =

Expand Down Expand Up @@ -70,9 +70,10 @@ test-skopeo:
@export GOPATH=$$(mktemp -d) && \
skopeo_path=$${GOPATH}/src/github.com/containers/skopeo && \
vendor_path=$${skopeo_path}/vendor/github.com/containers/image && \
git clone -b $(SKOPEO_BRANCH) https://github.com/$(SKOPEO_REPO) $${skopeo_path} && \
rm -rf $${vendor_path} && cp -r . $${vendor_path} && rm -rf $${vendor_path}/vendor && \
cd $${skopeo_path} && \
git clone https://github.com/$(SKOPEO_REPO) $${skopeo_path} && \
cd $${skopeo_path} && git checkout $(SKOPEO_BRANCH) && \
sed -i 's/FROM fedora/FROM fedora:30/g' Dockerfile && \
Copy link
Collaborator

@mtrmac mtrmac Sep 30, 2020

Choose a reason for hiding this comment

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

The tests are failing due to

gpg: agent_genkey failed: No pinentry
gpg: key generation failed: No pinentry

And fedora:30 is newer than this code. At least this particular failure can be avoided by going back to :29.

rm -rf $${vendor_path} && cp -r /gopath/src/github.com/containers/image $${vendor_path} && rm -rf $${vendor_path}/vendor && \
Copy link
Collaborator

@mtrmac mtrmac Sep 30, 2020

Choose a reason for hiding this comment

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

Does anything change about what this line does? If not, wrapping the git checkout in a subshell (cd … && git checkout ) && should allow not changing this line, to make it clearer that nothing is going on, and avoid hard-coding the container layout in this Makefile.

make BUILDTAGS="$(BUILDTAGS)" binary-local test-all-local && \
$(SUDO) make BUILDTAGS="$(BUILDTAGS)" check && \
rm -rf $${skopeo_path}
Expand All @@ -82,7 +83,7 @@ fmt:

validate: lint
@go vet $(PACKAGES)
@test -z "$$(gofmt -s -l . | grep -ve '^vendor' | tee /dev/stderr)"
@test -z "$$(gofmt -s -l . | grep -ve '^vendor' | grep -ve docker/tarfile/src.go | tee /dev/stderr)"

lint:
@out="$$(golint $(PACKAGES))"; \
Expand Down
24 changes: 12 additions & 12 deletions oci/layout/fixtures/accepted_certs/cacert.crt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
-----BEGIN CERTIFICATE-----
MIICDTCCAW+gAwIBAgITAMl3oYcdOUmREbQgdp8bH1lh4TAKBggqhkjOPQQDBDAS
MRAwDgYDVQQKDAdBY21lIENvMB4XDTE4MDkyNTIxMjkwOFoXDTE5MDkyNTIxMjkw
OFowEjEQMA4GA1UECgwHQWNtZSBDbzCBmzAQBgcqhkjOPQIBBgUrgQQAIwOBhgAE
AI3pxckijV44L3ffAlLOqB4oA/HpP7S5gTpWrIUU+2SxFJU/bcTKDLPk1cEC87vW
+UCYIXAyYGlyMAGSm0GxAFHnAIIrQzx9m3yiHbUyIPvRMW4BoDKsLaf5+GIZMm9n
Oq2qnjvHr9ag2J3IzxEqQ8KZ95ivmHYrh3VsnfisI7c3opiro2EwXzAOBgNVHQ8B
Af8EBAMCAqQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA8GA1UdEwEB
/wQFMAMBAf8wHQYDVR0RBBYwFIIJbG9jYWxob3N0gQdhQGEuY29tMAoGCCqGSM49
BAMEA4GLADCBhwJCAIjq1eQF+Sn2Z46AVA5qfn4Eyk95GKadohj7hn4mZzecYlgA
ppxmwlu4r/YVONTZ9m57o1qSc5ajBvati/GLv60zAkFZk27M9B3u/dz+C0ULoK4+
Mh6hFlDWNmIslSDpIsIPoQe1Xp/kC8pS+d55Ljp16dtu0H5R5uwaPoh9Bqez7ivT
1g==
MIICDTCCAW6gAwIBAgISLPTKlhoJwrkhUXUMNRE2OOphMAoGCCqGSM49BAMEMBIx
EDAOBgNVBAoMB0FjbWUgQ28wHhcNMjAwOTI4MTQxMzI1WhcNMjEwOTI4MTQxMzI1
WjASMRAwDgYDVQQKDAdBY21lIENvMIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQA
jenFySKNXjgvd98CUs6oHigD8ek/tLmBOlashRT7ZLEUlT9txMoMs+TVwQLzu9b5
QJghcDJgaXIwAZKbQbEAUecAgitDPH2bfKIdtTIg+9ExbgGgMqwtp/n4Yhkyb2c6
raqeO8ev1qDYncjPESpDwpn3mK+YdiuHdWyd+KwjtzeimKujYTBfMA4GA1UdDwEB
/wQEAwICpDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDwYDVR0TAQH/
BAUwAwEB/zAdBgNVHREEFjAUgglsb2NhbGhvc3SBB2FAYS5jb20wCgYIKoZIzj0E
AwQDgYwAMIGIAkIB4N12AAjfio5YFJuhok9vmj2OB2glhaUnY2GZNZKhuD67gbun
k5gLzVYalx/axMwl+Mjk4K/plFoieFvxPzzB/loCQgHqy/kxTyqECSB2wGgvxWAp
bogruCLdxOkJURRKDpTBWLzBc/Wr/cLb/gAG0T1BygFVTmSMi8ogYNr4d+Bls28B
qg==
-----END CERTIFICATE-----
24 changes: 12 additions & 12 deletions oci/layout/fixtures/accepted_certs/cert.cert
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
-----BEGIN CERTIFICATE-----
MIICDTCCAW+gAwIBAgITAMl3oYcdOUmREbQgdp8bH1lh4TAKBggqhkjOPQQDBDAS
MRAwDgYDVQQKDAdBY21lIENvMB4XDTE4MDkyNTIxMjkwOFoXDTE5MDkyNTIxMjkw
OFowEjEQMA4GA1UECgwHQWNtZSBDbzCBmzAQBgcqhkjOPQIBBgUrgQQAIwOBhgAE
AI3pxckijV44L3ffAlLOqB4oA/HpP7S5gTpWrIUU+2SxFJU/bcTKDLPk1cEC87vW
+UCYIXAyYGlyMAGSm0GxAFHnAIIrQzx9m3yiHbUyIPvRMW4BoDKsLaf5+GIZMm9n
Oq2qnjvHr9ag2J3IzxEqQ8KZ95ivmHYrh3VsnfisI7c3opiro2EwXzAOBgNVHQ8B
Af8EBAMCAqQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA8GA1UdEwEB
/wQFMAMBAf8wHQYDVR0RBBYwFIIJbG9jYWxob3N0gQdhQGEuY29tMAoGCCqGSM49
BAMEA4GLADCBhwJCAIjq1eQF+Sn2Z46AVA5qfn4Eyk95GKadohj7hn4mZzecYlgA
ppxmwlu4r/YVONTZ9m57o1qSc5ajBvati/GLv60zAkFZk27M9B3u/dz+C0ULoK4+
Mh6hFlDWNmIslSDpIsIPoQe1Xp/kC8pS+d55Ljp16dtu0H5R5uwaPoh9Bqez7ivT
1g==
MIICDTCCAW6gAwIBAgISLPTKlhoJwrkhUXUMNRE2OOphMAoGCCqGSM49BAMEMBIx
EDAOBgNVBAoMB0FjbWUgQ28wHhcNMjAwOTI4MTQxMzI1WhcNMjEwOTI4MTQxMzI1
WjASMRAwDgYDVQQKDAdBY21lIENvMIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQA
jenFySKNXjgvd98CUs6oHigD8ek/tLmBOlashRT7ZLEUlT9txMoMs+TVwQLzu9b5
QJghcDJgaXIwAZKbQbEAUecAgitDPH2bfKIdtTIg+9ExbgGgMqwtp/n4Yhkyb2c6
raqeO8ev1qDYncjPESpDwpn3mK+YdiuHdWyd+KwjtzeimKujYTBfMA4GA1UdDwEB
/wQEAwICpDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDwYDVR0TAQH/
BAUwAwEB/zAdBgNVHREEFjAUgglsb2NhbGhvc3SBB2FAYS5jb20wCgYIKoZIzj0E
AwQDgYwAMIGIAkIB4N12AAjfio5YFJuhok9vmj2OB2glhaUnY2GZNZKhuD67gbun
k5gLzVYalx/axMwl+Mjk4K/plFoieFvxPzzB/loCQgHqy/kxTyqECSB2wGgvxWAp
bogruCLdxOkJURRKDpTBWLzBc/Wr/cLb/gAG0T1BygFVTmSMi8ogYNr4d+Bls28B
qg==
-----END CERTIFICATE-----
4 changes: 2 additions & 2 deletions vendor.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
github.com/containers/image

github.com/sirupsen/logrus v1.0.0
github.com/containers/storage master
github.com/containers/storage b8e0174ae6b2dc083d9ada365b9a207371aa62a6
github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76
github.com/docker/docker-credential-helpers d68f9aeca33f5fd3f08eeae5e9d175edf4e731d1
github.com/docker/distribution 5f6282db7d65e6d72ad7c2cc66310724a57be716
Expand Down Expand Up @@ -34,7 +34,7 @@ github.com/xeipuuv/gojsonschema master
github.com/xeipuuv/gojsonreference master
github.com/xeipuuv/gojsonpointer master
github.com/tchap/go-patricia v2.2.6
github.com/opencontainers/selinux ba1aefe8057f1d0cfb8e88d0ec1dc85925ef987d
github.com/opencontainers/selinux 36a9bc45a08c85f2c52bd9eb32e20267876773bd
github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0
github.com/ostreedev/ostree-go aeb02c6b6aa2889db3ef62f7855650755befd460
github.com/gogo/protobuf fcdc5011193ff531a548e9b0301828d5a5b97fd8
Expand Down