diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-02-21 08:05:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-21 08:05:38 -0500 |
| commit | d224a0f8ac4978c3ac399a0940f785892d63daa8 (patch) | |
| tree | edbac426dffcba771617b21bc390fb61675cba31 /test/system/helpers.bash | |
| parent | a88ea2c68b1ef01077a53b1c568b85667dcbc1e2 (diff) | |
| parent | db4d15e852c574a2f2f4039cfef4814982776544 (diff) | |
| download | podman-d224a0f8ac4978c3ac399a0940f785892d63daa8.tar.gz podman-d224a0f8ac4978c3ac399a0940f785892d63daa8.tar.bz2 podman-d224a0f8ac4978c3ac399a0940f785892d63daa8.zip | |
Merge pull request #12918 from dgibson/propagate-conf-env
Propagate CONTAINERS_CONF to conmon
Diffstat (limited to 'test/system/helpers.bash')
| -rw-r--r-- | test/system/helpers.bash | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/test/system/helpers.bash b/test/system/helpers.bash index c622a5172..ee5f73867 100644 --- a/test/system/helpers.bash +++ b/test/system/helpers.bash @@ -37,9 +37,6 @@ fi # while retaining the ability to include these if they so desire. # Some CI systems set this to runc, overriding the default crun. -# Although it would be more elegant to override options in run_podman(), -# we instead override $PODMAN itself because some tests (170-run-userns) -# have to invoke $PODMAN directly. if [[ -n $OCI_RUNTIME ]]; then if [[ -z $CONTAINERS_CONF ]]; then # FIXME: BATS provides no mechanism for end-of-run cleanup[1]; how |