summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2021-01-25 16:41:42 -0500
committerDaniel J Walsh <dwalsh@redhat.com>2021-01-25 17:54:43 -0500
commit97f5e9458c8d618989e5ff386620bfee35942df3 (patch)
treec0869382db971ef17d8942b7dee5f51aee754dca /test
parent6ba8819d336ed3514b57c5818123ddfac80555ef (diff)
downloadpodman-97f5e9458c8d618989e5ff386620bfee35942df3.tar.gz
podman-97f5e9458c8d618989e5ff386620bfee35942df3.tar.bz2
podman-97f5e9458c8d618989e5ff386620bfee35942df3.zip
Pass DefaultMountsFile to podman build
The --default-mounts-file path was not being handled in podman build. This will enable it to use for testing. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'test')
-rw-r--r--test/e2e/run_test.go2
-rw-r--r--test/system/070-build.bats6
2 files changed, 3 insertions, 5 deletions
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go
index 19060ecdc..caeaf190e 100644
--- a/test/e2e/run_test.go
+++ b/test/e2e/run_test.go
@@ -669,7 +669,7 @@ USER bin`
})
It("podman run with secrets", func() {
- SkipIfRemote("--default-mount-file option is not supported in podman-remote")
+ SkipIfRemote("--default-mounts-file option is not supported in podman-remote")
containersDir := filepath.Join(podmanTest.TempDir, "containers")
err := os.MkdirAll(containersDir, 0755)
Expect(err).To(BeNil())
diff --git a/test/system/070-build.bats b/test/system/070-build.bats
index 9e5e3ee1d..05518d8fc 100644
--- a/test/system/070-build.bats
+++ b/test/system/070-build.bats
@@ -188,8 +188,7 @@ ADD mycmd /bin/mydefaultcmd
RUN chmod 755 /bin/mydefaultcmd
RUN chown 2:3 /bin/mydefaultcmd
-#FIXME FIXME FIXME: enable if/when 'podman build' passes mounts.conf to buildah
-#RUN $CAT_SECRET
+RUN $CAT_SECRET
CMD ["/bin/mydefaultcmd","$s_echo"]
EOF
@@ -201,8 +200,7 @@ EOF
local iid="${lines[-1]}"
# Make sure 'podman build' had the secret mounted
- #FIXME FIXME: enable if/when 'podman build' passes mounts.conf to buildah
- #is "$output" ".*$secret_contents.*" "podman build has /run/secrets mounted"
+ is "$output" ".*$secret_contents.*" "podman build has /run/secrets mounted"
if is_remote; then
ENVHOST=""