From: Ian Jackson Date: Sun, 2 Feb 2025 16:45:53 +0000 (+0000) Subject: autopkgtests: Use `isolation-machine` restriction X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=63fbb8437fbede4e4e802592d14677bd9685b369;p=hippotat.git 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 --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f8691eb..ffbbc27 100644 --- 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 922c568..1f6dcc4 100644 --- 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 c551021..105af05 100644 --- 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 51e6805..2b3b3bd 100644 --- 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