From 20a96bdaf56226caa98a88059238fae0fb4eb7d5 Mon Sep 17 00:00:00 2001 From: Justin Canas Date: Thu, 1 Feb 2024 11:44:34 -0800 Subject: [PATCH 1/3] [IA-4569] Update to new testing mrg (#4156) Co-authored-by: jdcanas --- .github/workflows/azure_automation_test.yml | 4 ++-- .../dsde/workbench/leonardo/LeonardoAzureSuite.scala | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/azure_automation_test.yml b/.github/workflows/azure_automation_test.yml index 99e3df7d062..e359d58af48 100644 --- 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/automation/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/LeonardoAzureSuite.scala b/automation/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/LeonardoAzureSuite.scala index c2d0210953b..6060a5f7f35 100644 --- a/automation/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/LeonardoAzureSuite.scala +++ b/automation/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 = { From 5170b2311b748cfe90d513ddcaa187f87c71844e Mon Sep 17 00:00:00 2001 From: Broad Bot <61600560+broadbot@users.noreply.github.com> Date: Thu, 1 Feb 2024 16:18:23 -0500 Subject: [PATCH 2/3] WX-1453: Update cromwell-runner-app version to 0.82.0 (#4177) --- http/src/main/resources/reference.conf | 2 +- .../dsde/workbench/leonardo/http/ConfigReaderSpec.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/http/src/main/resources/reference.conf b/http/src/main/resources/reference.conf index 0f6c073fb98..7557ec069e5 100644 --- 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 index 1e2aec260e6..b01cd4bbdfc 100644 --- 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"), From c4914c3afe8757856400e51da346c4e11f31cf5d Mon Sep 17 00:00:00 2001 From: Justin Canas Date: Thu, 1 Feb 2024 15:11:58 -0800 Subject: [PATCH 3/3] [IA-3982] Cutover from Jenkins to GHA for build/test/deploy (#4178) Co-authored-by: jdcanas --- .github/workflows/leo-build-tag-publish-and-run-tests.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/leo-build-tag-publish-and-run-tests.yml b/.github/workflows/leo-build-tag-publish-and-run-tests.yml index e393b587098..e1a2135300d 100644 --- 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'