From c7a100e018368f608dd2dcdeb0c2e71ca431275e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Grzegorz=20=C5=9Aliwi=C5=84ski?= <g.sliwinski@clearcode.cc>
Date: Fri, 15 Mar 2024 11:59:18 +0100
Subject: [PATCH] Run tests against newer elasticsearch versions

---
 .github/workflows/tests.yml | 65 ++++++++++++++-----------------------
 newsfragments/610.misc.rst  |  1 +
 2 files changed, 25 insertions(+), 41 deletions(-)
 create mode 100644 newsfragments/610.misc.rst

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 1866a76..acce1de 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -7,24 +7,7 @@ on:
     branches: [ main ]
 
 jobs:
-  tests_8_9:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-      matrix:
-        python-version: [3.8, 3.9, "3.10", "3.11", "3.12", pypy-3.9]
-    env:
-      OS: ubuntu-latest
-      PYTHON: ${{ matrix.python-version }}
-      ES_JAVA_OPTS: "-Xms256m -Xmx512m"
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/pytest
-        with:
-          python-version: ${{ matrix.python-version }}
-          elasticsearch: "8.9"
-  tests_8_8:
-    needs: [tests_8_9]
+  tests_8_12:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
@@ -39,14 +22,14 @@ jobs:
       - uses: ./.github/actions/pytest
         with:
           python-version: ${{ matrix.python-version }}
-          elasticsearch: "8.8"
-  tests_8_7:
-    needs: [tests_8_8]
+          elasticsearch: "8.12"
+  tests_8_11:
+    needs: [tests_8_12]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
       matrix:
-        python-version: [3.9, "3.10", "3.11", "3.12"]
+        python-version: [3.9, "3.10", "3.11", "3.12", pypy-3.9]
     env:
       OS: ubuntu-latest
       PYTHON: ${{ matrix.python-version }}
@@ -56,14 +39,14 @@ jobs:
       - uses: ./.github/actions/pytest
         with:
           python-version: ${{ matrix.python-version }}
-          elasticsearch: "8.6"
-  tests_8_6:
-    needs: [tests_8_7]
+          elasticsearch: "8.11"
+  tests_8_10:
+    needs: [tests_8_11]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
       matrix:
-        python-version: ["3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12", pypy-3.9]
     env:
       OS: ubuntu-latest
       PYTHON: ${{ matrix.python-version }}
@@ -73,14 +56,14 @@ jobs:
       - uses: ./.github/actions/pytest
         with:
           python-version: ${{ matrix.python-version }}
-          elasticsearch: "8.6"
-  tests_8_5:
-    needs: [tests_8_7]
+          elasticsearch: "8.10"
+  tests_8_9:
+    needs: [tests_8_10]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
       matrix:
-        python-version: ["3.10", "3.11", "3.12"]
+        python-version: ["3.12"]
     env:
       OS: ubuntu-latest
       PYTHON: ${{ matrix.python-version }}
@@ -90,14 +73,14 @@ jobs:
       - uses: ./.github/actions/pytest
         with:
           python-version: ${{ matrix.python-version }}
-          elasticsearch: "8.5"
-  tests_8_4:
-    needs: [tests_8_7]
+          elasticsearch: "8.9"
+  tests_8_8:
+    needs: [tests_8_10]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
       matrix:
-        python-version: ["3.11", "3.12"]
+        python-version: ["3.12"]
     env:
       OS: ubuntu-latest
       PYTHON: ${{ matrix.python-version }}
@@ -107,14 +90,14 @@ jobs:
       - uses: ./.github/actions/pytest
         with:
           python-version: ${{ matrix.python-version }}
-          elasticsearch: "8.4"
-  tests_8_3:
-    needs: [tests_8_7]
+          elasticsearch: "8.8"
+  tests_8_7:
+    needs: [tests_8_10]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
       matrix:
-        python-version: ["3.11", "3.12"]
+        python-version: ["3.12"]
     env:
       OS: ubuntu-latest
       PYTHON: ${{ matrix.python-version }}
@@ -124,9 +107,9 @@ jobs:
       - uses: ./.github/actions/pytest
         with:
           python-version: ${{ matrix.python-version }}
-          elasticsearch: "8.3"
+          elasticsearch: "8.7"
   tests_8_0:
-    needs: [tests_8_7]
+    needs: [tests_8_10]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
@@ -147,7 +130,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        python-version: [3.8, 3.9, "3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12"]
     env:
       OS: ubuntu-latest
       PYTHON: ${{ matrix.python-version }}
diff --git a/newsfragments/610.misc.rst b/newsfragments/610.misc.rst
new file mode 100644
index 0000000..eb5248e
--- /dev/null
+++ b/newsfragments/610.misc.rst
@@ -0,0 +1 @@
+Run tests on CI Against Elasticsearch 8.12, 8.11 and 8.10
\ No newline at end of file