Merge ~smoser/curtin:fix/1747077-curtainer-check-versions into curtin:master

[Scott Moser]

tools/curtainer: check that binary and source version are the same.

We saw a puzzling failure of vmtest against the daily archive.
The reason for failure was that the source package that was retrieved
via 'apt-get source' differed in version from the version installed.

This adds a check in curtainer that will exit failure if that is the case.

LP: #1747077

see commit message

[Ryan Harper (raharper)]

This looks perfect.

review: Approve

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

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

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

review: Approve (continuous-integration)

diff --git a/tools/curtainer b/tools/curtainer
index 618981d..3aa71df 100755
--- a/tools/curtainer
+++ b/tools/curtainer
@@ -164,6 +164,10 @@ main() {
     inside "$name" $eatmydata apt-get -q update ||
         fail "failed apt-get update"
     install "$name" $pkgs || fail "failed install of $pkgs"
+    local pkg_ver="" src_ver=""
+    pkg_ver=$(inside "$name" \
+        dpkg-query --show --showformat='${Version}\n' curtin)
+    debug 1 "installed curtin at $pkg_ver"
 
     if [ "${getsource}" != "none" ]; then
         local isrcd="/tmp/curtin-source"
@@ -182,11 +186,14 @@ main() {
         inside "$name" tar -C "$isrcd" -cf - . |
             tar -C "$getsource" -xf - ||
             fail "failed to copy source out to $getsource"
-        version=$(inside "$name" dpkg-parsechangelog \
+        src_ver=$(inside "$name" dpkg-parsechangelog \
             "--file=$isrcd/debian/changelog" "--show-field=version")
+        if [ "$src_ver" != "$pkg_ver" ]; then
+            fail "source version ($src_ver) != package version ($pkg_ver)"
+        fi
         inside "$name" rm -Rf "$isrcd" ||
             fail "failed removal of extract dir"
-        debug 1 "put source for curtin at $version in $getsource"
+        debug 1 "put source for curtin at $src_ver in $getsource"
     fi
 
     CONTAINER=""