autopkgtests: Use `isolation-machine` restriction

Instead of `x-hippotat-adt-broken-in-debci`.  We think this may help,
with appropriate configuration in ci.d.n.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f8691ebed2f88638539d17555fbbd048be9a4c21..ffbbc272f9982b7024ab2aa8f1bb41774b52bf6f 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -137,4 +137,4 @@ minimal-versions-pinned:
 #    - apt-get -y -Pupstream-cargo build-dep .
 #    - apt-get -y install autopkgtest
 #    - DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -Pupstream-cargo -uc -us --build=full
-#    - autopkgtest --ignore-restrictions=x-hippotat-adt-broken-in-debci ../hippotat_*.changes --- null
+#    - autopkgtest --ignore-restrictions=isolation-machine ../hippotat_*.changes --- null

diff --git a/HACKING.md b/HACKING.md
index 922c568161f5adff6a625863dbeaeb39a74e5895..1f6dcc47bceb7aa00d6acef58a444bc0dd0fba09 100644 (file)
--- a/HACKING.md
+++ b/HACKING.md
@@ -13,5 +13,5 @@ NAILING_CARGO=nailing-cargo make check
 Using dependencies from Debian
 
 ```
-autopkgtest --ignore-restrictions=x-hippotat-adt-broken-in-debci . --- schroot build
+autopkgtest --ignore-restrictions=isolation-machine . --- schroot build
 ```

diff --git a/Makefile b/Makefile
index c55102161e41539cf43233b3051ee5ffd960893b..105af059426c5c3dc80c14b9324853ee64797681 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -101,7 +101,7 @@ very-clean: clean
 #   nailing-cargo -o audit
 #   git clean -xdff && NAILING_CARGO=nailing-cargo make check
 #   dgit -wgfa sbuild -c build -A
-#   autopkgtest --ignore-restrictions=x-hippotat-adt-broken-in-debci . --- schroot build
+#   autopkgtest --ignore-restrictions=isolation-machine . --- schroot build
 #
 # Update release notes in debian/changelog:
 #

diff --git a/debian/tests/control b/debian/tests/control
index 51e680533d28e729b6ac337dcd648f050d78e49d..2b3b3bdcf6ba3fcdf775bd590c45aafc8a2be9c5 100644 (file)
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -6,7 +6,7 @@ Depends:
   rsyslog, authbind, iptables,
   bash, iproute2, util-linux, iputils-ping, orphan-sysvinit-scripts,
   psmisc
-Restrictions: needs-root, allow-stderr, x-hippotat-adt-broken-in-debci
+Restrictions: needs-root, allow-stderr, isolation-machine
 
 Tests: adt-initscript
 Tests-Directory: adt
@@ -15,4 +15,4 @@ Depends:
   net-tools,
   rsyslog,
   bash, userv-utils, netcat-openbsd, curl
-Restrictions: needs-root, allow-stderr, x-hippotat-adt-broken-in-debci
+Restrictions: needs-root, allow-stderr, isolation-machine