diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-10 16:27:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-10 16:27:04 -0400 |
| commit | f24538b85e9c81be3cb1f4990bd3613986621746 (patch) | |
| tree | a7474cd334dffb26fee0da049c0ad101ab48be95 /contrib/cirrus/lib.sh | |
| parent | b20f44f073c1d501de499ec778a528f39edc1f5c (diff) | |
| parent | 49fa3e73997815874a6314ebb7177f878d6839b1 (diff) | |
| download | podman-f24538b85e9c81be3cb1f4990bd3613986621746.tar.gz podman-f24538b85e9c81be3cb1f4990bd3613986621746.tar.bz2 podman-f24538b85e9c81be3cb1f4990bd3613986621746.zip | |
Merge pull request #7244 from rhatdan/test
Remove TEST_ from TEST_REMOTE_*
Diffstat (limited to 'contrib/cirrus/lib.sh')
| -rw-r--r-- | contrib/cirrus/lib.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index d2af4d883..968b2de39 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -96,12 +96,12 @@ LILTO="timeout_attempt_delay_command 120s 5 30s" BIGTO="timeout_attempt_delay_command 300s 5 60s" # Safe env. vars. to transfer from root -> $ROOTLESS_USER (go env handled separately) -ROOTLESS_ENV_RE='(CIRRUS_.+)|(ROOTLESS_.+)|(.+_IMAGE.*)|(.+_BASE)|(.*DIRPATH)|(.*FILEPATH)|(SOURCE.*)|(DEPEND.*)|(.+_DEPS_.+)|(OS_REL.*)|(.+_ENV_RE)|(TRAVIS)|(CI.+)|(TEST_REMOTE.*)' +ROOTLESS_ENV_RE='(CIRRUS_.+)|(ROOTLESS_.+)|(.+_IMAGE.*)|(.+_BASE)|(.*DIRPATH)|(.*FILEPATH)|(SOURCE.*)|(DEPEND.*)|(.+_DEPS_.+)|(OS_REL.*)|(.+_ENV_RE)|(TRAVIS)|(CI.+)|(REMOTE.*)' # Unsafe env. vars for display SECRET_ENV_RE='(IRCID)|(ACCOUNT)|(GC[EP]..+)|(SSH)' SPECIALMODE="${SPECIALMODE:-none}" -TEST_REMOTE_CLIENT="${TEST_REMOTE_CLIENT:-false}" +RCLI="${RCLI:-false}" export CONTAINER_RUNTIME=${CONTAINER_RUNTIME:-podman} # When running as root, this may be empty or not, as a user, it MUST be set. |