From 62cc871c6667268fca30708fd03f25ee66a6fc99 Mon Sep 17 00:00:00 2001 From: Miloslav Trmač Date: Sat, 30 Jul 2022 00:08:00 +0200 Subject: Update the registry server we test against from 2.6 to 2.8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... primarily so that it can support OCI artifacts. 2.8 already seems to exist in the repo. This requires changing WaitContainerReady to also check stderr (ultimately because docker/distribution was updated to a more recent sirupsen/logrus, which logs by default to stderr instead of stdout). Signed-off-by: Miloslav Trmač --- hack/podman-registry | 4 ++-- test/e2e/config_amd64.go | 2 +- test/utils/utils.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hack/podman-registry b/hack/podman-registry index f1254966b..f1b68deaa 100755 --- a/hack/podman-registry +++ b/hack/podman-registry @@ -7,7 +7,7 @@ ME=$(basename $0) ############################################################################### # BEGIN defaults -PODMAN_REGISTRY_IMAGE=quay.io/libpod/registry:2.6 +PODMAN_REGISTRY_IMAGE=quay.io/libpod/registry:2.8 PODMAN_REGISTRY_USER= PODMAN_REGISTRY_PASS= @@ -30,7 +30,7 @@ into a local temporary directory, create an htpasswd, start the registry, and dump a series of environment variables to stdout: \$ $ME start - PODMAN_REGISTRY_IMAGE=\"docker.io/library/registry:2.6\" + PODMAN_REGISTRY_IMAGE=\"docker.io/library/registry:2.8\" PODMAN_REGISTRY_PORT=\"5050\" PODMAN_REGISTRY_USER=\"userZ3RZ\" PODMAN_REGISTRY_PASS=\"T8JVJzKrcl4p6uT\" diff --git a/test/e2e/config_amd64.go b/test/e2e/config_amd64.go index f32542df8..ba7940d57 100644 --- a/test/e2e/config_amd64.go +++ b/test/e2e/config_amd64.go @@ -8,7 +8,7 @@ var ( CACHE_IMAGES = []string{ALPINE, BB, fedoraMinimal, NGINX_IMAGE, REDIS_IMAGE, REGISTRY_IMAGE, INFRA_IMAGE, LABELS_IMAGE, HEALTHCHECK_IMAGE, UBI_INIT, UBI_MINIMAL, fedoraToolbox} //nolint:revive,stylecheck NGINX_IMAGE = "quay.io/libpod/alpine_nginx:latest" //nolint:revive,stylecheck BB_GLIBC = "docker.io/library/busybox:glibc" //nolint:revive,stylecheck - REGISTRY_IMAGE = "quay.io/libpod/registry:2.6" //nolint:revive,stylecheck + REGISTRY_IMAGE = "quay.io/libpod/registry:2.8" //nolint:revive,stylecheck LABELS_IMAGE = "quay.io/libpod/alpine_labels:latest" //nolint:revive,stylecheck UBI_MINIMAL = "registry.access.redhat.com/ubi8-minimal" //nolint:revive,stylecheck UBI_INIT = "registry.access.redhat.com/ubi8-init" //nolint:revive,stylecheck diff --git a/test/utils/utils.go b/test/utils/utils.go index 72339014e..3e7ed1d55 100644 --- a/test/utils/utils.go +++ b/test/utils/utils.go @@ -225,7 +225,7 @@ func (p *PodmanTest) WaitContainerReady(id string, expStr string, timeout int, s return false } - if strings.Contains(s.OutputToString(), expStr) { + if strings.Contains(s.OutputToString(), expStr) || strings.Contains(s.ErrorToString(), expStr) { return true } time.Sleep(time.Duration(step) * time.Second) -- cgit v1.2.3-54-g00ecf