Skip to content

Commit

Permalink
CI: cleanup after v1.1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
slyon committed Sep 3, 2024
1 parent c973d9a commit e87ae1b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/autopkgtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/network-manager.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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)

0 comments on commit e87ae1b

Please sign in to comment.