summaryrefslogtreecommitdiffstats
path: root/.semaphore
diff options
context:
space:
mode:
authorLuca Boccassi <bluca@debian.org>2024-03-09 13:42:32 +0100
committerLuca Boccassi <bluca@debian.org>2024-03-09 13:42:32 +0100
commit8b7485c505f1e7a55896069224109adaf10c16b9 (patch)
tree9fc268dbba3fffca71ff398eb132914100fb9ddf /.semaphore
parentcore/exec-invoke: Fix missing arguments for PR_SET_MEMORY_MERGE call (diff)
downloadsystemd-8b7485c505f1e7a55896069224109adaf10c16b9.tar.xz
systemd-8b7485c505f1e7a55896069224109adaf10c16b9.zip
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
Diffstat (limited to '.semaphore')
-rwxr-xr-x.semaphore/semaphore-runner.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/.semaphore/semaphore-runner.sh b/.semaphore/semaphore-runner.sh
index 06e3e725b4..eb2b56078b 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
;;