From 6aff89053bbdfbecf1b2adbdc62c7e82c59104b8 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Thu, 4 Jul 2024 14:18:42 -0400 Subject: [PATCH 1/3] github: replace python versions by OS versions Due to #586, we cannot test with anything by the OS provided python version. As such, let's test with multiple OS versions and against the respective LXD version for that OS. Signed-off-by: Simon Deziel --- .github/workflows/tests.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a454859a..c891783c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -37,18 +37,13 @@ jobs: name: Tests strategy: matrix: - python-version: ["3.8", "3.10", "3.11", "3.12"] + os: ["20.04", "22.04"] - runs-on: ubuntu-22.04 + runs-on: ubuntu-${{ matrix.os }} steps: - name: Repository checkout uses: actions/checkout@v4 - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.python-version }} - - name: Install dependencies run: | set -x @@ -57,10 +52,12 @@ jobs: sudo ip link delete docker0 sudo nft flush ruleset - sudo snap refresh lxd + sudo snap refresh lxd || sudo snap install lxd sudo adduser "$USER" lxd sudo lxd init --auto + sudo apt-get update + sudo apt-get install python3-pip pip install --upgrade pip tox codecov - name: Coverage From 4c5bdad42414ec5dd88c6f76e24763181a03c3b2 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Thu, 4 Jul 2024 14:25:07 -0400 Subject: [PATCH 2/3] github: tune docker firewall disablement to work on 20.04 Signed-off-by: Simon Deziel --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c891783c..0173b762 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -50,7 +50,7 @@ jobs: sudo apt-get autopurge moby-containerd docker uidmap -y sudo ip link delete docker0 - sudo nft flush ruleset + sudo nft flush ruleset || sudo iptables -I DOCKER-USER -j ACCEPT sudo snap refresh lxd || sudo snap install lxd sudo adduser "$USER" lxd From 13e3649b3b26c312fb737b6dfaefc3b992693df1 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Thu, 4 Jul 2024 15:30:11 -0400 Subject: [PATCH 3/3] github: only test on 22.04 (DEBUG) Signed-off-by: Simon Deziel --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0173b762..1e24033d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -37,7 +37,7 @@ jobs: name: Tests strategy: matrix: - os: ["20.04", "22.04"] + os: ["22.04"] runs-on: ubuntu-${{ matrix.os }} steps: