From a3848e2a71eb8b448607edb4e606445e28b3d2a7 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Wed, 28 Oct 2026 11:12:42 +0000 Subject: [PATCH] ci: use autopkgtest from ubuntu-backports in semaphore jobs noble has a new enough autopkgtest, so use that instead of cloning from git, as there are often transient regressions, and salsa availability is also spotty (cherry picked from commit 0d033931a4d6b6d96e4d5148775704e294a822f1) (cherry picked from commit 681791eb569aaadf2c97c56b6d6604db1a19fea3) --- .semaphore/semaphore-runner.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.semaphore/semaphore-runner.sh b/.semaphore/semaphore-runner.sh index 83f55a2ae24..cfcddbbca38 100755 --- a/.semaphore/semaphore-runner.sh +++ b/.semaphore/semaphore-runner.sh @@ -12,7 +12,6 @@ ARCH="${ARCH:-amd64}" CONTAINER="${RELEASE}-${ARCH}" CACHE_DIR=/var/tmp TMPDIR=/var/tmp -AUTOPKGTEST_DIR="${CACHE_DIR}/autopkgtest" # semaphore cannot expose these, but useful for interactive/local runs ARTIFACTS_DIR=/tmp/artifacts # shellcheck disable=SC2206 @@ -76,14 +75,12 @@ for phase in "${PHASES[@]}"; do # remove chrome repo, we don't need it sudo rm -rf /etc/apt/sources.list.d/google-chrome.sources - # enable backports for latest LXC + # enable backports for latest LXC and autopkgtest echo "deb http://archive.ubuntu.com/ubuntu $UBUNTU_RELEASE-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/backports.list sudo apt-get -q update - sudo apt-get install -y -t "$UBUNTU_RELEASE-backports" lxc + sudo apt-get install -y -t "$UBUNTU_RELEASE-backports" lxc autopkgtest sudo apt-get install -y python3-debian git dpkg-dev fakeroot python3-jinja2 - [ -d "$AUTOPKGTEST_DIR" ] || git clone --quiet --depth=1 https://salsa.debian.org/ci-team/autopkgtest.git "$AUTOPKGTEST_DIR" - create_container ;; RUN) @@ -119,7 +116,7 @@ EOF # now build the package and run the tests rm -rf "$ARTIFACTS_DIR" # autopkgtest exits with 2 for "some tests skipped", accept that - sudo TMPDIR=/var/tmp "$AUTOPKGTEST_DIR/runner/autopkgtest" --env DEB_BUILD_OPTIONS="noudeb nostrip nodoc optimize=-lto" \ + sudo TMPDIR=/var/tmp autopkgtest --env DEB_BUILD_OPTIONS="noudeb nostrip nodoc optimize=-lto" \ --env DPKG_DEB_COMPRESSOR_TYPE="none" \ --env DEB_BUILD_PROFILES="pkg.systemd.upstream noudeb nodoc" \ --env TEST_UPSTREAM=1 \