Remove subscription parameter

jobs/competitive-test.yml

@@ -45,9 +45,6 @@ parameters:
   values:
   - managed_identity
   - service_connection
-- name: subscription
-  type: string
-  default: ''
 - name: ssh_key_enabled
   type: boolean
   default: true
@@ -68,7 +65,6 @@ jobs:
       test_modules_dir: ${{ parameters.test_modules_dir }}
       retry_attempt_count: ${{ parameters.retry_attempt_count }}
       credential_type: ${{ parameters.credential_type }}
-      subscription: ${{ parameters.subscription }}
       ssh_key_enabled: ${{ parameters.ssh_key_enabled }}
   - template: /steps/provision-resources.yml
     parameters:
@@ -80,7 +76,6 @@ jobs:
       terraform_input_varibles: ${{ parameters.terraform_input_varibles }}
       retry_attempt_count: ${{ parameters.retry_attempt_count }}
       credential_type: ${{ parameters.credential_type }}
-      subscription: ${{ parameters.subscription }}
   - template: /steps/validate-resources.yml
     parameters:
       cloud: ${{ parameters.cloud }}
@@ -102,7 +97,6 @@ jobs:
       regions: ${{ parameters.regions }}
       engine_input: ${{ parameters.engine_input }}
       credential_type: ${{ parameters.credential_type }}
-      subscription: ${{ parameters.subscription }}
   - template: /steps/cleanup-resources.yml
     parameters:
       cloud: ${{ parameters.cloud }}

pipelines/perf-eval/apiserver-benchmark-virtualnodes100-pods10k.yml

@@ -46,11 +46,12 @@ stages:
           ssh_key_enabled: false
   - stage: azure_eastus2_l4
     dependsOn: []
+    variables:
+      AZURE_SUBSCRIPTION_ID: b8ceb4e5-f05b-4562-a9f5-14acb1f24219
     jobs:
       - template: /jobs/competitive-test.yml
         parameters:
           cloud: azure
-          subscription: b8ceb4e5-f05b-4562-a9f5-14acb1f24219
           regions:
             - eastus2
           engine: kperf
@@ -78,11 +79,12 @@ stages:
           ssh_key_enabled: false
   - stage: azure_eastus2_l7
     dependsOn: []
+    variables:
+      AZURE_SUBSCRIPTION_ID: c0d4b923-b5ea-4f8f-9b56-5390a9bf2248
     jobs:
       - template: /jobs/competitive-test.yml
         parameters:
           cloud: azure
-          subscription: c0d4b923-b5ea-4f8f-9b56-5390a9bf2248
           regions:
             - eastus2
           engine: kperf

steps/cloud/azure/upload-storage-account.yml

@@ -5,16 +5,13 @@ parameters:
   container_name: $(SCENARIO_TYPE)
   credential_type: string
   cloud: string
-  subscription: ''
 
 steps:
 - ${{ if or(ne(parameters.cloud, 'azure'), eq(parameters.credential_type, 'service_connection')) }}:
   - template: /steps/cloud/azure/login.yml
     parameters:
       region: eastus
       credential_type: ${{ parameters.credential_type }}
-      ${{ if ne(parameters.subscription, '') }}:
-        subscription: ${{ parameters.subscription }}
 
 - bash: |
     set -eux

steps/provision-resources.yml

@@ -23,9 +23,6 @@ parameters:
 - name: credential_type
   type: string
   default: managed_identity
-- name: subscription
-  type: string
-  default: ''
 
 steps:
 - template: /steps/terraform/set-working-directory.yml
@@ -78,16 +75,12 @@ steps:
     command: version
     retry_attempt_count: ${{ parameters.retry_attempt_count }}
     credential_type: ${{ parameters.credential_type }}
-    ${{ if ne(parameters.subscription, '') }}:
-      subscription: ${{ parameters.subscription }}
 
 - template: /steps/terraform/run-command.yml
   parameters:
     command: init
     retry_attempt_count: ${{ parameters.retry_attempt_count }}
     credential_type: ${{ parameters.credential_type }}
-    ${{ if ne(parameters.subscription, '') }}:
-      subscription: ${{ parameters.subscription }}
 
 - template: /steps/terraform/run-command.yml
   parameters:
@@ -97,5 +90,3 @@ steps:
     cloud: ${{ parameters.cloud }}
     retry_attempt_count: ${{ parameters.retry_attempt_count }}
     credential_type: ${{ parameters.credential_type }}
-    ${{ if ne(parameters.subscription, '') }}:
-      subscription: ${{ parameters.subscription }}

steps/publish-results.yml

@@ -12,9 +12,6 @@ parameters:
   default: {}
 - name: credential_type
   type: string
-- name: subscription
-  type: string
-  default: ''
 
 steps:
 - template: /steps/topology/${{ parameters.topology }}/collect-${{ parameters.engine }}.yml@self
@@ -27,5 +24,3 @@ steps:
   parameters:
     credential_type: ${{ parameters.credential_type }}
     cloud: ${{ parameters.cloud }}
-    ${{ if ne(parameters.subscription, '') }}:
-      subscription: ${{ parameters.subscription }}

steps/setup-tests.yml

@@ -14,9 +14,6 @@ parameters:
   default: 3
 - name: credential_type
   type: string
-- name: subscription
-  type: string
-  default: ''
 - name: ssh_key_enabled
   type: boolean
 
@@ -67,8 +64,6 @@ steps:
   parameters:
     region: ${{ parameters.region }}
     credential_type: ${{ parameters.credential_type }}
-    ${{ if ne(parameters.subscription, '') }}:
-      subscription: ${{ parameters.subscription }}
 
 - script: |
     if [ -n "${TEST_MODULES_DIR}" ]; then

steps/terraform/run-command.yml

@@ -16,9 +16,6 @@ parameters:
 - name: credential_type
   type: string
   default: 'managed_identity'
-- name: subscription
-  type: string
-  default: $(AZURE_SUBSCRIPTION_ID)
 
 steps:
 - script: |
@@ -89,7 +86,7 @@ steps:
   env:
     REGIONS: ${{ convertToJson(parameters.regions) }}
     CLOUD: ${{ parameters.cloud }}
-    ARM_SUBSCRIPTION_ID: ${{ parameters.subscription }}
+    ARM_SUBSCRIPTION_ID: $(AZURE_SUBSCRIPTION_ID)
     ${{ if eq(parameters.credential_type, 'managed_identity') }}:
       ARM_USE_MSI: true
       ARM_TENANT_ID: $(AZURE_MI_TENANT_ID)