diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-01 03:37:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-01 03:37:15 +0200 |
| commit | 2068919e9bfcc8c45a8f73fa89a197f1923afa3f (patch) | |
| tree | 8b47c2ceaa346fd42397fb52ec02dc4dab97a6ef /contrib/cirrus/rootless_test.sh | |
| parent | 503ed5fe0319c6a673f3ad43b00aacf2199bcf74 (diff) | |
| parent | d1c44ea8560c59d843f8550005050a5e09e2b062 (diff) | |
| download | podman-2068919e9bfcc8c45a8f73fa89a197f1923afa3f.tar.gz podman-2068919e9bfcc8c45a8f73fa89a197f1923afa3f.tar.bz2 podman-2068919e9bfcc8c45a8f73fa89a197f1923afa3f.zip | |
Merge pull request #3236 from baude/testsplitrootless
split rootless local and remote testing
Diffstat (limited to 'contrib/cirrus/rootless_test.sh')
| -rwxr-xr-x | contrib/cirrus/rootless_test.sh | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/contrib/cirrus/rootless_test.sh b/contrib/cirrus/rootless_test.sh index 3b668034b..ef0d05cfd 100755 --- a/contrib/cirrus/rootless_test.sh +++ b/contrib/cirrus/rootless_test.sh @@ -2,6 +2,14 @@ set -e +remote=0 + +# The TEST_REMOTE_CLIENT environment variable decides whether +# to test varlinke +if [[ "$TEST_REMOTE_CLIENT" == "true" ]]; then + remote=1 +fi + source $(dirname $0)/lib.sh if [[ "$UID" == "0" ]] @@ -25,5 +33,8 @@ cd "$GOSRC" make make varlink_generate make test-binaries -make ginkgo -make ginkgo-remote +if [ $remote -eq 0 ]; then + make ginkgo +else + make ginkgo-remote +fi |