require ubuntu 20.04, test on debian 10

.github/workflows/integration-test.yaml

@@ -58,36 +58,28 @@ jobs:
           echo $matrix_post_filter | jq -C '.'
         env:
           matrix_include_pre_filter: |
-            - name: "Int. tests: Ubuntu 18.04, Py 3.6"
-              ubuntu_version: "18.04"
-              python_version: "3.6"
+            - name: "Int. tests: Debian 10, Py 3.7"
+              distro_image: "debian:10"
+              runs_on: "ubuntu-22.04"
               extra_flags: ""
-            - name: "Int. tests: Ubuntu 20.04, Py 3.9"
-              ubuntu_version: "20.04"
-              python_version: "3.9"
+            - name: "Int. tests: Ubuntu 20.04, Py 3.8"
+              distro_image: "ubuntu:20.04"
               extra_flags: ""
-            - name: "Int. tests: Ubuntu 22.04, Py 3.10"
-              ubuntu_version: "22.04"
-              python_version: "3.10"
+            - name: "Int. tests: Ubuntu 22.04 (Py 3.10)"
+              distro_image: "ubuntu:22.04"
               extra_flags: ""
             - name: "Int. tests: Ubuntu 22.04, Py 3.10, --upgrade"
-              ubuntu_version: "22.04"
-              python_version: "3.10"
+              distro_image: "ubuntu:22.04"
               extra_flags: --upgrade
               dont_run_on_ref: refs/heads/master
 
   integration-tests:
     needs: decide-on-test-jobs-to-run
 
-    # runs-on can only be configured to the LTS releases of ubuntu (20.04,
-    # 22.04, ...), so if we want to test against the latest non-LTS release, we
-    # must compromise when configuring runs-on and configure runs-on to be the
-    # latest LTS release instead.
-    #
-    # This can have consequences because actions like actions/setup-python will
-    # mount cached installations associated with the chosen runs-on environment.
-    #
-    runs-on: ${{ format('ubuntu-{0}', matrix.runs_on || matrix.ubuntu_version) }}
+    # integration tests run in a container,
+    # not in the worker, so this version is not relevant to the tests
+    # and can be the same for all tested versions
+    runs-on: ubuntu-22.04
 
     name: ${{ matrix.name }}
     strategy:
@@ -98,7 +90,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: "${{ matrix.python_version }}"
+          python-version: "3.10"
 
       - name: Install pytest
         run: python3 -m pip install pytest
@@ -106,7 +98,7 @@ jobs:
       # We abort pytest after two failures as a compromise between wanting to
       # avoid a flood of logs while still understanding if multiple tests would
       # fail.
-      - name: Run bootstrap tests (Runs in/Builds ubuntu:${{ matrix.ubuntu_version }} derived image)
+      - name: Run bootstrap tests (Runs in/Builds ${{ matrix.distro_image }} derived image)
         run: |
           pytest --verbose --maxfail=2 --color=yes --durations=10 --capture=no \
               integration-tests/test_bootstrap.py
@@ -115,14 +107,14 @@ jobs:
           # integration-tests/test_bootstrap.py will build and start containers
           # based on this environment variable. This is similar to how
           # .github/integration-test.py build-image can take a --build-arg
-          # setting the ubuntu_version.
-          UBUNTU_VERSION: ${{ matrix.ubuntu_version }}
+          # setting the base image.
+          BASE_IMAGE: ${{ matrix.distro_image }}
 
       # We build a docker image from wherein we will work
-      - name: Build systemd image (Builds ubuntu:${{ matrix.ubuntu_version }} derived image)
+      - name: Build systemd image (Builds ${{ matrix.distro_image }} derived image)
         run: |
           .github/integration-test.py build-image \
-              --build-arg "ubuntu_version=${{ matrix.ubuntu_version }}"
+              --build-arg "BASE_IMAGE=${{ matrix.distro_image }}"
 
       # FIXME: Make the logic below easier to follow.
       # - In short, setting BOOTSTRAP_PIP_SPEC here, specifies from what
@@ -151,7 +143,7 @@ jobs:
           echo "BOOTSTRAP_PIP_SPEC=$BOOTSTRAP_PIP_SPEC" >> $GITHUB_ENV
           echo $BOOTSTRAP_PIP_SPEC
 
-      - name: Run basic tests (Runs in ubuntu:${{ matrix.ubuntu_version }} derived image)
+      - name: Run basic tests (Runs in ${{ matrix.distro_image }} derived image)
         run: |
           .github/integration-test.py run-test basic-tests \
               --bootstrap-pip-spec "$BOOTSTRAP_PIP_SPEC" \
@@ -162,7 +154,7 @@ jobs:
               test_extensions.py
         timeout-minutes: 15
 
-      - name: Run admin tests (Runs in ubuntu:${{ matrix.ubuntu_version }} derived image)
+      - name: Run admin tests (Runs in ${{ matrix.distro_image }} derived image)
         run: |
           .github/integration-test.py run-test admin-tests \
               --installer-args "--admin admin:admin" \
@@ -171,7 +163,7 @@ jobs:
               test_admin_installer.py
         timeout-minutes: 15
 
-      - name: Run plugin tests (Runs in ubuntu:${{ matrix.ubuntu_version }} derived image)
+      - name: Run plugin tests (Runs in ${{ matrix.distro_image }} derived image)
         run: |
           .github/integration-test.py run-test plugin-tests \
               --bootstrap-pip-spec "$BOOTSTRAP_PIP_SPEC" \

.github/workflows/unit-test.yaml

@@ -42,9 +42,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: "Unit tests: Ubuntu 18.04, Py 3.6"
-            ubuntu_version: "18.04"
-            python_version: "3.6"
           - name: "Unit tests: Ubuntu 20.04, Py 3.9"
             ubuntu_version: "20.04"
             python_version: "3.9"