summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Jia <chuanchang.jia@gmail.com>2021-08-20 02:08:58 +0800
committerMatthew Heon <mheon@redhat.com>2021-08-30 13:19:26 -0400
commitc16daa07ed2ccb251d2eaf76614c8fde433dcc91 (patch)
tree7b94427481eba775166569d6cf0e5455f903d005
parent7752c73e477e4dffbd0a876b5c3711bd78754da1 (diff)
downloadpodman-c16daa07ed2ccb251d2eaf76614c8fde433dcc91.tar.gz
podman-c16daa07ed2ccb251d2eaf76614c8fde433dcc91.tar.bz2
podman-c16daa07ed2ccb251d2eaf76614c8fde433dcc91.zip
e2e tests: fix overlay: Unknown option vfs.imagestore
Fixes: https://github.com/containers/podman/issues/11201 The STORAGE_FS is hard code in test/e2e/config_amd64.go, it will hit error like this "overlay: Unknown option vfs.imagestore" when setting STORAGE_OPTIONS="--storage-driver overlay". With this patch, the STORAGE_FS is exported as environment variable, if STORAGE_FS is set, then set storageOptions to --storage-driver $STORAGE_FS. Signed-off-by: Alex Jia <chuanchang.jia@gmail.com>
-rw-r--r--test/e2e/common_test.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
index d03a2741b..1b75faa40 100644
--- a/test/e2e/common_test.go
+++ b/test/e2e/common_test.go
@@ -264,6 +264,11 @@ func PodmanTestCreateUtil(tempDir string, remote bool) *PodmanTestIntegration {
if rootless.IsRootless() {
storageFs = ROOTLESS_STORAGE_FS
}
+ if os.Getenv("STORAGE_FS") != "" {
+ storageFs = os.Getenv("STORAGE_FS")
+ storageOptions = "--storage-driver " + storageFs
+ }
+
p := &PodmanTestIntegration{
PodmanTest: PodmanTest{
PodmanBinary: podmanBinary,