X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=pipelines%2Fimages%2Fdistrobuild.sh;h=150018248e4919ffe3f4471c6488cae854a039fc;hb=a2e5135c912e93466a64aa9bb0a91a29f83477be;hp=a4e6a6c30737a8d69e921cb59c8f199bcbd9205c;hpb=2b68ab06e47e324d5212925bc5055b6c9627e9ee;p=lttng-ci.git

diff --git a/pipelines/images/distrobuild.sh b/pipelines/images/distrobuild.sh
index a4e6a6c..1500182 100644
--- a/pipelines/images/distrobuild.sh
+++ b/pipelines/images/distrobuild.sh
@@ -52,7 +52,7 @@ if [[ ! "${MISSING_VARS}" == "0" ]] ; then
 fi
 
 # Optional variables
-INSTANCE_START_TIMEOUT="${INSTANCE_START_TIMEOUT:-30}"
+INSTANCE_START_TIMEOUT="${INSTANCE_START_TIMEOUT:-60}"
 VM_ARG=()
 
 # Install lxd-client
@@ -129,6 +129,16 @@ if [[ "${IMAGE_FILE}" == "" ]] ; then
     fail 1 "Unable to find image file for '${OS}' in ${IMAGE_DIRS[@]}"
 fi
 
+if grep -q -E 'XX[A-Za-z0-9_]+XX' "${IMAGE_FILE}" ; then
+    while read -r VAR ; do
+        echo "${VAR}"
+        SHELLVAR=$(echo "${VAR}" | sed 's/^XX//g' | sed 's/XX$//g')
+        set +x
+        sed -i "s/${VAR}/${!SHELLVAR:-VARIABLENOTFOUND}/g" "${IMAGE_FILE}"
+        set -x
+    done < <(grep -E -o 'XX[A-Za-z0-9_]+XX' "${IMAGE_FILE}")
+fi
+
 DISTROBUILDER_ARGS=(
     distrobuilder
     build-incus