[QOLDEV-1005] pin Solr test container version to the environment

- CKAN 2.11 needs Solr 9, older versions need Solr 8
qld-gov-au · Dec 18, 2024 · a582832 · a582832
1 parent d1c1c44
commit a582832
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -26,17 +26,26 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ckan-version: ["2.11", "2.10", 2.9]
-        experimental: [false]
         include:
-          - ckan-version: 'master'
+          - 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"
+            solr-version: 9
             experimental: true  #master is unstable, good to know if we are compatible or not
 
     name: Test on CKAN ${{ matrix.ckan-version }}
     runs-on: ubuntu-latest
     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 @@