diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-07 13:02:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-07 13:02:02 -0400 |
| commit | ce93ab354234c989c52bdbf87166e117e7c97fce (patch) | |
| tree | 5cd6445f92921c7015fbe0b9663983165bd58db3 /test/system | |
| parent | a7500e54a4646c7db477349e2530ac13df77b8fa (diff) | |
| parent | ccc5bc167fa2c140e33963bb5cce99f40ff00281 (diff) | |
| download | podman-ce93ab354234c989c52bdbf87166e117e7c97fce.tar.gz podman-ce93ab354234c989c52bdbf87166e117e7c97fce.tar.bz2 podman-ce93ab354234c989c52bdbf87166e117e7c97fce.zip | |
Merge pull request #7845 from rhatdan/remote
Attempt to turn on some more remote tests
Diffstat (limited to 'test/system')
| -rw-r--r-- | test/system/070-build.bats | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/test/system/070-build.bats b/test/system/070-build.bats index 1329c6168..287323bbf 100644 --- a/test/system/070-build.bats +++ b/test/system/070-build.bats @@ -174,12 +174,19 @@ EOF run_podman build -t build_test -f build-test/Containerfile build-test local iid="${lines[-1]}" + + if is_remote; then + ENVHOST="" + else + ENVHOST="--env-host" + fi + # Run without args - should run the above script. Verify its output. export MYENV2="$s_env2" export MYENV3="env-file-should-override-env-host!" run_podman run --rm \ --env-file=$PODMAN_TMPDIR/env-file \ - --env-host \ + ${ENVHOST} \ -e MYENV4="$s_env4" \ build_test is "${lines[0]}" "$workdir" "container default command: pwd" |