From eec5da6b9b3b7de920b51a0319193bd8fdeaf6ba Mon Sep 17 00:00:00 2001
From: Erik Sundell <erik@sundellopensource.se>
Date: Fri, 9 Sep 2022 22:19:55 +0200
Subject: [PATCH] ci: don't test 21.10, only 22.04

---
 .github/workflows/integration-test.yaml | 17 ++++++-----------
 .github/workflows/unit-test.yaml        |  9 +--------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml
index 8c4e490..04ba853 100644
--- a/.github/workflows/integration-test.yaml
+++ b/.github/workflows/integration-test.yaml
@@ -66,26 +66,21 @@ jobs:
               ubuntu_version: "20.04"
               python_version: "3.9"
               extra_flags: ""
-            - name: "Int. tests: Ubuntu 21.10, Py 3.9"
-              runs_on: "20.04"
-              ubuntu_version: "21.10"
-              python_version: "3.9"
-              extra_flags: ""
             - name: "Int. tests: Ubuntu 22.04, Py 3.10"
               ubuntu_version: "22.04"
               python_version: "3.10"
               extra_flags: ""
-            - name: "Int. tests: Ubuntu 20.04, Py 3.9, --upgrade"
-              ubuntu_version: "20.04"
-              python_version: "3.9"
+            - name: "Int. tests: Ubuntu 22.04, Py 3.10, --upgrade"
+              ubuntu_version: "22.04"
+              python_version: "3.10"
               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 (18.04,
-    # 20.04, ...), so if we want to test against the latest non-LTS release, we
+    # 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.
     #
@@ -103,7 +98,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: ${{ matrix.python_version }}
+          python-version: "${{ matrix.python_version }}"
 
       - name: Install pytest
         run: python3 -m pip install pytest
diff --git a/.github/workflows/unit-test.yaml b/.github/workflows/unit-test.yaml
index 5895f2d..957a492 100644
--- a/.github/workflows/unit-test.yaml
+++ b/.github/workflows/unit-test.yaml
@@ -51,19 +51,12 @@ jobs:
           - name: "Unit tests: Ubuntu 22.04, Py 3.10"
             ubuntu_version: "22.04"
             python_version: "3.10"
-          # Test against Ubuntu 21.10 fails as of 2021-10-18 fail with the error
-          # described in: https://github.com/jupyterhub/the-littlest-jupyterhub/issues/714#issuecomment-945154101
-          #
-          # - name: "Unit tests: Ubuntu 21.10, Py 3.9"
-          #   runs_on: "20.04"
-          #   ubuntu_version: "21.10"
-          #   python_version: "3.9"
 
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: ${{ matrix.python_version }}
+          python-version: "${{ matrix.python_version }}"
 
       - name: Install venv, git and setup venv
         run: |