From 44a925648c8bc08273e09eb62dc32d2bba244dde Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Tue, 7 Jun 2022 10:49:10 +0200 Subject: [PATCH 1/3] Fix unit tests Commit f032cf649ecc7e0c46718bd9e7814bfb317cb544 introduced a change which requires an additional fix to the unit tests to make them succeed Signed-off-by: Sascha Grunert --- internal/config/conmonmgr/conmonmgr_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/config/conmonmgr/conmonmgr_test.go b/internal/config/conmonmgr/conmonmgr_test.go index e804c625f92..25f4144b7e1 100644 --- a/internal/config/conmonmgr/conmonmgr_test.go +++ b/internal/config/conmonmgr/conmonmgr_test.go @@ -61,7 +61,7 @@ var _ = t.Describe("ConmonManager", func() { It("should succeed when output expected", func() { // Given gomock.InOrder( - runner.EXPECT().CombinedOutput(gomock.Any(), gomock.Any()).Return([]byte("conmon version 2.0.0"), nil), + runner.EXPECT().CombinedOutput(gomock.Any(), gomock.Any()).Return([]byte("conmon version 2.2.2"), nil), ) // When From 0f31d986c38255ec2d52894293b1ee47d4f24b8c Mon Sep 17 00:00:00 2001 From: Ryan Phillips Date: Fri, 29 Jul 2022 17:28:09 -0500 Subject: [PATCH 2/3] migrate image_list to quay.io Signed-off-by: Ryan Phillips Signed-off-by: Peter Hunt~ --- test/image.bats | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/image.bats b/test/image.bats index d9c724a6c69..0cd5235ba81 100644 --- a/test/image.bats +++ b/test/image.bats @@ -5,12 +5,12 @@ load helpers IMAGE=quay.io/crio/pause SIGNED_IMAGE=registry.access.redhat.com/rhel7-atomic:latest -IMAGE_LIST_TAG=docker.io/library/alpine:3.9 -IMAGE_LIST_DIGEST_FOR_TAG=docker.io/library/alpine@sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 -IMAGE_LIST_DIGEST_FOR_TAG_AMD64=docker.io/library/alpine@sha256:65b3a80ebe7471beecbc090c5b2cdd0aafeaefa0715f8f12e40dc918a3a70e32 +IMAGE_LIST_TAG=quay.io/crio/alpine:3.9 +IMAGE_LIST_DIGEST_FOR_TAG=quay.io/crio/alpine@sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 +IMAGE_LIST_DIGEST_FOR_TAG_AMD64=quay.io/crio/alpine@sha256:65b3a80ebe7471beecbc090c5b2cdd0aafeaefa0715f8f12e40dc918a3a70e32 -IMAGE_LIST_DIGEST_AMD64=docker.io/library/alpine@sha256:ab3fe83c0696e3f565c9b4a734ec309ae9bd0d74c192de4590fd6dc2ef717815 -IMAGE_LIST_DIGEST=docker.io/library/alpine@sha256:ab3fe83c0696e3f565c9b4a734ec309ae9bd0d74c192de4590fd6dc2ef717815 +IMAGE_LIST_DIGEST_AMD64=quay.io/crio/alpine@sha256:65b3a80ebe7471beecbc090c5b2cdd0aafeaefa0715f8f12e40dc918a3a70e32 +IMAGE_LIST_DIGEST=quay.io/crio/alpine@sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 function setup() { setup_test From bdc6cddd959e64b7fe188111efc50ba4a394f3f1 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Thu, 28 Jul 2022 13:19:01 +0200 Subject: [PATCH 3/3] Fix nginx based integration tests The image digest is gone from the upstream remote so we now point to the latest version of it. Signed-off-by: Sascha Grunert --- test/image.bats | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/image.bats b/test/image.bats index 0cd5235ba81..b2e10e7164e 100644 --- a/test/image.bats +++ b/test/image.bats @@ -130,9 +130,10 @@ function teardown() { @test "image pull and list by digest and ID" { start_crio - crictl pull quay.io/crio/nginx@sha256:1ad874092a55efe2be0507a01d8a300e286f8137510854606ab1dd28861507a3 + NGINX_IMAGE=quay.io/crio/nginx@sha256:960355a671fb88ef18a85f92ccf2ccf8e12186216c86337ad808c204d69d512d + crictl pull "$NGINX_IMAGE" - imageid=$(crictl images --quiet quay.io/crio/nginx@sha256:1ad874092a55efe2be0507a01d8a300e286f8137510854606ab1dd28861507a3) + imageid=$(crictl images --quiet "$NGINX_IMAGE") [ "$imageid" != "" ] output=$(crictl images --quiet @"$imageid") [ "$output" != "" ]