From b2c900525a669abfd31908beef803863aa043f5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20M=C3=A4rdian?= Date: Wed, 28 Aug 2024 13:31:57 +0200 Subject: [PATCH] CI: cleanup after v1.1 release --- .github/workflows/autopkgtest.yml | 2 -- .github/workflows/network-manager.yml | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/autopkgtest.yml b/.github/workflows/autopkgtest.yml index a99c640f5..e1cbeca7f 100644 --- a/.github/workflows/autopkgtest.yml +++ b/.github/workflows/autopkgtest.yml @@ -48,8 +48,6 @@ jobs: cp -r netplan.io-*/debian . rm -r debian/patches/ # clear any distro patches sed -i 's|iproute2,|iproute2, ethtool,|' debian/control # add ethtool as a dependency of netplan.io temporarily - sed -i 's| python3-gi,| python3-gi, python3-packaging,|' debian/tests/control # needed for the 'routing' test (nm_version) - sed -i 's|bytecompile=-1|bytecompile=-1 -Dtesting=false|' debian/rules # drop after v1.1 TAG=$(git describe --tags $(git rev-list --tags --max-count=1)) # find latest (stable) tag REV=$(git rev-parse --short HEAD) # get current git revision VER="$TAG+git~$REV" diff --git a/.github/workflows/network-manager.yml b/.github/workflows/network-manager.yml index c3a79e9c6..20a1e599a 100644 --- a/.github/workflows/network-manager.yml +++ b/.github/workflows/network-manager.yml @@ -42,7 +42,6 @@ jobs: cp -r netplan.io-*/debian . rm -r debian/patches/ # clear any distro patches echo "3.0 (native)" > debian/source/format # force native build - sed -i 's|bytecompile=-1|bytecompile=-1 -Dtesting=false|' debian/rules # drop after v1.1 TAG=$(git describe --tags $(git rev-list --tags --max-count=1)) # find latest (stable) tag REV=$(git rev-parse --short HEAD) # get current git revision VER="$TAG+git~$REV" @@ -63,10 +62,9 @@ jobs: MIRROR=http://archive.ubuntu.com/ubuntu autopkgtest-build-lxd ubuntu-daily:noble # LP: #2052639 - name: Run autopkgtest run: | - # using --setup-commands temporarily to install: - # cmocka/pytest/rich/ethtool until they become proper test-deps pull-lp-source network-manager noble sudo autopkgtest -U \ --copy=debian/artifacts:/root/ --setup-commands='dpkg -i /root/*.deb' \ + --env=DEB_BUILD_OPTIONS=nocheck \ --apt-pocket=proposed=src:network-manager \ network-manager_*.dsc -- lxd autopkgtest/ubuntu/noble/amd64 || test $? -eq 2 # allow for skipped tests (exit code = 2)