shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-12 09:17:44 +03:00
Code

Merge pull request #22985 from bluca/semaphore

Browse Source 
Semaphore CI fixes
This commit is contained in:
Frantisek Sumsal 2022-04-06 10:27:17 +00:00 committed by GitHub
commit 467ba161af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.semaphore/semaphore-runner.sh
View File

@ -21,7 +21,7 @@ UBUNTU_RELEASE="$(lsb_release -cs)"
create_container() { create_container() {
# Create autopkgtest LXC image; this sometimes fails with "Unable to fetch # Create autopkgtest LXC image; this sometimes fails with "Unable to fetch
# GPG key from keyserver", so retry a few times with different keyservers. # GPG key from keyserver", so retry a few times with different keyservers.
for keyserver in "" "keys.gnupg.net" "keys.openpgp.org" "keyserver.ubuntu.com"; do for keyserver in "keys.openpgp.org" "" "keyserver.ubuntu.com" "keys.gnupg.net"; do
for retry in {1..5}; do for retry in {1..5}; do
sudo lxc-create -n "$CONTAINER" -t download -- -d "$DISTRO" -r "$RELEASE" -a "$ARCH" ${keyserver:+--keyserver "$keyserver"} && break 2 sudo lxc-create -n "$CONTAINER" -t download -- -d "$DISTRO" -r "$RELEASE" -a "$ARCH" ${keyserver:+--keyserver "$keyserver"} && break 2
sleep $((retry*retry)) sleep $((retry*retry))
@ -36,8 +36,16 @@ create_container() {
# enable source repositories so that apt-get build-dep works # enable source repositories so that apt-get build-dep works
sudo lxc-attach -n "$CONTAINER" -- sh -ex <<EOF sudo lxc-attach -n "$CONTAINER" -- sh -ex <<EOF
sed 's/^deb/deb-src/' /etc/apt/sources.list >> /etc/apt/sources.list.d/sources.list sed 's/^deb/deb-src/' /etc/apt/sources.list >> /etc/apt/sources.list.d/sources.list
# wait until online # We might attach the console too soon
while [ -z "\$(ip route list 0/0)" ]; do sleep 1; done while ! systemctl --quiet --wait is-system-running; do sleep 1; done
# Manpages database trigger takes a lot of time and is not useful in a CI
echo 'man-db man-db/auto-update boolean false' | debconf-set-selections
# Speed up dpkg, image is thrown away after the test
mkdir -p /etc/dpkg/dpkg.cfg.d/
echo 'force-unsafe-io' > /etc/dpkg/dpkg.cfg.d/unsafe_io
# For some reason, it is necessary to run this manually or the interface won't be configured
# Note that we avoid networkd, as some of the tests will break it later on
dhclient
apt-get -q --allow-releaseinfo-change update apt-get -q --allow-releaseinfo-change update
apt-get -y dist-upgrade apt-get -y dist-upgrade
apt-get install -y eatmydata apt-get install -y eatmydata
@ -88,6 +96,10 @@ EOF
rm -rf debian/patches rm -rf debian/patches
# disable autopkgtests which are not for upstream # disable autopkgtests which are not for upstream
sed -i '/# NOUPSTREAM/ q' debian/tests/control sed -i '/# NOUPSTREAM/ q' debian/tests/control
# TODO: rebooting via autopkgtest-reboot seems to be broken, disable these tests for now
sed -i -n '1,/Tests: boot-and-services/p;/Tests: udev/,$p' debian/tests/control
sed -i '/Tests: boot-and-services/d' debian/tests/control
sed -i '/Tests: boot-smoke/,$d' debian/tests/control
# enable more unit tests # enable more unit tests
sed -i '/^CONFFLAGS =/ s/=/= --werror -Dtests=unsafe -Dsplit-usr=true -Dslow-tests=true -Dfuzz-tests=true -Dman=true /' debian/rules sed -i '/^CONFFLAGS =/ s/=/= --werror -Dtests=unsafe -Dsplit-usr=true -Dslow-tests=true -Dfuzz-tests=true -Dman=true /' debian/rules
# no orig tarball # no orig tarball

2
.semaphore/semaphore.yml
View File

@ -7,7 +7,7 @@ name: Debian autopkgtest (LXC)
agent: agent:
machine: machine:
type: e1-standard-2 type: e1-standard-2
os_image: ubuntu1804 os_image: ubuntu2004
# Cancel any running or queued job for the same ref # Cancel any running or queued job for the same ref
auto_cancel: auto_cancel: