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