summaryrefslogtreecommitdiff
path: root/contrib/cirrus/rootless_test.sh
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-05-21 22:08:00 +0200
committerGitHub <noreply@github.com>2019-05-21 22:08:00 +0200
commit8f43d08d966b9519011cb8ca86e2db9f1f18dfcb (patch)
treee436080eb7b9659b71e03df367d1ea87cfac8c76 /contrib/cirrus/rootless_test.sh
parentcec56b0075eeec6a8cdfba3138dec32fdcd36b47 (diff)
parentbd0ac639bf1100c268d436bd44032b8fa46b9cc6 (diff)
downloadpodman-8f43d08d966b9519011cb8ca86e2db9f1f18dfcb.tar.gz
podman-8f43d08d966b9519011cb8ca86e2db9f1f18dfcb.tar.bz2
podman-8f43d08d966b9519011cb8ca86e2db9f1f18dfcb.zip
Merge pull request #2561 from cevich/cirrus_test_images
Cirrus: Support testing of VM cache-image changes
Diffstat (limited to 'contrib/cirrus/rootless_test.sh')
-rwxr-xr-xcontrib/cirrus/rootless_test.sh12
1 files changed, 8 insertions, 4 deletions
diff --git a/contrib/cirrus/rootless_test.sh b/contrib/cirrus/rootless_test.sh
index eab06bac0..3b668034b 100755
--- a/contrib/cirrus/rootless_test.sh
+++ b/contrib/cirrus/rootless_test.sh
@@ -1,22 +1,26 @@
#!/bin/bash
set -e
-source $HOME/.bash_profile
-cd $GOSRC
source $(dirname $0)/lib.sh
-req_env_var GOSRC OS_RELEASE_ID OS_RELEASE_VER
-
if [[ "$UID" == "0" ]]
then
echo "Error: Expected to be running as a regular user"
exit 1
fi
+# Ensure environment setup correctly
+req_env_var GOSRC ROOTLESS_USER
+
echo "."
echo "Hello, my name is $USER and I live in $PWD can I be your friend?"
+echo "."
+
+export PODMAN_VARLINK_ADDRESS=unix:/tmp/podman-$(id -u)
+show_env_vars
+set -x
cd "$GOSRC"
make
make varlink_generate