Skip to content

Commit d7bcc73

Browse files
authored
Add TestMode to Test Archetype with Live Default (Azure#19587)
Add TestMode parameter to test archetype template and removed AZURE_TEST_MODE env var configuration in tests.ymls
1 parent 5117870 commit d7bcc73

File tree

23 files changed

+10
-30
lines changed

23 files changed

+10
-30
lines changed

eng/pipelines/templates/jobs/archetype-sdk-tests.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ parameters:
88
PreSteps: []
99
PostSteps: []
1010
TimeoutInMinutes: 60
11+
TestMode: ''
1112
TestStepMavenInputs: {}
1213
TestResultsFiles: ''
1314
CloudConfig: {}
@@ -45,7 +46,7 @@ jobs:
4546
- template: /eng/common/pipelines/templates/steps/verify-agent-os.yml
4647
parameters:
4748
AgentImage: $(OSVmImage)
48-
49+
4950
- ${{ if ne(parameters.DisableAzureResourceCreation, 'true') }}:
5051
- ${{ if parameters.TestResourceDirectories }}:
5152
- ${{ each directory in parameters.TestResourceDirectories }}:
@@ -109,7 +110,10 @@ jobs:
109110
inputs:
110111
mavenPomFile: pom.xml
111112
${{ insert }}: ${{ parameters.TestStepMavenInputs }}
112-
env: ${{ parameters.EnvVars }}
113+
env:
114+
AZURE_TEST_MODE: ${{ parameters.TestMode }}
115+
${{ each var in parameters.EnvVars }}:
116+
${{ var.key }}: ${{ var.value }}
113117

114118
- ${{ parameters.PostSteps }}
115119

eng/pipelines/templates/stages/archetype-sdk-tests.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ parameters:
5656
- name: TestSetupSteps
5757
type: stepList
5858
default: []
59+
- name: TestMode
60+
type: string
61+
default: 'LIVE'
5962
- name: TestStepMavenInputs
6063
type: object
6164
default:
@@ -128,6 +131,7 @@ stages:
128131
ServiceDirectory: ${{ parameters.ServiceDirectory }}
129132
TestResourceDirectories: ${{ parameters.TestResourceDirectories }}
130133
TestSetupSteps: ${{ parameters.TestSetupSteps }}
134+
TestMode: ${{ parameters.TestMode }}
131135
TestStepMavenInputs: ${{ parameters.TestStepMavenInputs }}
132136
Artifacts: ${{ parameters.Artifacts }}
133137
AdditionalModules: ${{ parameters.AdditionalModules }}

sdk/anomalydetector/azure-ai-anomalydetector/tests.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,3 @@ stages:
88
- name: azure-ai-anomalydetector
99
groupId: com.azure
1010
safeName: azureaianomalydetector
11-
EnvVars:
12-
AZURE_TEST_MODE: RECORD

sdk/appconfiguration/tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ stages:
1010
safeName: azurespringcloudtestappconfigurationconfig
1111
TimeoutInMinutes: 90
1212
EnvVars:
13-
AZURE_TEST_MODE: RECORD
1413
AZURE_APPCONFIG_CONNECTION_STRING: $(AZURE_APPCONFIG_CONNECTION_STRING)
1514
AZURE_CLIENT_ID: $(aad-azure-sdk-test-client-id)
1615
AZURE_CLIENT_SECRET: $(aad-azure-sdk-test-client-secret)

sdk/attestation/tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ stages:
1010
groupId: com.azure
1111
safeName: azuresecurityattestation
1212
EnvVars:
13-
AZURE_TEST_MODE: RECORD
1413
AZURE_CLIENT_ID: $(aad-azure-sdk-test-client-id)
1514
AZURE_TENANT_ID: $(aad-azure-sdk-test-tenant-id)
1615
AZURE_CLIENT_SECRET: $(aad-azure-sdk-test-client-secret)

sdk/batch/tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ stages:
99
groupId: com.microsoft.azure
1010
safeName: azurebatch
1111
EnvVars:
12-
AZURE_TEST_MODE: RECORD # RECORD mode hits live services
1312
AZURE_BATCH_ACCOUNT: $(java-batch-test-account-name)
1413
AZURE_BATCH_ACCESS_KEY: $(java-batch-test-account-access-key)
1514
STORAGE_ACCOUNT_KEY: $(java-batch-test-storage-account-key)

sdk/communication/tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ stages:
4343
reportDirectory: sdk/communication/target/site/jacoco-aggregate/
4444
failIfCoverageEmpty: false
4545
EnvVars:
46-
AZURE_TEST_MODE: LIVE
4746
SKIP_PHONENUMBER_INTEGRATION_TESTS: TRUE
4847
SKIP_LIVE_TEST: TRUE
4948
AZURE_SUBSCRIPTION_ID: $(acs-subscription-id)

sdk/cosmos/tests.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ stages:
4444
groupId: com.azure
4545
safeName: azurespringdatacosmostest
4646
TimeoutInMinutes: 90
47-
EnvVars:
48-
AZURE_TEST_MODE: LIVE
4947
PreSteps:
5048
- template: /eng/pipelines/templates/steps/install-reporting-tools.yml
5149
PostSteps:

sdk/eventgrid/tests.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ stages:
66
ServiceDirectory: eventgrid
77
TimeoutInMinutes: 60
88
MaxParallel: 7
9-
EnvVars:
10-
AZURE_TEST_MODE: RECORD
119
Artifacts:
1210
- name: azure-messaging-eventgrid
1311
groupId: com.azure

sdk/eventhubs/tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,4 @@ stages:
1414
TimeoutInMinutes: 120
1515
Clouds: 'Public,Canary'
1616
EnvVars:
17-
AZURE_TEST_MODE: RECORD
1817
AZURE_LOG_LEVEL: 2

0 commit comments

Comments
 (0)