From 8b7485c505f1e7a55896069224109adaf10c16b9 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 9 Mar 2024 12:42:32 +0000 Subject: [PATCH 1/2] semaphore: move back to autopkgtest master branch Instead of fixing the commit, we can workaround the adduser issue by simply creating a user manually beforehand, which means the broken codepath in autopkgtest is not taken. We can remove it once it's fixed upstream, which is in progress: https://salsa.debian.org/ci-team/autopkgtest/-/merge_requests/297 --- .semaphore/semaphore-runner.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.semaphore/semaphore-runner.sh b/.semaphore/semaphore-runner.sh index 06e3e725b46..eb2b56078bf 100755 --- a/.semaphore/semaphore-runner.sh +++ b/.semaphore/semaphore-runner.sh @@ -50,6 +50,8 @@ apt-get install -y -t $RELEASE-backports debhelper libcurl4-openssl-dev libarchi apt-get purge --auto-remove -y unattended-upgrades systemctl unmask systemd-networkd systemctl enable systemd-networkd +# Remove once https://salsa.debian.org/ci-team/autopkgtest/-/merge_requests/297 is sorted +adduser --disabled-login --gecos 'Temporary autopkgtest user,,,' autopkgtest EOF sudo lxc-stop -n "$CONTAINER" } @@ -66,7 +68,7 @@ for phase in "${PHASES[@]}"; do sudo apt-get install -y -t "$UBUNTU_RELEASE-backports" lxc sudo apt-get install -y python3-debian git dpkg-dev fakeroot python3-jinja2 - [ -d "$AUTOPKGTEST_DIR" ] || git clone --quiet --branch=debian/5.32 --depth=1 https://salsa.debian.org/ci-team/autopkgtest.git "$AUTOPKGTEST_DIR" + [ -d "$AUTOPKGTEST_DIR" ] || git clone --quiet --depth=1 https://salsa.debian.org/ci-team/autopkgtest.git "$AUTOPKGTEST_DIR" create_container ;; From b028cd3bd875603a9fd8fa7511d71835cb68bb29 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 9 Mar 2024 12:43:36 +0000 Subject: [PATCH 2/2] semaphore: drop some manual build deps, handled by package The package now pulls in more dependencies, so can drop some. Also we don't need libarchive-dev and libcurl4-openssl-dev from backports. --- .semaphore/semaphore-runner.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.semaphore/semaphore-runner.sh b/.semaphore/semaphore-runner.sh index eb2b56078bf..b83ba45bf31 100755 --- a/.semaphore/semaphore-runner.sh +++ b/.semaphore/semaphore-runner.sh @@ -44,9 +44,9 @@ apt-get -q --allow-releaseinfo-change update apt-get -y dist-upgrade apt-get install -y eatmydata # The following four are needed as long as these deps are not covered by Debian's own packaging -apt-get install -y fdisk tree libfdisk-dev libp11-kit-dev libssl-dev libpwquality-dev rpm +apt-get install -y tree libpwquality-dev rpm libcurl4-openssl-dev libarchive-dev # autopkgtest doesn't consider backports -apt-get install -y -t $RELEASE-backports debhelper libcurl4-openssl-dev libarchive-dev +apt-get install -y -t $RELEASE-backports debhelper apt-get purge --auto-remove -y unattended-upgrades systemctl unmask systemd-networkd systemctl enable systemd-networkd