Merge pull request #5008 from canonical/lpetrut/unblock-ci

petrutlucian94 · web-flow · commit a47d34de22b3 · 2025-04-03T16:09:52.000+03:00
diff --git a/.github/actions/test-prep/action.yaml b/.github/actions/test-prep/action.yaml
@@ -0,0 +1,24 @@
+name: Prepare test prerequisites
+
+runs:
+  using: "composite"
+  steps:
+    - name: Setup Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: "3.10"
+    - name: Install test dependencies
+      shell: bash
+      run: |
+        set -x
+        sudo pip3 install -U pytest==8.3.4 sh psutil requests
+    # Docker sets iptables rules that interfere with LXD and K8s.
+    # https://documentation.ubuntu.com/lxd/en/latest/howto/network_bridge_firewalld/#prevent-connectivity-issues-with-lxd-and-docker
+    - name: Apply Docker iptables workaround
+      shell: bash
+      run: sudo iptables -I DOCKER-USER -j ACCEPT
+    - name: Fetch snap
+      uses: actions/download-artifact@v4
+      with:
+        name: microk8s.snap
+        path: build
diff --git a/.github/workflows/build-snap.yml b/.github/workflows/build-snap.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   build:
     name: Create snap package
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checking out repo
@@ -18,6 +18,11 @@ jobs:
           sudo lxd init --auto
           sudo usermod --append --groups lxd $USER
           sg lxd -c 'lxc version'
+      # Docker sets iptables rules that interfere with LXD or K8s.
+      # https://documentation.ubuntu.com/lxd/en/latest/howto/network_bridge_firewalld/#prevent-connectivity-issues-with-lxd-and-docker
+      - name: Apply Docker iptables workaround
+        shell: bash
+        run: sudo iptables -I DOCKER-USER -j ACCEPT
       - name: Install snapcraft
         run: |
           sudo snap install snapcraft --classic
@@ -37,138 +42,84 @@ jobs:
 
   test-upgrade:
     name: Upgrade path test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: build
-
+    timeout-minutes: 30
     steps:
       - name: Checking out repo
         uses: actions/checkout@v4
-      - name: Install test dependencies
-        run: |
-          set -x
-          sudo apt-get install python3-setuptools
-          sudo pip3 install --upgrade pip
-          sudo pip3 install -U pytest sh psutil
-          sudo apt-get -y install open-iscsi
-          sudo systemctl enable iscsid
-      - name: Fetch snap
-        uses: actions/download-artifact@v4
-        with:
-          name: microk8s.snap
-          path: build
+      - name: Prepare test prerequisites
+        uses: ./.github/actions/test-prep
       - name: Running upgrade path test
         run: |
           sudo -E UPGRADE_MICROK8S_FROM=latest/edge UPGRADE_MICROK8S_TO=$PWD/build/microk8s.snap pytest -s ./tests/test-upgrade-path.py
 
   test-addons-core:
     name: Test core addons
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: build
-
+    timeout-minutes: 30
     steps:
       - name: Checking out repo
         uses: actions/checkout@v4
-      - name: Install test dependencies
-        run: |
-          set -x
-          sudo apt-get install python3-setuptools
-          sudo pip3 install --upgrade pip
-          sudo pip3 install -U pytest==8.3.4 sh psutil
-          sudo apt-get -y install open-iscsi
-          sudo systemctl enable iscsid
-      - name: Fetch snap
-        uses: actions/download-artifact@v4
-        with:
-          name: microk8s.snap
-          path: build
+      - name: Prepare test prerequisites
+        uses: ./.github/actions/test-prep
       - name: Running addons tests
+        env:
+          UNDER_TIME_PRESSURE: ${{ !contains(github.event.pull_request.labels.*.name, 'run-all-tests') }}
         run: |
           set -x
           sudo snap install build/microk8s.snap --classic --dangerous
           ./tests/smoke-test.sh
-          export UNDER_TIME_PRESSURE="True"
           export SKIP_PROMETHEUS="False"
           sudo -E bash -c "cd /var/snap/microk8s/common/addons/core/tests; pytest -s -ra test-addons.py"
 
   test-addons-community:
     name: Test community addons
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: build
-
+    timeout-minutes: 30
     steps:
       - name: Checking out repo
         uses: actions/checkout@v4
-      - name: Install test dependencies
-        run: |
-          set -x
-          sudo apt-get install python3-setuptools
-          sudo pip3 install --upgrade pip
-          sudo pip3 install -U pytest sh
-          sudo apt-get -y install open-iscsi
-          sudo systemctl enable iscsid
-      - name: Fetch snap
-        uses: actions/download-artifact@v4
-        with:
-          name: microk8s.snap
-          path: build
-      # - name: Setup tmate session
-      #   uses: mxschmitt/action-tmate@v3
+      - name: Prepare test prerequisites
+        uses: ./.github/actions/test-prep
       - name: Running addons tests
+        env:
+          UNDER_TIME_PRESSURE: ${{ !contains(github.event.pull_request.labels.*.name, 'run-all-tests') }}
         run: |
           set -x
           sudo snap install build/microk8s.snap --classic --dangerous
           sudo microk8s enable community
-          export UNDER_TIME_PRESSURE="True"
           sudo -E bash -c "cd /var/snap/microk8s/common/addons/community/; pytest -s -ra ./tests/"
 
   test-addons-core-upgrade:
     name: Test core addons upgrade
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: build
-
+    timeout-minutes: 30
     steps:
       - name: Checking out repo
         uses: actions/checkout@v4
-      # - name: Setup tmate session
-      #   uses: mxschmitt/action-tmate@v3
-      - name: Install test dependencies
-        run: |
-          set -x
-          sudo apt-get install python3-setuptools
-          sudo pip3 install --upgrade pip
-          sudo pip3 install -U pytest sh psutil
-          sudo apt-get -y install open-iscsi
-          sudo systemctl enable iscsid
-      - name: Fetch snap
-        uses: actions/download-artifact@v4
-        with:
-          name: microk8s.snap
-          path: build
+      - name: Prepare test prerequisites
+        uses: ./.github/actions/test-prep
       - name: Running upgrade tests
+        env:
+          UNDER_TIME_PRESSURE: ${{ !contains(github.event.pull_request.labels.*.name, 'run-all-tests') }}
         run: |
           set -x
-          export UNDER_TIME_PRESSURE="True"
           sudo -E bash -c "UPGRADE_MICROK8S_FROM=latest/edge UPGRADE_MICROK8S_TO=$PWD/build/microk8s.snap pytest -s ./tests/test-upgrade.py"
 
   test-cluster-agent:
     name: Cluster agent health check
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: build
-
+    timeout-minutes: 30
     steps:
       - name: Checking out repo
         uses: actions/checkout@v4
-      - name: Install test dependencies
-        run: |
-          set -x
-          sudo apt-get install python3-setuptools
-          sudo pip3 install --upgrade pip
-          sudo pip3 install -U pytest sh requests
-      - name: Fetch snap
-        uses: actions/download-artifact@v4
-        with:
-          name: microk8s.snap
-          path: build
+      - name: Prepare test prerequisites
+        uses: ./.github/actions/test-prep
       - name: Running cluster agent health check
         run: |
           set -x
@@ -177,17 +128,14 @@ jobs:
 
   test-airgap:
     name: Test airgap installation
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: build
-
+    timeout-minutes: 30
     steps:
       - name: Checking out repo
         uses: actions/checkout@v4
-      - name: Fetch snap
-        uses: actions/download-artifact@v4
-        with:
-          name: microk8s.snap
-          path: build
+      - name: Prepare test prerequisites
+        uses: ./.github/actions/test-prep
       - name: Initialize LXD
         run: |
           sudo lxd init --auto
@@ -196,12 +144,13 @@ jobs:
           sg lxd -c 'lxc version'
       - name: Run airgap tests
         run: |
-          sudo -E bash -x -c "./tests/libs/airgap.sh --distro ubuntu:20.04 --channel $PWD/build/microk8s.snap"
+          sudo -E bash -x -c "./tests/libs/airgap.sh --distro ubuntu:22.04 --channel $PWD/build/microk8s.snap"
 
   security-scan:
     name: Security scan
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: build
+    timeout-minutes: 30
     steps:
       - name: Checking out repo
         uses: actions/checkout@v4
diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -1,7 +1,7 @@
 kubernetes
 jinja2
 pylxd
-pytest
+pytest==8.3.4
 pytest-xdist
 pyyaml
 sh
diff --git a/tests/test-upgrade-path.py b/tests/test-upgrade-path.py
@@ -19,7 +19,7 @@ class TestUpgradePath(object):
     """
 
     @pytest.mark.skipif(
-        os.environ.get("UNDER_TIME_PRESSURE") == "True",
+        os.environ.get("UNDER_TIME_PRESSURE", "").lower() == "true",
         reason="Skipping refresh path test as we are under time pressure",
     )
     def test_refresh_path(self):
diff --git a/tests/test-upgrade.py b/tests/test-upgrade.py
@@ -26,7 +26,7 @@
 upgrade_from = os.environ.get("UPGRADE_MICROK8S_FROM", "beta")
 # Have UPGRADE_MICROK8S_TO point to a file to upgrade to that file
 upgrade_to = os.environ.get("UPGRADE_MICROK8S_TO", "edge")
-under_time_pressure = os.environ.get("UNDER_TIME_PRESSURE", "False")
+under_time_pressure = os.environ.get("UNDER_TIME_PRESSURE", "false").lower()
 
 
 class TestUpgrade(object):
@@ -121,7 +121,7 @@ def test_upgrade(self):
             print("Will not test the metrics server")
 
         # AMD64 only tests
-        if platform.machine() == "x86_64" and under_time_pressure == "False":
+        if platform.machine() == "x86_64" and under_time_pressure == "false":
             try:
                 ip_ranges = (
                     "192.168.0.105-192.168.0.105,192.168.0.110-192.168.0.111,192.168.1.240/28"

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class TestUpgradePath(object):`
`19`	`19`	`"""`
`20`	`20`
`21`	`21`	`@pytest.mark.skipif(`
`22`		`- os.environ.get("UNDER_TIME_PRESSURE") == "True",`
	`22`	`+ os.environ.get("UNDER_TIME_PRESSURE", "").lower() == "true",`
`23`	`23`	`reason="Skipping refresh path test as we are under time pressure",`
`24`	`24`	`)`
`25`	`25`	`def test_refresh_path(self):`