diff options
author | Ed Santiago <santiago@redhat.com> | 2021-12-01 12:47:30 -0700 |
---|---|---|
committer | Ed Santiago <santiago@redhat.com> | 2021-12-01 14:06:22 -0700 |
commit | 3ac1b9bc0f1d45289d0f014d667f7b45302992b6 (patch) | |
tree | 6d0f2c7821eb22ae417f6968392ce571e0d6c987 /test/e2e/libpod_suite_remote_test.go | |
parent | 5ac66e2aab68de1d40a01c6f9d00956a45ccaa4d (diff) | |
download | podman-3ac1b9bc0f1d45289d0f014d667f7b45302992b6.tar.gz podman-3ac1b9bc0f1d45289d0f014d667f7b45302992b6.tar.bz2 podman-3ac1b9bc0f1d45289d0f014d667f7b45302992b6.zip |
Image caches: allow overriding cache dir
Images were being cached in /tmp, with no option to
override. Now $PODMAN_TEST_IMAGE_CACHE_DIR can be
used to point to a user-preferred location. If unset,
try $TMPDIR before settling on /tmp.
Also: refactor the logic for determining the tarball name.
Also: include registry name in tarball name.
Also: clean up unused/unnecessary code
Also: do not echo "Restoring..." if we're not actually restoring.
Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'test/e2e/libpod_suite_remote_test.go')
-rw-r--r-- | test/e2e/libpod_suite_remote_test.go | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/test/e2e/libpod_suite_remote_test.go b/test/e2e/libpod_suite_remote_test.go index 58ffe8c75..d60383029 100644 --- a/test/e2e/libpod_suite_remote_test.go +++ b/test/e2e/libpod_suite_remote_test.go @@ -164,15 +164,16 @@ func (p *PodmanTestIntegration) SeedImages() error { // RestoreArtifact puts the cached image into our test store func (p *PodmanTestIntegration) RestoreArtifact(image string) error { - fmt.Printf("Restoring %s...\n", image) - dest := strings.Split(image, "/") - destName := fmt.Sprintf("/tmp/%s.tar", strings.Replace(strings.Join(strings.Split(dest[len(dest)-1], "/"), ""), ":", "-", -1)) - args := []string{"load", "-q", "-i", destName} - podmanOptions := getRemoteOptions(p, args) - command := exec.Command(p.PodmanBinary, podmanOptions...) - fmt.Printf("Running: %s %s\n", p.PodmanBinary, strings.Join(podmanOptions, " ")) - command.Start() - command.Wait() + tarball := imageTarPath(image) + if _, err := os.Stat(tarball); err == nil { + fmt.Printf("Restoring %s...\n", image) + args := []string{"load", "-q", "-i", tarball} + podmanOptions := getRemoteOptions(p, args) + command := exec.Command(p.PodmanBinary, podmanOptions...) + fmt.Printf("Running: %s %s\n", p.PodmanBinary, strings.Join(podmanOptions, " ")) + command.Start() + command.Wait() + } return nil } |