update helm override specs

DataBiosphere · Dec 26, 2024 · ae716da · ae716da
1 parent 59e0cc6
commit ae716da
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/...rc/test/scala/org/broadinstitute/dsde/workbench/leonardo/app/CromwellAppInstallSpec.scala b/...rc/test/scala/org/broadinstitute/dsde/workbench/leonardo/app/CromwellAppInstallSpec.scala
@@ -51,9 +51,18 @@ class CromwellAppInstallSpec extends BaseAppInstallSpec {
       "config.subscriptionId=sub," +
       s"config.region=${azureRegion}," +
       "config.applicationInsightsConnectionString=applicationInsightsConnectionString," +
+      s"config.azureEnvironment=${ConfigReader.appConfig.azure.hostingModeConfig.azureEnvironment}" +
+      s"config.azureManagementTokenScope=${AzureEnvironmentConverter
+      .fromString(ConfigReader.appConfig.azure.hostingModeConfig.azureEnvironment)
+      .getResourceManagerEndpoint}.default" +
+      s"config.batchAccountSuffix=${AzureEnvironmentConverter
+      .batchAccountSuffixFromString(ConfigReader.appConfig.azure.hostingModeConfig.azureEnvironment)}" +
       "relay.path=https://relay.com/app," +
       "persistence.storageResourceGroup=mrg," +
       "persistence.storageAccount=storage," +
+      s"persistence.storageAccountSuffix=${AzureEnvironmentConverter
+        .fromString(ConfigReader.appConfig.azure.hostingModeConfig.azureEnvironment)
+        .getStorageEndpointSuffix}" +
       "persistence.blobContainer=sc-container," +
       "persistence.leoAppInstanceName=app1," +
       s"persistence.workspaceManager.url=${ConfigReader.appConfig.azure.wsm.uri.renderString}," +
@@ -108,9 +117,18 @@ class CromwellAppInstallSpec extends BaseAppInstallSpec {
       "config.subscriptionId=sub," +
       s"config.region=${azureRegion}," +
       "config.applicationInsightsConnectionString=applicationInsightsConnectionString," +
+      s"config.azureEnvironment=${ConfigReader.appConfig.azure.hostingModeConfig.azureEnvironment}" +
+      s"config.azureManagementTokenScope=${AzureEnvironmentConverter
+        .fromString(ConfigReader.appConfig.azure.hostingModeConfig.azureEnvironment)
+        .getResourceManagerEndpoint}.default" +
+      s"config.batchAccountSuffix=${AzureEnvironmentConverter
+        .batchAccountSuffixFromString(ConfigReader.appConfig.azure.hostingModeConfig.azureEnvironment)}" +
       "relay.path=https://relay.com/app," +
       "persistence.storageResourceGroup=mrg," +
       "persistence.storageAccount=storage," +
+      s"persistence.storageAccountSuffix=${AzureEnvironmentConverter
+        .fromString(ConfigReader.appConfig.azure.hostingModeConfig.azureEnvironment)
+        .getStorageEndpointSuffix}" +
       "persistence.blobContainer=sc-container," +
       "persistence.leoAppInstanceName=app1," +
       s"persistence.workspaceManager.url=${ConfigReader.appConfig.azure.wsm.uri.renderString}," +

diff --git a/...t/scala/org/broadinstitute/dsde/workbench/leonardo/app/CromwellRunnerAppInstallSpec.scala b/...t/scala/org/broadinstitute/dsde/workbench/leonardo/app/CromwellRunnerAppInstallSpec.scala
@@ -43,8 +43,17 @@ class CromwellRunnerAppInstallSpec extends BaseAppInstallSpec {
     "config.subscriptionId=sub," +
     s"config.region=${azureRegion}," +
     "config.applicationInsightsConnectionString=applicationInsightsConnectionString," +
+    s"config.azureEnvironment=${ConfigReader.appConfig.azure.hostingModeConfig.azureEnvironment}" +
+    s"config.azureManagementTokenScope=${AzureEnvironmentConverter
+        .fromString(ConfigReader.appConfig.azure.hostingModeConfig.azureEnvironment)
+        .getResourceManagerEndpoint}.default" +
+    s"config.batchAccountSuffix=${AzureEnvironmentConverter
+        .batchAccountSuffixFromString(ConfigReader.appConfig.azure.hostingModeConfig.azureEnvironment)}" +
     "relay.path=https://relay.com/app," +
     "persistence.storageAccount=storage," +
+    s"persistence.storageAccountSuffix=${AzureEnvironmentConverter
+        .fromString(ConfigReader.appConfig.azure.hostingModeConfig.azureEnvironment)
+        .getStorageEndpointSuffix}" +
     "persistence.blobContainer=sc-container," +
     "persistence.leoAppInstanceName=app1," +
     s"persistence.workspaceManager.url=${ConfigReader.appConfig.azure.wsm.uri.renderString}," +
@@ -68,7 +77,9 @@ class CromwellRunnerAppInstallSpec extends BaseAppInstallSpec {
     s"sam.baseUri=https://sam.test.org:443," +
     s"sam.acrPullActionIdentityResourceId=spend-profile," +
     "bard.bardUrl=https://terra-bard-dev.appspot.com," +
-    "bard.enabled=false"
+    "bard.enabled=false" +
+    // TEMPORARY HELM OVERRIDE VALUES WHILE WAITING FOR PR
+    s"cromwell.image=potomacdevap.azurecr.us/broadinstitute/cromwell:84214c9d71721269f9945406d72e30a6f8aac514"
 
   it should "build cromwell-runner override values" in {
     val params = buildHelmOverrideValuesParams(cromwellRunnerAzureDatabases)