Merge branch 'develop' into gcp-batch-backend-execution-actor-test

.github/workflows/integration_tests.yml

@@ -32,12 +32,30 @@ jobs:
       matrix:
         # Batch test fixes to land later
         include:
-          - build_type: centaurGcpBatch
+          - build_type: centaurPapiV2beta
+            build_mysql: 5.6
+            friendly_name: Life Sciences, MySQL 5.6 (current Terra production)
+          - build_type: centaurPapiV2beta
             build_mysql: 5.7
-            friendly_name: Centaur GCP Batch with MySQL 5.7
+            friendly_name: Life Sciences, MySQL 5.7
+          - build_type: centaurPapiV2beta
+            build_mysql: 8.0
+            friendly_name: Life Sciences, MySQL 8.0 (required Terra production)
           - build_type: centaurPapiV2beta
+            build_mysql: 8.4
+            friendly_name: Life Sciences, MySQL 8.4 (aspirational Terra production)
+          - build_type: centaurGcpBatch
+            build_mysql: 5.6
+            friendly_name: GCP Batch, MySQL 5.6
+          - build_type: centaurGcpBatch
             build_mysql: 5.7
-            friendly_name: Centaur Papi V2 Beta with MySQL 5.7
+            friendly_name: GCP Batch, MySQL 5.7
+          - build_type: centaurGcpBatch
+            build_mysql: 8.0
+            friendly_name: GCP Batch, MySQL 8.0
+          - build_type: centaurGcpBatch
+            build_mysql: 8.4
+            friendly_name: GCP Batch, MySQL 8.4
           - build_type: centaurPapiV2betaRestart
             build_mysql: 5.7
             friendly_name: Centaur Papi V2 Beta (restart)

.gitignore

@@ -40,7 +40,6 @@ scripts/docker-compose-mysql/compose/mysql/data
 # Vault rendered resources
 artifactory_credentials.properties
 aws_credentials
-centaur_secure.inc.conf
 cromwell-centaur-requester-pays-service-account.json
 cromwell-centaur-service-account.json
 cromwell-service-account.json

CHANGELOG.md

@@ -33,7 +33,7 @@ be found [here](https://cromwell.readthedocs.io/en/stable/backends/HPC/#optional
 - Fixes the reference disk feature.
 - Fixes pulling Docker image metadata from private GCR repositories.
 - Fixed `google_project` and `google_compute_service_account` workflow options not taking effect when using GCP Batch backend
-- Added a way to use a custom LogsPolicy for the job execution, setting `backend.providers.batch.config.batch.logs-policy` to "CLOUD_LOGGING" (default) keeps the current behavior, or, set it to "PATH" to save the logs into the the mounted disk, at the end, this log file gets copied to the google cloud storage bucket with "task.log" as the name.
+- Added a way to use a custom LogsPolicy for the job execution, setting `backend.providers.batch.config.batch.logs-policy` to "CLOUD_LOGGING" (default) keeps the current behavior, or, set it to "PATH" to stream the logs to Google Cloud Storage.
 - When "CLOUD_LOGGING" is used, many more Cromwell / WDL labels for workflow, root workflow, call, shard etc. are now assigned to GCP Batch log entries.
 - Fixed subnet selection for networks that use custom subnet creation