[tests] Use ubuntu 20.04 for Python 3.6 tests

Python 3.6 has reached EOL 1 year ago and is no longer supported by
ubuntu-latest. Therefore use 20.04 instead.

Bug: T325468
Change-Id: I90366f619c217fc968af86c78b31d2aeea4dac6e
---
M .github/workflows/doctest.yml
M .github/workflows/oauth_tests-ci.yml
M .github/workflows/pywikibot-ci.yml
M .github/workflows/login_tests-ci.yml
4 files changed, 54 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml
index 27e3117..467c7fc 100644
--- a/.github/workflows/doctest.yml
+++ b/.github/workflows/doctest.yml
@@ -16,7 +16,7 @@
 
 jobs:
   build:
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.os || 'ubuntu-latest'}}
     timeout-minutes: 15
 
     strategy:
@@ -25,10 +25,16 @@
 
       matrix:
         os: [ "windows-latest", "macOS-latest", "ubuntu-latest" ]
-        python-version: ["pypy3.7", "3.11", "3.6" ]
+        python-version: ["pypy3.7", "3.11"]
         include:
           - python-version: "3.12.0-alpha - 3.12.0"
-            os: ubuntu-latest
+          # ubuntu-20.04 required for Python 3.6
+          - python-version: 3.6
+            os: windows-latest
+          - python-version: 3.6
+            os: macOS-latest
+          - python-version: 3.6
+            os: ubuntu-20.04
 
     steps:
     - name: Checkout Repository
diff --git a/.github/workflows/login_tests-ci.yml b/.github/workflows/login_tests-ci.yml
index c1c9d80..01656a1 100644
--- a/.github/workflows/login_tests-ci.yml
+++ b/.github/workflows/login_tests-ci.yml
@@ -10,8 +10,8 @@
 
 env:
   PYWIKIBOT_TEST_RUNNING: 1
-  PYWIKIBOT_LOGIN_LOGOUT: 1
   PYWIKIBOT_USERNAME: Pywikibot-test
+  PYWIKIBOT_LOGIN_LOGOUT: 1
 
 jobs:
   build:
@@ -23,7 +23,7 @@
       max-parallel: 1
 
       matrix:
-        python-version: ["pypy3.7", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12.0-alpha - 3.12.0"]
+        python-version: ["pypy3.7", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12.0-alpha - 3.12.0"]
         site: ['wikipedia:en', 'wikisource:zh']
         include:
           - python-version: 3.6
@@ -51,6 +51,13 @@
           - python-version: 3
             site: wikipedia:de
             os: macOS-latest
+          # ubuntu-20.04 required for Python 3.6
+          - python-version: 3.6
+            site: wikipedia:en
+            os: ubuntu-20.04
+          - python-version: 3.6
+            site: wikisource:zh
+            os: ubuntu-20.04
 
     steps:
     - name: Checkout Repository
diff --git a/.github/workflows/oauth_tests-ci.yml b/.github/workflows/oauth_tests-ci.yml
index 42d42c7..704ff9e 100644
--- a/.github/workflows/oauth_tests-ci.yml
+++ b/.github/workflows/oauth_tests-ci.yml
@@ -16,7 +16,7 @@
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os || 'ubuntu-latest' }}
     timeout-minutes: 2
 
     strategy:
@@ -24,23 +24,26 @@
       max-parallel: 15
 
       matrix:
-        python-version: ["pypy3.7", "3.11", "3.10", "3.9", "3.8", "3.7", "3.6"]
+        python-version: ["pypy3.7", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12.0-alpha - 3.12.0"]
         family: ['wikipedia']
         code: ['test']
         domain:  ['test.wikipedia.org']
         include:
-          - python-version: "3.12.0-alpha - 3.12.0"
-            family: wikipedia
-            code: test
-            domain: test.wikipedia.org
           - python-version: 3.6
             family: wpbeta
             code: en
             domain: en.wikipedia.beta.wmflabs.org
+            os: ubuntu-20.04
           - python-version: 3.7
             family: wpbeta
             code: zh
             domain: zh.wikipedia.beta.wmflabs.org
+          # ubuntu-20.04 required for Python 3.6
+          - python-version: 3.6
+            family: wikipedia
+            code: test
+            domain: test.wikipedia.org
+            os: ubuntu-20.04
 
     steps:
     - name: Checkout Repository
@@ -100,7 +103,6 @@
         PYWIKIBOT_TEST_OAUTH: ${{ secrets[format('{0}', steps.token.outputs.uppercase)] }}
       run: |
         python pwb.py version
-        coverage run -m unittest -vv tests/site_login_logout_tests.py
         coverage run -m unittest -vv tests/oauth_tests.py
 
     - name: Upload coverage to Codecov
diff --git a/.github/workflows/pywikibot-ci.yml b/.github/workflows/pywikibot-ci.yml
index cb734b5..8fb7e0c 100644
--- a/.github/workflows/pywikibot-ci.yml
+++ b/.github/workflows/pywikibot-ci.yml
@@ -23,10 +23,10 @@
 
     strategy:
       fail-fast: false
-      max-parallel: 15
+      max-parallel: 16
 
       matrix:
-        python-version: ["pypy3.7", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12.0-alpha - 3.12.0"]
+        python-version: ["pypy3.7", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12.0-alpha - 3.12.0"]
         site: ['wikipedia:en', 'wikisource:zh']
         test_prod_only: [true]
         include:
@@ -35,11 +35,13 @@
             family: wpbeta
             code: en
             experimental: true
+            os: ubuntu-20.04
           - python-version: 3.6
             site: False
             family: wpbeta
             code: zh
             experimental: true
+            os: ubuntu-20.04
           - python-version: 3.8
             site: wsbeta:en
             experimental: true
@@ -53,12 +55,22 @@
             test_no_rc: true
           - python-version: 3.6
             site: wikidata:wikidata
+            os: ubuntu-20.04
           - python-version: 3.8
             site: wowwiki:uk
             experimental: true
           - python-version: 3
             site: wikipedia:de
             os: macOS-latest
+          # ubuntu-20.04 required for Python 3.6
+          - python-version: 3.6
+            site: wikipedia:en
+            test_prod_only: true
+            os: ubuntu-20.04
+          - python-version: 3.6
+            site: wikisource:zh
+            test_prod_only: true
+            os: ubuntu-20.04
 
     steps:
     - name: Checkout Repository

