Skip to content

Commit 9642f72

Browse files
committed
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 (cherry picked from commit 8b7485c) (cherry picked from commit 4f4cd7c) (cherry picked from commit 9b47039)
1 parent d737ef1 commit 9642f72

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

.semaphore/semaphore-runner.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ apt-get install -y fdisk tree libfdisk-dev libp11-kit-dev libssl-dev libpwqualit
4848
apt-get purge --auto-remove -y unattended-upgrades
4949
systemctl unmask systemd-networkd
5050
systemctl enable systemd-networkd
51+
# Remove once https://salsa.debian.org/ci-team/autopkgtest/-/merge_requests/297 is sorted
52+
adduser --disabled-login --gecos 'Temporary autopkgtest user,,,' autopkgtest
5153
EOF
5254
sudo lxc-stop -n "$CONTAINER"
5355
}
@@ -64,7 +66,7 @@ for phase in "${PHASES[@]}"; do
6466
sudo apt-get install -y -t "$UBUNTU_RELEASE-backports" lxc
6567
sudo apt-get install -y python3-debian git dpkg-dev fakeroot python3-jinja2
6668

67-
[ -d "$AUTOPKGTEST_DIR" ] || git clone --quiet --branch=debian/5.32 --depth=1 https://salsa.debian.org/ci-team/autopkgtest.git "$AUTOPKGTEST_DIR"
69+
[ -d "$AUTOPKGTEST_DIR" ] || git clone --quiet --depth=1 https://salsa.debian.org/ci-team/autopkgtest.git "$AUTOPKGTEST_DIR"
6870

6971
create_container
7072
;;

0 commit comments

Comments
 (0)