Merge branch 'develop' into IA-4590-check-WSM-status

DataBiosphere · Feb 2, 2024 · 1b01d78 · 1b01d78
2 parents 6b89024 + c4914c3
commit 1b01d78
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/azure_automation_test.yml b/.github/workflows/azure_automation_test.yml
@@ -147,8 +147,8 @@ jobs:
           token: ${{ env.TOKEN }}
           inputs: '{
             "run-name": "${{ env.ATTACH_BP_TO_LZ_RUN_NAME }}",
-            "mrg-id": "staticTestingMrg",
-            "landing-zone-id": "f41c1a97-179b-4a18-9615-5214d79ba600",
+            "mrg-id": "e2e-8n6xqg",
+            "landing-zone-id": "c6489e53-85b6-4bf1-ada1-d05f9602315d",
             "bee-name": "${{ env.BEE_NAME }}",
             "billing-project": "${{ needs.params-gen.outputs.project-name }}",
             "billing-project-creator": "${{ needs.init-github-context.outputs.owner-subject }}",

diff --git a/.github/workflows/leo-build-tag-publish-and-run-tests.yml b/.github/workflows/leo-build-tag-publish-and-run-tests.yml
@@ -124,8 +124,7 @@ jobs:
     # Put new Leonardo version in Broad dev environment
     uses: broadinstitute/sherlock/.github/workflows/client-set-environment-app-version.yaml@main
     needs: [ leo-build-tag-publish-job, report-to-sherlock ]
-    if: false # disabled for now, use the below line when ready to cut over from jenkins.
-    # if: ${{ github.ref_name == 'develop' }}
+    if: ${{ github.ref_name == 'develop' }}
     with:
       new-version: ${{ needs.leo-build-tag-publish-job.outputs.tag }}
       chart-name: 'leonardo'

diff --git a/...mation/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/LeonardoAzureSuite.scala b/...mation/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/LeonardoAzureSuite.scala
@@ -23,8 +23,8 @@ trait AzureBilling extends FixtureAnyFreeSpecLike {
   implicit val azureManagedAppCoordinates: AzureManagedAppCoordinates = AzureManagedAppCoordinates(
     UUID.fromString("fad90753-2022-4456-9b0a-c7e5b934e408"),
     UUID.fromString("f557c728-871d-408c-a28b-eb6b2141a087"),
-    "staticTestingMrg",
-    Some(UUID.fromString("f41c1a97-179b-4a18-9615-5214d79ba600"))
+    "e2e-8n6xqg",
+    Some(UUID.fromString("c6489e53-85b6-4bf1-ada1-d05f9602315d"))
   )
 
   override def withFixture(test: OneArgTest): Outcome = {

diff --git a/http/src/main/resources/reference.conf b/http/src/main/resources/reference.conf
@@ -326,7 +326,7 @@ azure {
   cromwell-runner-app-config {
     instrumentation-enabled = false
     chart-name = "terra-helm/cromwell-runner-app"
-    chart-version = "0.76.0"
+    chart-version = "0.82.0"
     release-name-suffix = "cra-rls"
     namespace-name-suffix = "cra-ns"
     ksa-name = "cra-ksa"

diff --git a/http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/http/ConfigReaderSpec.scala b/http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/http/ConfigReaderSpec.scala
@@ -138,7 +138,7 @@ class ConfigReaderSpec extends AnyFlatSpec with Matchers {
         ),
         CromwellRunnerAppConfig(
           ChartName("terra-helm/cromwell-runner-app"),
-          ChartVersion("0.76.0"),
+          ChartVersion("0.82.0"),
           ReleaseNameSuffix("cra-rls"),
           NamespaceNameSuffix("cra-ns"),
           KsaName("cra-ksa"),