summaryrefslogtreecommitdiff
path: root/contrib/cirrus/lib.sh
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2019-03-06 11:47:24 -0500
committerChris Evich <cevich@redhat.com>2019-05-21 08:44:01 -0400
commit191a08ae43fcb2b846e6118073f852e4eb875d5d (patch)
treefa56a5e08a17ed8cc3a43b282ed19b2e5ed82825 /contrib/cirrus/lib.sh
parent84c6f7c55da4a1f4d6968c5f8bd8a8553ab5d55e (diff)
downloadpodman-191a08ae43fcb2b846e6118073f852e4eb875d5d.tar.gz
podman-191a08ae43fcb2b846e6118073f852e4eb875d5d.tar.bz2
podman-191a08ae43fcb2b846e6118073f852e4eb875d5d.zip
Cirrus: Support testing of VM cache-image changes
Previously, it was quite difficult to affect changes to VM cache images without lots of manual work. This commit adds a new optional testing task which mirrors the official-image build task which only runs on master. In contrast, the new task may be run at any time in a PR, but including a magic phrase in the PR description. Update documentation to describe the new task and inform on it's usage. Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus/lib.sh')
-rw-r--r--contrib/cirrus/lib.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh
index a285b133b..565646c12 100644
--- a/contrib/cirrus/lib.sh
+++ b/contrib/cirrus/lib.sh
@@ -19,6 +19,9 @@ CIRRUS_BASE_SHA=${CIRRUS_BASE_SHA:-HEAD}
CIRRUS_CHANGE_IN_REPO=${CIRRUS_CHANGE_IN_REPO:-FETCH_HEAD}
SPECIALMODE="${SPECIALMODE:-none}"
export CONTAINER_RUNTIME=${CONTAINER_RUNTIME:-podman}
+ROOTLESS_USER="${ROOTLESS_USER:-}"
+ROOTLESS_UID="${ROOTLESS_UID:-}"
+ROOTLESS_GID="${ROOTLESS_GID:-}"
if ! [[ "$PATH" =~ "/usr/local/bin" ]]
then
@@ -200,7 +203,7 @@ setup_rootless() {
su --login --command 'go env' $ROOTLESS_USER | \
while read envline
do
- X=$(echo "export $envline" | tee -a "/home/$ROOTLESS_USER/$ENVLIB") && echo "$X"
+ X=$(echo "export $envline" | tee -a "/home/$ROOTLESS_USER/.bash_profile") && echo "$X"
done
}