summaryrefslogtreecommitdiffstats
path: root/bin/lvc.sh
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2016-07-18 13:58:12 +0200
committerHolger Levsen <holger@layer-acht.org>2016-07-18 19:59:17 +0200
commitf7e88d07551f9c1c71ca72d8653e68cde1dbe883 (patch)
tree48b8a30bac8953cbad0f6eb4e78aed6b61a2cd4d /bin/lvc.sh
parent7e8292ff4b05ad1e3b29268a816b4f2abed667d5 (diff)
downloadjenkins.debian.net-f7e88d07551f9c1c71ca72d8653e68cde1dbe883.tar.xz
d-i: inject variables for later triggers
Signed-off-by: Holger Levsen <holger@layer-acht.org>
Diffstat (limited to 'bin/lvc.sh')
-rwxr-xr-xbin/lvc.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/lvc.sh b/bin/lvc.sh
index fdb88f9d..3b26c907 100755
--- a/bin/lvc.sh
+++ b/bin/lvc.sh
@@ -18,9 +18,9 @@ replace_origin_pu() {
echo "${PREFIX}pu_${BRANCH#origin/pu/}"
}
-# if $URL is set to "use_PU_GIT_BRANCH" then use the contents of $PU_GIT_BRANCH to work out the locally built ISO name
-if [ "use_PU_GIT_BRANCH" = "$URL" ] ; then
- if PU_ISO="$(replace_origin_pu "/srv/d-i/isos/mini-gtk-" $PU_GIT_BRANCH).iso" ; then
+# if $URL is set to "use_TRIGGERING_BRANCH" then use the contents of $TRIGGERING_BRANCH to work out the locally built ISO name
+if [ "use_TRIGGERING_BRANCH" = "$URL" ] ; then
+ if PU_ISO="$(replace_origin_pu "/srv/d-i/isos/mini-gtk-" $TRIGGERING_BRANCH).iso" ; then
[ -f "$PU_ISO" ] || {
echo "looks like we're meant to be testing '$PU_ISO', but it's missing"
exit 1
@@ -28,7 +28,7 @@ if [ "use_PU_GIT_BRANCH" = "$URL" ] ; then
URL=$PU_ISO
echo "using locally built ISO image: URL='$URL'"
else
- echo "URL='$URL' but PU_GIT_BRANCH='$PU_GIT_BRANCH' -- aborting"
+ echo "URL='$URL' but TRIGGERING_BRANCH='$TRIGGERING_BRANCH' -- aborting"
exit 1
fi
fi