Merge branch 'canonical:main' into Fix_udev_for_VARID

canonical · Mar 22, 2024 · 672caae · 672caae
2 parents f491db5 + 604d369
commit 672caae
Show file tree

Hide file tree

Showing 272 changed files with 19,704 additions and 2,762 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1,3 @@
+# Devices QA team
+contrib/checkbox-provider-ce-oem @canonical/oem-qa
+.github/workflows/tox-contrib-provider-ce-oem.yaml @canonical/oem-qa
diff --git a/.github/workflows/checkbox-beta-release.yml b/.github/workflows/checkbox-beta-release.yml
@@ -26,6 +26,8 @@ jobs:
         with:
           fetch-depth: 0
       - name: Verify Promotion Conditions
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           tools/release/can_promote_edge.py
 

diff --git a/.github/workflows/checkbox-core-snap-daily-builds.yml b/.github/workflows/checkbox-core-snap-daily-builds.yml
@@ -10,7 +10,8 @@ jobs:
       matrix:
         releases: [16, 18, 20, 22]
         arch: [amd64, arm64, armhf]
-    runs-on: [self-hosted, linux, large]
+    runs-on: [self-hosted, linux, small]
+    timeout-minutes: 1200 #20h, this will timeout sooner due to inner timeouts
     env:
       SERIES: series${{ matrix.releases }}
       SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT7_CREDS }}
@@ -38,6 +39,7 @@ jobs:
           echo "Building at: https://git.launchpad.net/~ce-certification-qa/+snap/$SNAPCRAFT_BUILDER_ID"
       - uses: Wandalen/wretry.action@a163f62ae554a8f3cbe27b23db15b60c0ae2e93c # v1.3.0
         name: Build the snap
+        timeout-minutes: 600 # 10hours
         with:
           action: Hook25/action-build@707dce252c4f367b6c1afe61ed577f7413cf7912
           attempt_delay: 600000 # 10min
@@ -62,6 +64,7 @@ jobs:
           path: checkbox-core-snap/series${{ matrix.releases }}/*.snap
       - uses: Wandalen/wretry.action@a163f62ae554a8f3cbe27b23db15b60c0ae2e93c # v1.3.0
         name: Upload the snap to the store
+        timeout-minutes: 600 # 10hours
         with:
           attempt_delay: 600000 # 10min
           attempt_limit: 10

diff --git a/.github/workflows/checkbox-snap-daily-builds.yml b/.github/workflows/checkbox-snap-daily-builds.yml
@@ -11,7 +11,8 @@ jobs:
       matrix:
         type: [classic, uc]
         releases: [16, 18, 20, 22]
-    runs-on: [self-hosted, linux, large]
+    runs-on: [self-hosted, linux, small]
+    timeout-minutes: 1200 #20h, this will timeout sooner due to inner timeouts
     env:
       SERIES: series_${{ matrix.type }}${{ matrix.releases }}
       SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT7_CREDS }}
@@ -40,6 +41,7 @@ jobs:
           echo "Building at: https://git.launchpad.net/~ce-certification-qa/+snap/$SNAPCRAFT_BUILDER_ID"
       - uses: Wandalen/wretry.action@a163f62ae554a8f3cbe27b23db15b60c0ae2e93c # v1.3.0
         name: Building the snaps
+        timeout-minutes: 600 # 10hours
         with:
           action: Hook25/action-build@707dce252c4f367b6c1afe61ed577f7413cf7912
           attempt_delay: 600000 # 10min
@@ -64,6 +66,7 @@ jobs:
           path: checkbox-snap/series_${{ matrix.type }}${{ matrix.releases }}/*.snap
       - uses: Wandalen/wretry.action@a163f62ae554a8f3cbe27b23db15b60c0ae2e93c # v1.3.0
         name: Upload the snaps to the store
+        timeout-minutes: 600 # 10hours
         with:
           attempt_delay: 600000 # 10min
           attempt_limit: 10

diff --git a/.github/workflows/daily-builds.yml b/.github/workflows/daily-builds.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   check_for_commits:
-    runs-on: [self-hosted, linux, large]
+    runs-on: [self-hosted, linux, small]
     name: Check for commits
     outputs:
       new_commit_count: ${{ steps.commit_check.outputs.new_commit_count }}

diff --git a/.github/workflows/deb-daily-builds.yml b/.github/workflows/deb-daily-builds.yml
@@ -7,7 +7,8 @@ on:
 jobs:
   ppa_update:
     name: Sync PPA history with monorepo
-    runs-on: [self-hosted, linux, large]
+    runs-on: [self-hosted, linux, small]
+    timeout-minutes: 1200 #20h, this will timeout sooner due to inner timeouts
     steps:
       - name: Install dependencies
         run: |
@@ -65,6 +66,7 @@ jobs:
             tools/release/lp_update_recipe.py checkbox --recipe ${{ matrix.recipe }} --new-version $(tools/release/get_version.py --dev-suffix --output-format deb) --revision $GITHUB_SHA
       - uses: Wandalen/wretry.action@a163f62ae554a8f3cbe27b23db15b60c0ae2e93c # v1.3.0
         name: Build and wait result
+        timeout-minutes: 780 # 13hours
         env:
           LP_CREDENTIALS: ${{ secrets.LP_CREDS }}
           PYTHONUNBUFFERED: 1

diff --git a/.github/workflows/tox-checkbox-ng.yaml b/.github/workflows/tox-checkbox-ng.yaml
@@ -12,7 +12,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  tox_test_checkbox_ng:
+    name: Test checkbox-ng with tox
     defaults:
       run:
         working-directory: checkbox-ng

diff --git a/.github/workflows/tox-checkbox-support.yaml b/.github/workflows/tox-checkbox-support.yaml
@@ -12,7 +12,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  tox_test_checkbox_support:
+    name: Test checkbox-support with tox
     defaults:
       run:
         working-directory: checkbox-support

diff --git a/.github/workflows/tox-contrib-genio.yaml b/.github/workflows/tox-contrib-genio.yaml
@@ -0,0 +1,40 @@
+name: Test provider-genio (from contrib area) with tox
+
+on:
+  workflow_dispatch:
+
+jobs:
+  tox_test_contrib_ce_oem_provider:
+    continue-on-error: true
+    name: Test Genio provider (from contrib area) with tox
+    defaults:
+      run:
+        working-directory: contrib/genio
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        python: ["3.5", "3.6", "3.8", "3.10"]
+        include:
+          - python: "3.5"
+            tox_env_name: "py35"
+          - python: "3.6"
+            tox_env_name: "py36"
+          - python: "3.8"
+            tox_env_name: "py38"
+          - python: "3.10"
+            tox_env_name: "py310"
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python }}
+      - name: Install tox
+        run: pip install tox
+      - name: Run tox
+        run: tox -e${{ matrix.tox_env_name }}
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v3
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          flags: contrib-provider-genio
diff --git a/.github/workflows/tox-contrib-provider-ce-oem.yaml b/.github/workflows/tox-contrib-provider-ce-oem.yaml
@@ -0,0 +1,40 @@
+name: Test provider-ce-oem (from contrib area) with tox
+
+on:
+  workflow_dispatch:
+
+jobs:
+  tox_test_contrib_ce_oem_provider:
+    continue-on-error: true
+    name: Test ce-oem provider (from contrib area) with tox
+    defaults:
+      run:
+        working-directory: contrib/checkbox-provider-ce-oem
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        python: ["3.5", "3.6", "3.8", "3.10"]
+        include:
+          - python: "3.5"
+            tox_env_name: "py35"
+          - python: "3.6"
+            tox_env_name: "py36"
+          - python: "3.8"
+            tox_env_name: "py38"
+          - python: "3.10"
+            tox_env_name: "py310"
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python }}
+      - name: Install tox
+        run: pip install tox
+      - name: Run tox
+        run: tox -e${{ matrix.tox_env_name }}
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v3
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          flags: contrib-provider-ce-oem
diff --git a/.github/workflows/tox-provider-base.yaml b/.github/workflows/tox-provider-base.yaml
@@ -12,7 +12,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  tox_test_provider_base:
+    name: Test provider-base with tox
     defaults:
       run:
         working-directory: providers/base

diff --git a/.github/workflows/tox-provider-certification-client.yaml b/.github/workflows/tox-provider-certification-client.yaml
@@ -12,7 +12,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  tox_test_provider_certification_client:
+    name: Test provider-certification-client with tox
     defaults:
       run:
         working-directory: providers/certification-client

diff --git a/.github/workflows/tox-provider-certification-server.yaml b/.github/workflows/tox-provider-certification-server.yaml
@@ -12,7 +12,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  tox_test_provider_certification_server:
+    name: Test provider-certification-server with tox
     defaults:
       run:
         working-directory: providers/certification-server

diff --git a/.github/workflows/tox-provider-docker.yaml b/.github/workflows/tox-provider-docker.yaml
@@ -12,7 +12,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  tox_test_provider_docker:
+    name: Test provider-docker with tox
     defaults:
       run:
         working-directory: providers/docker

diff --git a/.github/workflows/tox-provider-gpgpu.yaml b/.github/workflows/tox-provider-gpgpu.yaml
@@ -12,7 +12,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  tox_test_provider_gpgpu:
+    name: Test provider-gpgpu with tox
     defaults:
       run:
         working-directory: providers/gpgpu

diff --git a/.github/workflows/tox-provider-iiotg.yaml b/.github/workflows/tox-provider-iiotg.yaml
@@ -12,7 +12,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  tox_test_provider_iiotg:
+    name: Test Intel IOTG provider with tox
     defaults:
       run:
         working-directory: providers/iiotg

diff --git a/.github/workflows/tox-provider-resource.yaml b/.github/workflows/tox-provider-resource.yaml
@@ -12,7 +12,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  tox_test_provider_resource:
+    name: Test provider-resource with tox
     defaults:
       run:
         working-directory: providers/resource

diff --git a/.github/workflows/tox-provider-sru.yaml b/.github/workflows/tox-provider-sru.yaml
@@ -12,7 +12,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  tox_test_provider_sru:
+    name: Test provider-sru with tox
     defaults:
       run:
         working-directory: providers/sru

diff --git a/.github/workflows/tox-provider-tpm2.yaml b/.github/workflows/tox-provider-tpm2.yaml
@@ -12,7 +12,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  tox_test_provider_tpm2:
+    name: Test provider-tpm2 with tox
     defaults:
       run:
         working-directory: providers/tpm2

diff --git a/.github/workflows/tox-tools-release.yaml b/.github/workflows/tox-tools-release.yaml
@@ -12,7 +12,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  tox_test_release_tools:
+    name: Test release tools with tox
     defaults:
       run:
         working-directory: tools/release

diff --git a/.github/workflows/validate_workflows.yaml b/.github/workflows/validate_workflows.yaml
@@ -6,7 +6,8 @@ on:
       - '.github/workflows/*'
 
 jobs:
-  build:
+  workflow_validation:
+    name: Workflow validation
     runs-on: ubuntu-latest
     steps:
       - name: Checkout checkbox monorepo

diff --git a/checkbox-core-snap/common_files/config/wrapper_common b/checkbox-core-snap/common_files/config/wrapper_common
@@ -31,6 +31,7 @@ else
   append_path PYTHONHOME $RUNTIME/usr
   append_path PYTHONPATH $RUNTIME/usr/lib/python3/dist-packages
   append_path PYTHONPATH $RUNTIME/lib/python3*/site-packages
+  append_path PYTHONPATH $RUNTIME/lib/python3*/dist-packages
 fi
 
 # make sure we always know where the content snap is especially for classic

diff --git a/checkbox-core-snap/common_files/config/wrapper_common_classic b/checkbox-core-snap/common_files/config/wrapper_common_classic
@@ -42,6 +42,7 @@ else
   append_path PYTHONHOME $RUNTIME/usr
   append_path PYTHONPATH $RUNTIME/usr/lib/python3/dist-packages
   append_path PYTHONPATH $RUNTIME/lib/python3*/site-packages
+  append_path PYTHONPATH $RUNTIME/lib/python3*/dist-packages
 fi
 
 # make sure we always know where the content snap is especially for classic

diff --git a/checkbox-core-snap/series16/snap/snapcraft.yaml b/checkbox-core-snap/series16/snap/snapcraft.yaml
@@ -204,6 +204,7 @@ parts:
       - python3-xlsxwriter
       - python3-setuptools
       - python3-dev
+      - lsb-release
     python-packages:
       - tqdm
     after: [checkbox-support]
@@ -404,15 +405,7 @@ parts:
       - picamera
     build-environment:
       - READTHEDOCS: 'True'
-  rpi-ppa:
-    plugin: nil
-    override-pull: |
-      sudo add-apt-repository ppa:sylvain-pineau/ppa-rpi
-      sudo apt-get update
-    build-packages:
-      - software-properties-common
   rpi-support-binaries:
-    after: [rpi-ppa]
     plugin: nil
     stage-packages:
       - on armhf:

diff --git a/checkbox-core-snap/series18/snap/snapcraft.yaml b/checkbox-core-snap/series18/snap/snapcraft.yaml
@@ -404,15 +404,7 @@ parts:
       - picamera
     build-environment:
       - READTHEDOCS: 'True'
-  rpi-ppa:
-    plugin: nil
-    override-pull: |
-      sudo add-apt-repository ppa:sylvain-pineau/ppa-rpi
-      sudo apt-get update
-    build-packages:
-      - software-properties-common
   rpi-support-binaries:
-    after: [rpi-ppa]
     plugin: nil
     stage-packages:
       - on armhf:

diff --git a/checkbox-core-snap/series20/snap/snapcraft.yaml b/checkbox-core-snap/series20/snap/snapcraft.yaml
@@ -437,15 +437,7 @@ parts:
       python3 manage.py install --layout=relocatable --prefix=/providers/checkbox-provider-certification-server --root="$SNAPCRAFT_PART_INSTALL"
     after: [checkbox-provider-certification-client]
 ################################################################################
-  rpi-ppa:
-    plugin: nil
-    override-pull: |
-      sudo add-apt-repository ppa:sylvain-pineau/ppa-rpi
-      sudo apt-get update
-    build-packages:
-      - software-properties-common
   rpi-support-binaries:
-    after: [rpi-ppa]
     plugin: nil
     stage-packages:
       - on armhf: