From 427a709e0f71b9622e7ad4aa132bbef2a959c7da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20M=C3=A4rdian?= Date: Mon, 29 Jul 2024 12:20:43 +0900 Subject: [PATCH] CI: Update DebCI to ubuntu-22.04 runners --- .github/workflows/debci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/debci.yml b/.github/workflows/debci.yml index 8e9dd5be3..0b2a2f125 100644 --- a/.github/workflows/debci.yml +++ b/.github/workflows/debci.yml @@ -16,7 +16,7 @@ on: jobs: lxc-debian-testing: # The type of runner that the job will run on - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 # Steps represent a sequence of tasks that will be executed as part of the job steps: @@ -29,6 +29,7 @@ jobs: # it's needed (will be auto-loaded) by routing.test_vrf_basic - name: Install dependencies run: | + sudo add-apt-repository -y -n -u -s ppa:slyon/netplan-ci sudo apt update sudo apt install debci lxc lxc-templates debian-archive-keyring autopkgtest ubuntu-dev-tools devscripts linux-modules-extra-$(uname -r) #openvswitch-switch # See: https://discourse.ubuntu.com/t/containers-lxc/11526 (Apparmor section) @@ -49,7 +50,6 @@ jobs: dget -u "https://deb.debian.org/debian/pool/main/n/netplan.io/netplan.io_$V.dsc" cp -r netplan.io-*/debian . rm -r debian/patches/ # clear any distro patches - sed -i 's|rm debian/tmp/lib/netplan/generate|# DELETED|' debian/rules 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" @@ -59,4 +59,4 @@ jobs: # using --setup-commands='apt -y install ...' temporarily to install # (test-/build-) deps until they become part of the packaging sudo autopkgtest . \ - -U --env=DPKG_GENSYMBOLS_CHECK_LEVEL=0 --env=DEB_BUILD_OPTIONS=nocheck -- lxc autopkgtest-testing-amd64 || test $? -eq 2 # allow OVS test to be skipped (exit code = 2) + -U --env=DPKG_GENSYMBOLS_CHECK_LEVEL=0 -- lxc autopkgtest-testing-amd64 || test $? -eq 2 # allow OVS test to be skipped (exit code = 2)