diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2022-07-30 00:08:00 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2022-08-02 16:52:56 +0200 |
| commit | 62cc871c6667268fca30708fd03f25ee66a6fc99 (patch) | |
| tree | f6a5e44dc858b809804548adcd390ed23d1cb61e /test | |
| parent | 52db7637378881479137136395d9d9ede58a3f8a (diff) | |
| download | podman-62cc871c6667268fca30708fd03f25ee66a6fc99.tar.gz podman-62cc871c6667268fca30708fd03f25ee66a6fc99.tar.bz2 podman-62cc871c6667268fca30708fd03f25ee66a6fc99.zip | |
Update the registry server we test against from 2.6 to 2.8
... 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č <mitr@redhat.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/config_amd64.go | 2 | ||||
| -rw-r--r-- | test/utils/utils.go | 2 |
2 files changed, 2 insertions, 2 deletions
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) |