From d83d08194247b34dec859ec05880fee692c854d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= <mitr@redhat.com>
Date: Thu, 31 Oct 2019 17:33:35 +0100
Subject: [PATCH] Revert "Temporarily work around auth.json location confusion"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit 4962559e5cb79a0d6d869b1c26dbc0171354eb73.
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
---
systemtest/040-local-registry-auth.bats | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/systemtest/040-local-registry-auth.bats b/systemtest/040-local-registry-auth.bats
index 2705d0d5..fe1b2f97 100644
--- a/systemtest/040-local-registry-auth.bats
+++ b/systemtest/040-local-registry-auth.bats
@@ -14,15 +14,6 @@ function setup() {
mkdir -p $_cred_dir/containers
rm -f $_cred_dir/containers/auth.json
- # TODO: This is here to work around
- # https://github.com/containers/libpod/issues/4227 in the
- # "auth: credentials via podman login" test.
- # It should be removed once a packaged version of podman which includes
- # that fix is available in our CI environment, since we _want_ to be
- # checking that podman and skopeo agree on the default for where registry
- # credentials should be stored.
- export REGISTRY_AUTH_FILE=$_cred_dir/containers/auth.json
-
# Start authenticated registry with random password
testuser=testuser
testpassword=$(random_string 15)