chore: move to new subscription (#661)

* chore: move to new subscription
microsoft · Aug 23, 2019 · 1e186ad · 1e186ad
1 parent 360f2f7
commit 1e186ad
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/pipeline.yaml b/pipeline.yaml
@@ -36,7 +36,7 @@ jobs:
   - task: AzureCLI@1
     displayName: 'Style Check'
     inputs:
-      azureSubscription: 'Findable Incubation(ca9d21ff-2a46-4e8b-bf06-8d65242342e5)'
+      azureSubscription: 'MMLSpark Connection'
       scriptLocation: inlineScript
       inlineScript: 'sbt scalastyle test:scalastyle it:scalastyle'
 
@@ -51,7 +51,7 @@ jobs:
       displayName: Create Anaconda environment
     - task: AzureKeyVault@1
       inputs:
-        azureSubscription: 'Findable Incubation(ca9d21ff-2a46-4e8b-bf06-8d65242342e5)'
+        azureSubscription: 'MMLSpark Connection'
         keyVaultName: mmlspark-keys
     - bash: |
         source activate mmlspark
@@ -78,7 +78,7 @@ jobs:
     - task: AzureCLI@1
       displayName: 'E2E'
       inputs:
-        azureSubscription: 'Findable Incubation(ca9d21ff-2a46-4e8b-bf06-8d65242342e5)'
+        azureSubscription:  'MMLSpark Connection'
         scriptLocation: inlineScript
         inlineScript: 'sbt it:test'
       condition: and(succeeded(), eq(variables.runTests, 'True'))
@@ -102,7 +102,7 @@ jobs:
     - task: Docker@2
       displayName: Demo Image Build
       inputs:
-        containerRegistry: 'mmlsparkmcr-connection'
+        containerRegistry: 'mmlsparkmcr-connection-new'
         repository: 'public/mmlspark/build-demo'
         command: 'build'
         buildContext: "."
@@ -112,14 +112,14 @@ jobs:
     - task: Docker@2
       displayName: Demo Image Push
       inputs:
-        containerRegistry: 'mmlsparkmcr-connection'
+        containerRegistry: 'mmlsparkmcr-connection-new'
         repository: 'public/mmlspark/build-demo'
         command: 'push'
         tags: $(version)
     - task: Docker@2
       displayName: Minimal Image Build + Push
       inputs:
-        containerRegistry: 'mmlsparkmcr-connection'
+        containerRegistry: 'mmlsparkmcr-connection-new'
         repository: 'public/mmlspark/build-minimal'
         command: 'build'
         buildContext: "."
@@ -129,15 +129,15 @@ jobs:
     - task: Docker@2
       displayName: Minimal Image Build + Push
       inputs:
-        containerRegistry: 'mmlsparkmcr-connection'
+        containerRegistry: 'mmlsparkmcr-connection-new'
         repository: 'public/mmlspark/build-minimal'
         command: 'push'
         tags: $(version)
     - task: Docker@2
       condition: startsWith(variables['gittag'], 'v')
       displayName: Release Image Build
       inputs:
-        containerRegistry: 'mmlsparkmcr-connection'
+        containerRegistry: 'mmlsparkmcr-connection-new'
         repository: 'public/mmlspark/release'
         command: 'build'
         buildContext: "."
@@ -150,7 +150,7 @@ jobs:
       condition: startsWith(variables['gittag'], 'v')
       displayName: Release Image Push
       inputs:
-        containerRegistry: 'mmlsparkmcr-connection'
+        containerRegistry: 'mmlsparkmcr-connection-new'
         repository: 'public/mmlspark/release'
         command: 'push'
         tags: |
@@ -205,13 +205,13 @@ jobs:
     - task: AzureCLI@1
       displayName: 'Generate Codecov report'
       inputs:
-        azureSubscription: 'Findable Incubation(ca9d21ff-2a46-4e8b-bf06-8d65242342e5)'
+        azureSubscription: 'MMLSpark Connection'
         scriptLocation: inlineScript
         inlineScript: 'sbt coverageReport'
       condition: succeededOrFailed()
     - task: AzureKeyVault@1
       inputs:
-        azureSubscription: 'Findable Incubation(ca9d21ff-2a46-4e8b-bf06-8d65242342e5)'
+        azureSubscription: 'MMLSpark Connection'
         keyVaultName: mmlspark-keys
       condition: succeededOrFailed()
     - bash: |
@@ -273,7 +273,7 @@ jobs:
     - task: AzureCLI@1
       displayName: 'Setup repo'
       inputs:
-        azureSubscription: 'Findable Incubation(ca9d21ff-2a46-4e8b-bf06-8d65242342e5)'
+        azureSubscription: 'MMLSpark Connection'
         scriptLocation: inlineScript
         inlineScript: |
           (timeout 30s pip install requests) || (echo "retrying" && timeout 30s pip install requests)
@@ -282,7 +282,7 @@ jobs:
       displayName: 'Unit Test'
       timeoutInMinutes: 60
       inputs:
-        azureSubscription: 'Findable Incubation(ca9d21ff-2a46-4e8b-bf06-8d65242342e5)'
+        azureSubscription: 'MMLSpark Connection'
         scriptLocation: inlineScript
         inlineScript: |
           (timeout 20m sbt coverage "testOnly com.microsoft.ml.spark.$(PACKAGE).**") ||
@@ -298,13 +298,13 @@ jobs:
     - task: AzureCLI@1
       displayName: 'Generate Codecov report'
       inputs:
-        azureSubscription: 'Findable Incubation(ca9d21ff-2a46-4e8b-bf06-8d65242342e5)'
+        azureSubscription: 'MMLSpark Connection'
         scriptLocation: inlineScript
         inlineScript: 'sbt coverageReport'
       condition: succeededOrFailed()
     - task: AzureKeyVault@1
       inputs:
-        azureSubscription: 'Findable Incubation(ca9d21ff-2a46-4e8b-bf06-8d65242342e5)'
+        azureSubscription: 'MMLSpark Connection'
         keyVaultName: mmlspark-keys
       condition: succeededOrFailed()
     - bash: |

diff --git a/project/Secrets.scala b/project/Secrets.scala
@@ -9,7 +9,7 @@ import sbt.{SettingKey, TaskKey}
 
 object Secrets {
   private val kvName = "mmlspark-keys"
-  private val subscriptionID = "ca9d21ff-2a46-4e8b-bf06-8d65242342e5"
+  private val subscriptionID = "ce1dee05-8cf6-4ad6-990a-9c80868800ba"
 
   protected def exec(command: String): String = {
     val os = sys.props("os.name").toLowerCase

diff --git a/src/it/scala/com/microsoft/ml/nbtest/DatabricksUtilities.scala b/src/it/scala/com/microsoft/ml/nbtest/DatabricksUtilities.scala
@@ -33,12 +33,12 @@ import scala.concurrent.blocking
 object DatabricksUtilities extends HasHttpClient {
 
   // ADB Info
-  val region = "southcentralus"
+  val region = "eastus2"
   val token: String = sys.env.getOrElse("MML_ADB_TOKEN", Secrets.AdbToken)
   val authValue: String = "Basic " + BaseEncoding.base64()
     .encode(("token:" + token).getBytes("UTF-8"))
   val baseURL = s"https://$region.azuredatabricks.net/api/2.0/"
-  val clusterName = "Test Cluster 2"
+  val clusterName = "Test Cluster"
   lazy val clusterId: String = getClusterIdByName(clusterName)
 
   val folder = s"/MMLSparkBuild/build_${BuildInfo.version}"

diff --git a/src/test/scala/com/microsoft/ml/spark/Secrets.scala b/src/test/scala/com/microsoft/ml/spark/Secrets.scala
@@ -14,7 +14,7 @@ import DefaultJsonProtocol._
 
 object Secrets {
   private val KvName = "mmlspark-keys"
-  private val SubscriptionID = "ca9d21ff-2a46-4e8b-bf06-8d65242342e5"
+  private val SubscriptionID = "ce1dee05-8cf6-4ad6-990a-9c80868800ba"
 
   protected def exec(command: String): String = {
     val os = sys.props("os.name").toLowerCase