From 25b59bb5a1163124bd79f17e6702c063faef5905 Mon Sep 17 00:00:00 2001
From: dmunozv04 <39565245+dmunozv04@users.noreply.github.com>
Date: Tue, 9 Jan 2024 11:48:16 +0100
Subject: [PATCH] Add 3.10 and 3.11 to testing matrix and remove 3.6

---
 .github/workflows/tests.yml | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 7c374b1a2..06781778e 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -14,7 +14,7 @@ jobs:
 
   js-unit-tests:
 
-    runs-on: ubuntu-20.04 #Allows to run 3.6 tests (https://github.com/actions/setup-python/issues/544)
+    runs-on: ubuntu-20.04
 
     steps:
       - uses: actions/checkout@v2
@@ -38,12 +38,14 @@ jobs:
 
   build:
 
-    runs-on: ubuntu-20.04 #Allows to run 3.6 tests (https://github.com/actions/setup-python/issues/544)
+    runs-on: ubuntu-20.04
 
     steps:
       - uses: actions/checkout@v2
       - name: Use Python
         uses: actions/setup-python@v2
+        with:
+          python-version: "3.11" # Disutils doesn't exist anymore in Python 3.12
       - name: Build
         working-directory: ./src
         run: ./setup.py bdist_wheel
@@ -65,15 +67,17 @@ jobs:
           - "2.1"
           - "2.2"
         python-version:
-          - "3.6"
+          #- "3.6"
           - "3.7"
           - "3.8"
           - "3.9"
+          - "3.10"
+          - "3.11"
 
     steps:
       - name: Setup PostgreSQL
         run: |
-          docker run -e POSTGRES_DB=postgres -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=wirecloud -d -p 5432:5432 postgres:latest
+          docker run --rm -e POSTGRES_DB=postgres -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=wirecloud -d -p 5432:5432 --name postgres-wirecloud postgres:latest
       - uses: actions/checkout@v2
       - name: Use Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2
@@ -113,19 +117,21 @@ jobs:
     steps:
       - name: Setup PostgreSQL
         run: |
-          docker run -e POSTGRES_DB=postgres -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=wirecloud -d -p 5432:5432 postgres:latest
+          docker run --rm -e POSTGRES_DB=postgres -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=wirecloud -d -p 5432:5432 --name postgres-wirecloud postgres:latest
       - uses: actions/checkout@v2
       - name: Use Python
         uses: actions/setup-python@v2
+        with:
+          python-version: "3.11"
       - name: Use Elasticsearch
         working-directory: ./src
         run: |
-          docker run -p 9200:9200 --rm -d elasticsearch:2.4
+          docker run -p 9200:9200 --rm -d --name elasticsearch-wirecloud elasticsearch:2.4
         if: ${{ matrix.engine == 'Elasticsearch' }}
       - name: Use Solr
         working-directory: ./src
         run: |
-          docker run -p 8983:8983 --rm --name solr -d solr:6
+          docker run -p 8983:8983 --rm --name solr-wirecloud -d solr:6
         if: ${{ matrix.engine == 'Solr' }}
       - name: Setup and run tests
         working-directory: ./src
@@ -143,10 +149,10 @@ jobs:
             cat ci_scripts/templates/solr-conf.template >> settings.py
             mkdir solr_conf
             python manage.py build_solr_schema --configure-directory solr_conf
-            docker exec --user=solr solr bin/solr create -c tester -n basic_config
-            docker exec solr rm -f /opt/solr/server/solr/tester/conf/managed-schema.xml
-            docker cp solr_conf/schema.xml solr:/opt/solr/server/solr/tester/conf/
-            docker cp solr_conf/solrconfig.xml solr:/opt/solr/server/solr/tester/conf/
+            docker exec --user=solr solr-wirecloud bin/solr create -c tester -n basic_config
+            docker exec solr-wirecloud rm -f /opt/solr/server/solr/tester/conf/managed-schema.xml
+            docker cp solr_conf/schema.xml solr-wirecloud:/opt/solr/server/solr/tester/conf/
+            docker cp solr_conf/solrconfig.xml solr-wirecloud:/opt/solr/server/solr/tester/conf/
 
             # Reload the Solr core
             curl "http://localhost:8983/solr/admin/cores?action=RELOAD&core=tester"
@@ -169,16 +175,18 @@ jobs:
     steps:
       - name: Setup PostgreSQL
         run: |
-          docker run -e POSTGRES_DB=postgres -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=wirecloud -d -p 5432:5432 postgres:latest
+          docker run --rm -e POSTGRES_DB=postgres -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=wirecloud -d -p 5432:5432 --name postgres-wirecloud postgres:latest
       - name: Use Geckodriver
         uses: browser-actions/setup-geckodriver@latest
       - uses: actions/checkout@v2
       - name: Use Python
         uses: actions/setup-python@v2
+        with:
+          python-version: "3.11"
       - name: Use Elasticsearch
         working-directory: ./src
         run: |
-          docker run -p 9200:9200 --rm -d elasticsearch:2.4
+          docker run -p 9200:9200 --rm -d --name elasticsearch-wirecloud elasticsearch:2.4
       - name: Setup and run tests
         working-directory: ./src
         env: