diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-05-02 17:01:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-02 17:01:47 +0200 |
| commit | 8a1d7c2fda4a83cc256c7b6d106b0118d8339653 (patch) | |
| tree | 54379f2b1d608f7f42b26a37d668455b83c50805 /contrib/cirrus/integration_test.sh | |
| parent | 6c69fe104477dba113e0e4b6efaca344c5f802bc (diff) | |
| parent | 295c531ecec8661408f01ac4e015d75fec865376 (diff) | |
| download | podman-8a1d7c2fda4a83cc256c7b6d106b0118d8339653.tar.gz podman-8a1d7c2fda4a83cc256c7b6d106b0118d8339653.tar.bz2 podman-8a1d7c2fda4a83cc256c7b6d106b0118d8339653.zip | |
Merge pull request #3053 from edsantiago/fix_req_env_var
cirrus lib.sh: refactor req_env_var()
Diffstat (limited to 'contrib/cirrus/integration_test.sh')
| -rwxr-xr-x | contrib/cirrus/integration_test.sh | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/contrib/cirrus/integration_test.sh b/contrib/cirrus/integration_test.sh index 95387ff49..71223803c 100755 --- a/contrib/cirrus/integration_test.sh +++ b/contrib/cirrus/integration_test.sh @@ -3,13 +3,7 @@ set -e source $(dirname $0)/lib.sh -req_env_var " -GOSRC $GOSRC -SCRIPT_BASE $SCRIPT_BASE -OS_RELEASE_ID $OS_RELEASE_ID -OS_RELEASE_VER $OS_RELEASE_VER -CONTAINER_RUNTIME $CONTAINER_RUNTIME -" +req_env_var GOSRC SCRIPT_BASE OS_RELEASE_ID OS_RELEASE_VER CONTAINER_RUNTIME exit_handler() { set +ex @@ -39,7 +33,7 @@ then exit $? elif [[ "$SPECIALMODE" == "rootless" ]] then - req_env_var "ROOTLESS_USER $ROOTLESS_USER" + req_env_var ROOTLESS_USER set -x ssh $ROOTLESS_USER@localhost \ -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o CheckHostIP=no \ |