diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-09-27 23:21:25 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-27 23:21:25 -0700 |
commit | 01a802e54682213e243a35ab98488b3f0bf7031e (patch) | |
tree | 1f7af2d13227bca6f37436366b7a71177d82f778 /test/e2e/libpod_suite_test.go | |
parent | e87012de126a701a5afce73bea3811a540059f65 (diff) | |
parent | 437d9d2cdeae7ffa01dbe06f96d155f1da36a689 (diff) | |
download | podman-01a802e54682213e243a35ab98488b3f0bf7031e.tar.gz podman-01a802e54682213e243a35ab98488b3f0bf7031e.tar.bz2 podman-01a802e54682213e243a35ab98488b3f0bf7031e.zip |
Merge pull request #4118 from cevich/fix_sig_proxy
Move noCache logic lower in stack
Diffstat (limited to 'test/e2e/libpod_suite_test.go')
-rw-r--r-- | test/e2e/libpod_suite_test.go | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go index 1df59dbe3..5239f4d8e 100644 --- a/test/e2e/libpod_suite_test.go +++ b/test/e2e/libpod_suite_test.go @@ -29,7 +29,7 @@ func (p *PodmanTestIntegration) Podman(args []string) *PodmanSessionIntegration // PodmanNoCache calls the podman command with no configured imagecache func (p *PodmanTestIntegration) PodmanNoCache(args []string) *PodmanSessionIntegration { - podmanSession := p.PodmanBase(args, true, false) + podmanSession := p.PodmanBase(args, false, true) return &PodmanSessionIntegration{podmanSession} } @@ -66,7 +66,7 @@ func PodmanTestCreate(tempDir string) *PodmanTestIntegration { } // MakeOptions assembles all the podman main options -func (p *PodmanTestIntegration) makeOptions(args []string, noEvents bool) []string { +func (p *PodmanTestIntegration) makeOptions(args []string, noEvents, noCache bool) []string { var debug string if _, ok := os.LookupEnv("DEBUG"); ok { debug = "--log-level=debug --syslog=true " @@ -84,6 +84,11 @@ func (p *PodmanTestIntegration) makeOptions(args []string, noEvents bool) []stri } podmanOptions = append(podmanOptions, strings.Split(p.StorageOptions, " ")...) + if !noCache { + cacheOptions := []string{"--storage-opt", + fmt.Sprintf("%s.imagestore=%s", p.PodmanTest.ImageCacheFS, p.PodmanTest.ImageCacheDir)} + podmanOptions = append(cacheOptions, podmanOptions...) + } podmanOptions = append(podmanOptions, args...) return podmanOptions } |