[QOLDEV-1011] pin Solr test container versions for each environment

qld-gov-au · Dec 17, 2024 · db31f05 · db31f05
1 parent 176c6b9
commit db31f05
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -26,9 +26,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ckan-version: ["2.11", "2.10", 2.9]
-        experimental: [false]
         include:
+          - ckan-version: "2.11"
+            solr-version: 9
+            experimental: false
+          - ckan-version: "2.10"
+            solr-version: 8
+            experimental: false
+          - ckan-version: 2.9
+            solr-version: 8
+            experimental: false
           - ckan-version: 'master'
             experimental: true  #master is unstable, good to know if we are compatible or not
 
@@ -37,6 +44,7 @@ jobs:
     container: drevops/ci-runner:23.12.0
     env:
       CKAN_VERSION: ${{ matrix.ckan-version }}
+      SOLR_VERSION: ${{ matrix.solr-version }}
 
     steps:
       # Patch https://github.com/actions/runner/issues/863

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -63,7 +63,7 @@ services:
       - default
 
   solr:
-    image: ckan/ckan-solr:${CKAN_VERSION}-solr9
+    image: ckan/ckan-solr:${CKAN_VERSION}-solr${SOLR_VERSION}
     ports:
       - "8983"
     environment:
-Original file line number
+Diff line change
@@ Expand Up / @@ -63,7 +63,7 @@ services: @@
           - default
       solr:
-        image: ckan/ckan-solr:${CKAN_VERSION}-solr9
+        image: ckan/ckan-solr:${CKAN_VERSION}-solr${SOLR_VERSION}
         ports:
           - "8983"
         environment:
@@ Expand Down @@