diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-15 15:53:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-15 15:53:16 +0100 |
| commit | a50d0837b633bf780b32a20b8d4f23ccd9521c8d (patch) | |
| tree | 6b24e2243b6a8178ba9581de545d21df82bdb4d5 /test/apiv2/test-apiv2 | |
| parent | b84131eef879049a43f7cd00831575fa118cdefb (diff) | |
| parent | 8a7e70919f4bab0757523ae97c170396cb13c83d (diff) | |
| download | podman-a50d0837b633bf780b32a20b8d4f23ccd9521c8d.tar.gz podman-a50d0837b633bf780b32a20b8d4f23ccd9521c8d.tar.bz2 podman-a50d0837b633bf780b32a20b8d4f23ccd9521c8d.zip | |
Merge pull request #12527 from jwhonce/wip/manifest4
Refactor manifest list operations
Diffstat (limited to 'test/apiv2/test-apiv2')
| -rwxr-xr-x | test/apiv2/test-apiv2 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/apiv2/test-apiv2 b/test/apiv2/test-apiv2 index 391095539..19e8c12d0 100755 --- a/test/apiv2/test-apiv2 +++ b/test/apiv2/test-apiv2 @@ -364,7 +364,9 @@ function start_service() { echo $WORKDIR # Some tests use shortnames; force registry override to work around # docker.io throttling. - env CONTAINERS_REGISTRIES_CONF=$TESTS_DIR/../registries.conf $PODMAN_BIN \ +# FIXME esm revisit pulling expected images re: shortnames caused tests to fail +# env CONTAINERS_REGISTRIES_CONF=$TESTS_DIR/../registries.conf + $PODMAN_BIN \ --root $WORKDIR/server_root --syslog=true \ system service \ --time 15 \ @@ -497,7 +499,7 @@ function wait_for_port() { ############ function podman() { echo "\$ $PODMAN_BIN $*" >>$WORKDIR/output.log - env CONTAINERS_REGISTRIES_CONF=$TESTS_DIR/../registries.conf \ +# env CONTAINERS_REGISTRIES_CONF=$TESTS_DIR/../registries.conf \ $PODMAN_BIN --root $WORKDIR/server_root "$@" >>$WORKDIR/output.log 2>&1 } |