Merge ~smoser/curtin:cleanup/curtainer-get-source-by-version into curtin:master

[Scott Moser]

tools: fix curtainer to specify source version to apt-get source.

We were seeing version skew from the binary package to the source
package, and had recently added code to exit failure if we saw
that case.

This change will make curtainer explicitly request the version
of source that it has the binary for. It is possible that the
ppa would not have that version (if it had been supersceeded),
but hopefully the archive holds onto source for current binary
packages.

see commit message

[Ryan Harper (raharper)]

That's a good fix for the race.

review: Approve

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:fb11a5640f502ce5375d6c5e46b8d654f1e909b6
https://jenkins.ubuntu.com/server/job/curtin-ci/825/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/825
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/825
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/825
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/825

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/825/rebuild

review: Approve (continuous-integration)

diff --git a/tools/curtainer b/tools/curtainer
index 525a998..6c0628f 100755
--- a/tools/curtainer
+++ b/tools/curtainer
@@ -3,7 +3,7 @@
 
 set -o pipefail
 
-VERBOSITY=0
+VERBOSITY=1
 CONTAINER=""
 
 error() { echo "$@" 1>&2; }
@@ -171,17 +171,19 @@ main() {
 
     if [ "${getsource}" != "none" ]; then
         local isrcd="/tmp/curtin-source"
-        debug 1 "getting source for curtin to $getsource"
+        debug 1 "getting source for curtin at $pkg_ver to $getsource"
         inside "$name" $eatmydata sh -ec '
             target="$1"
+            pkg="$2"
+            ver="$3"
             d=$(mktemp -d)
             cd "$d"
-            apt-get source curtin
+            apt-get source "${pkg}${ver:+=${ver}}"
             for x in *; do [ -d "$x" ] && break; done
             [ -d "$x" ] || { echo no source dir found.; exit 1; }
             cp -a $x "$target"
             rm -Rf "$d"
-            ' -- "$isrcd"
+            ' -- "$isrcd" "curtin" "$pkg_ver"
         mkdir "$getsource" || fail "failed to create dir '$getsource'"
         inside "$name" tar -C "$isrcd" -cf - . |
             tar -C "$getsource" -xf - ||