nm ci

canonical · Aug 3, 2023 · 848fdd2 · 848fdd2
1 parent 12e2d27
commit 848fdd2
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/.github/workflows/network-manager.yml b/.github/workflows/network-manager.yml
@@ -31,14 +31,10 @@ jobs:
         run: |
           sudo sed -i '/deb-src/s/^# //' /etc/apt/sources.list
           sudo apt update
-          sudo apt install autopkgtest ubuntu-dev-tools devscripts openvswitch-switch linux-modules-extra-$(uname -r)
-      # work around LP: #1878225 as fallback
-      - name: Preparing autopkgtest-build-lxd
-        run: |
-          sudo patch /usr/bin/autopkgtest-build-lxd .github/workflows/snapd.patch
-          autopkgtest-build-lxd ubuntu-daily:mantic
+          sudo apt install autopkgtest ubuntu-dev-tools devscripts sbuild openvswitch-switch linux-modules-extra-$(uname -r)
       - name: Prepare test
         run: |
+          sudo sg sbuild
           pull-lp-source netplan.io
           cp -r netplan.io-*/debian .
           rm -r debian/patches/  # clear any distro patches
@@ -47,9 +43,17 @@ jobs:
           REV=$(git rev-parse --short HEAD)  # get current git revision
           VER="$TAG+git~$REV"
           dch -v "$VER" "Autopkgtest CI"
-          sudo apt -y build-dep ./
-          sudo apt -y install python3-cffi libpython3-dev
-          DEB_BUILD_OPTIONS=nocheck DPKG_GENSYMBOLS_CHECK_LEVEL=0 dpkg-buildpackage -b
+          sudo touch /root/.sbuildrc
+          sudo mk-sbuild mantic
+          sbuild -dmantic --profiles=nocheck --add-depends=python3-cffi --add-depends=libpython3-dev
+          #sudo apt -y build-dep ./
+          #sudo apt -y install python3-cffi libpython3-dev
+          #DEB_BUILD_OPTIONS=nocheck DPKG_GENSYMBOLS_CHECK_LEVEL=0 dpkg-buildpackage -b
+      # work around LP: #1878225 as fallback
+      - name: Preparing autopkgtest-build-lxd
+        run: |
+          sudo patch /usr/bin/autopkgtest-build-lxd .github/workflows/snapd.patch
+          autopkgtest-build-lxd ubuntu-daily:mantic
       - name: Run autopkgtest
         run: |
           # using --setup-commands temporarily to install: