summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Jia <chuanchang.jia@gmail.com>2021-08-20 02:08:58 +0800
committerAlex Jia <chuanchang.jia@gmail.com>2021-08-20 02:09:12 +0800
commit745f6d949c0f25ef998ab963293b9dca39892aac (patch)
tree38c1c85d414dcc954f96ef234a9ffe5eccc33bce
parentaed232b9ddaa884cd0a67b36ba156f5eb90db889 (diff)
downloadpodman-745f6d949c0f25ef998ab963293b9dca39892aac.tar.gz
podman-745f6d949c0f25ef998ab963293b9dca39892aac.tar.bz2
podman-745f6d949c0f25ef998ab963293b9dca39892aac.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 6b97c4162..20ed72c59 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,