Merge ~mwhudson/autopkgtest/+git/development:pin-all-arches into ~ubuntu-release/autopkgtest/+git/development:master

[Michael Hudson-Doyle]

pin packages from any architecture

If a test is triggered by src:glibc, we want it to be able to install
libc6:i386.

I don't know if there is some reason this is a bad idea but it fixes the issue I was complaining about in https://lists.ubuntu.com/archives/ubuntu-release/2022-March/005333.html (and much more easily than I feared).

[Julian Andres Klode (juliank)]

Ah, are you saying we are not cross-testing, but testing amd64 packages that pull in i386 ones, and hence the cross-arch code did not work?

I don't really see much of an issue with that. It will lead to pinning packages that might not exist, but apt won't error out in such a case, and it was the case before as well I guess.

review: Approve

[Julian Andres Klode (juliank)]

But this needs a rebase as it has a spurious instance serialization commit in it that was reverted in a rebase.

review: Disapprove

[Julian Andres Klode (juliank)]

I cherry-picked and merged the new commit, but can't set the request to merged (no button in launchpad).

diff --git a/lib/adt_testbed.py b/lib/adt_testbed.py
index a3d6564..c0cbaad 100644
--- a/lib/adt_testbed.py
+++ b/lib/adt_testbed.py
@@ -1352,14 +1352,9 @@ Description: satisfy autopkgtest test dependencies
         # translate src:name entries into binaries of that source
         if srcpkgs:
             script += 'PKGS="$PKGS $(apt-cache showsrc %s | ' \
-                '''awk '/^Package-List:/ { show=1; next } (/^ / && show==1) { print $1; next } { show=0 }' |''' \
+                '''awk '/^Package-List:/ { show=1; next } (/^ / && show==1) { print $1 ":*"; next } { show=0 }' |''' \
                 '''sort -u | tr '\\n' ' ')"; ''' % \
                 ' '.join(srcpkgs)
-            if self.cross_arch:
-                script += 'PKGS="$PKGS $(apt-cache showsrc %s | ' \
-                    '''awk '/^Package-List:/ { show=1; next } (/^ / && show==1) { print $1 ":%s"; next } { show=0 }' |''' \
-                    '''sort -u | tr '\\n' ' ')"; ''' % \
-                    (' '.join(srcpkgs), self.cross_arch)
 
         # prefer given packages from series, but make sure that other packages
         # are taken from default release as much as possible
diff --git a/ssh-setup/nova b/ssh-setup/nova
index 4d1ac51..e606828 100755
--- a/ssh-setup/nova
+++ b/ssh-setup/nova
@@ -271,7 +271,8 @@ EOF
     while true; do
         retry=$((retry+1))
         set +e
-        OUT=$(nova --debug boot --flavor $FLAVOR --key-name $KEYNAME --user-data $userdata \
+        OUT=$(flock -x -w 3600 /home/ubuntu/$OS_REGION_NAME.boot.lock
+              nova --debug boot --flavor $FLAVOR --key-name $KEYNAME --user-data $userdata \
             --image "$imageuuid" $EXTRA_OPTS --poll $SRVNAME 2>&1)
         rc=$?
         set -e