Merge ~saviq/jenkaas-jobs:early-release into jenkaas-jobs:master

[Michał Sawicz]

[Olivier Tilloy (osomon)]

This looks okay to me. Not sure about the "-i" parameter to ln, though.

[Olivier Tilloy (osomon)]

LGTM!

review: Approve

diff --git a/jenkaas_jobs/yaml/prepare/prepare-2-chroots.sh b/jenkaas_jobs/yaml/prepare/prepare-2-chroots.sh
index 43852f1..0b4f02d 100644
--- a/jenkaas_jobs/yaml/prepare/prepare-2-chroots.sh
+++ b/jenkaas_jobs/yaml/prepare/prepare-2-chroots.sh
@@ -30,6 +30,13 @@ if [ ! -e /etc/schroot/chroot.d/sbuild-${{NAME}} ]; then
   # remove any stale chroots
   sudo rm -Rf /var/lib/schroot/chroots/${{NAME}}
 
+  # link gutsy to the passed release, in case it doesn't know it yet
+  if [ ! -r /usr/share/debootstrap/scripts/${{release%%+*}} ]; then
+    pushd /usr/share/debootstrap/scripts
+    sudo ln -vs gutsy ${{release%%+*}}
+    popd
+  fi
+
   # build the chroot
   mk-sbuild --name=${{release}} ${{ARGS}} ${{release%%+*}}
 
diff --git a/tests/fixtures/prepare/prepare-2-chroots.xml b/tests/fixtures/prepare/prepare-2-chroots.xml
index 1252ced..5e43922 100644
--- a/tests/fixtures/prepare/prepare-2-chroots.xml
+++ b/tests/fixtures/prepare/prepare-2-chroots.xml
@@ -92,6 +92,13 @@ if [ ! -e /etc/schroot/chroot.d/sbuild-${NAME} ]; then
   # remove any stale chroots
   sudo rm -Rf /var/lib/schroot/chroots/${NAME}
 
+  # link gutsy to the passed release, in case it doesn't know it yet
+  if [ ! -r /usr/share/debootstrap/scripts/${release%%+*} ]; then
+    pushd /usr/share/debootstrap/scripts
+    sudo ln -vs gutsy ${release%%+*}
+    popd
+  fi
+
   # build the chroot
   mk-sbuild --name=${release} ${ARGS} ${release%%+*}