From 697a65ed2b95f9c2088d37644bcf0170d8e9dd24 Mon Sep 17 00:00:00 2001
From: JuniorJPDJ <git@juniorjpdj.pl>
Date: Sat, 5 Feb 2022 18:26:10 +0100
Subject: [PATCH] Make Python 3.10 API tests mandatory

---
 .gitlab-ci.yml                           | 23 +++++------------------
 changes/changelog.d/py310-ci.enhancement |  1 +
 2 files changed, 6 insertions(+), 18 deletions(-)
 create mode 100644 changes/changelog.d/py310-ci.enhancement

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ec4f0a77..b54eaef88 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -152,7 +152,7 @@ eslint:
     paths:
       - front/node_modules
 
-.test_api:
+test_api:
   interruptible: true
   services:
     - postgres:14
@@ -183,23 +183,10 @@ eslint:
     reports:
       junit: api/report.xml
       cobertura: api/coverage.xml
-
-test_api_3.7:
-  extends: .test_api
-  image: $CI_REGISTRY/funkwhale/backend-test-docker:3.7
-
-test_api_3.8:
-  extends: .test_api
-  image: $CI_REGISTRY/funkwhale/backend-test-docker:3.8
-
-test_api_3.9:
-  extends: .test_api
-  image: $CI_REGISTRY/funkwhale/backend-test-docker:3.9
-
-test_api_3.10:
-  extends: .test_api
-  image: $CI_REGISTRY/funkwhale/backend-test-docker:3.10
-  allow_failure: true # We do not yet support python 3.10, see #1653
+  parallel:
+    matrix:
+      - PY_VER: ["3.7", "3.8", "3.9", "3.10"]
+  image: $CI_REGISTRY/funkwhale/backend-test-docker:$PY_VER
 
 test_front:
   interruptible: true
diff --git a/changes/changelog.d/py310-ci.enhancement b/changes/changelog.d/py310-ci.enhancement
new file mode 100644
index 000000000..be967f1ff
--- /dev/null
+++ b/changes/changelog.d/py310-ci.enhancement
@@ -0,0 +1 @@
+Make Python 3.10 tests in CI mandatory