Merge pull request #612 from qld-gov-au/QOLDEV-1006-mog-redirects

[QOLDEV-1006] update cookbook
qld-gov-au · Nov 20, 2024 · ae74558 · ae74558
2 parents 8ff4658 + 538bd3e
commit ae74558
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/test-staging.yml b/.github/workflows/test-staging.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   test:
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         application: [OpenData, Publications]
         python-version: [py3]

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   test:
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         application: [OpenData, Publications]
         python-version: [py3]

diff --git a/bin/init-OpenData.sh b/bin/init-OpenData.sh
@@ -30,5 +30,7 @@ if (ckan_cli datarequests --help); then
     fi
 fi
 
-#Initialise the Harvester database tables
-ckan_cli harvester initdb
+#Initialise the Harvester database tables if applicable
+if (ckan_cli harvester initdb --help); then
+    ckan_cli harvester initdb
+fi
diff --git a/vars/CKAN-Stack.var.yml b/vars/CKAN-Stack.var.yml
@@ -40,7 +40,7 @@ common_stack: &common_stack
     EnableDataStore: "{{ enable_datastore | default('no') }}"
     SSMKey: "{{ SSMKey | default('') }}"
     DefaultEC2Key: "{{ lookup('aws_ssm', '/config/CKAN/ec2KeyPair', region=region) }}"
-    CookbookRevision: "{{ CookbookRevision | default('8.0.0') }}"
+    CookbookRevision: "{{ CookbookRevision | default('9.0.0') }}"
     LogBucketName: "{{ lookup('aws_ssm', '/config/CKAN/s3LogsBucket', region=region) }}"
     AttachmentsBucketName: "{{ lookup('aws_ssm', '/config/CKAN/' + Environment + '/app/' + service_name_lower + '/s3AttachmentBucket', region=region) }}" #/config/CKAN/PROD/app/opendata/s3AttachmentBucket
     SolrSource: "{{ solr_url }}"