Skip to content

Commit 3e1a752

Browse files
authored
Incorporate common sub config changes to live testing (Azure#23240)
* Incorporate common sub config changes to live testing * Remove federated auth field from sdk yaml files * Default federated auth mode to true in pipeline templates * Remove secret based sub configs from yaml template * Fix fed auth defaults for ci testing * Fix missing service connection in overridden cloud configs * Add missing file paths parameters
1 parent 6ca9816 commit 3e1a752

File tree

78 files changed

+38
-93
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+38
-93
lines changed

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

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,31 +39,26 @@ parameters:
3939
type: object
4040
default:
4141
Public:
42-
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
4342
ServiceConnection: azure-sdk-tests
4443
SubscriptionConfigurationFilePaths:
4544
- eng/common/TestResources/sub-config/AzurePublicMsft.json
4645
Preview:
47-
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview)
48-
ServiceConnection: azure-sdk-tests
49-
# TODO:
46+
ServiceConnection: azure-sdk-tests-preview
5047
SubscriptionConfigurationFilePaths:
48+
- eng/common/TestResources/sub-config/AzurePreviewMsft.json
5149
Canary:
52-
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
53-
ServiceConnection: azure-sdk-tests
54-
# TODO:
50+
ServiceConnection: azure-sdk-tests-preview
5551
SubscriptionConfigurationFilePaths:
52+
- eng/common/TestResources/sub-config/AzurePreviewMsft.json
5653
Location: 'centraluseuap'
5754
UsGov:
58-
SubscriptionConfiguration: $(sub-config-gov-test-resources)
5955
ServiceConnection: usgov_azure-sdk-tests
60-
# TODO:
6156
SubscriptionConfigurationFilePaths:
57+
- eng/common/TestResources/sub-config/AzureUsGovMsft.json
6258
China:
63-
SubscriptionConfiguration: $(sub-config-cn-test-resources)
6459
ServiceConnection: china_azure-sdk-tests
65-
# TODO:
6660
SubscriptionConfigurationFilePaths:
61+
- eng/common/TestResources/sub-config/AzureChinaMsft.json
6762
- name: MatrixConfigs
6863
type: object
6964
default:
@@ -103,7 +98,7 @@ parameters:
10398
default: false
10499
- name: UseFederatedAuth
105100
type: boolean
106-
default: false
101+
default: true
107102

108103
extends:
109104
template: /eng/pipelines/templates/stages/1es-redirect.yml

eng/pipelines/templates/jobs/ci.tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
strategy:
3939
matrix: $[ ${{ parameters.Matrix }} ]
4040

41-
dependsOn:
41+
dependsOn:
4242
- ${{ parameters.DependsOn }}
4343

4444
pool:
@@ -78,4 +78,4 @@ jobs:
7878
- template: /eng/pipelines/templates/jobs/mgmt-mock-test.yml
7979
parameters:
8080
ServiceDirectory: ${{ parameters.ServiceDirectory }}
81-
OSName: ${{ parameters.OSName }}
81+
OSName: ${{ parameters.OSName }}

eng/pipelines/templates/jobs/live.tests.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ parameters:
3535
type: string
3636
- name: UseFederatedAuth
3737
type: boolean
38-
default: false
38+
default: true
3939

4040
jobs:
4141
- job:
@@ -77,6 +77,7 @@ jobs:
7777
parameters:
7878
SubscriptionConfiguration: ${{ parameters.CloudConfig.SubscriptionConfiguration }}
7979
SubscriptionConfigurations: ${{ parameters.CloudConfig.SubscriptionConfigurations }}
80+
SubscriptionConfigurationFilePaths: ${{ parameters.CloudConfig.SubscriptionConfigurationFilePaths }}
8081
EnvVars:
8182
Pool: $(Pool)
8283
${{ insert }}: ${{ parameters.EnvVars }}

sdk/ai/azopenai/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ extends:
3535
UsePipelineProxy: false
3636
CloudConfig:
3737
Public:
38+
ServiceConnection: azure-sdk-tests
39+
SubscriptionConfigurationFilePaths:
40+
- eng/common/TestResources/sub-config/AzurePublicMsft.json
3841
SubscriptionConfigurations:
3942
- $(sub-config-azure-cloud-test-resources)
4043
- $(sub-config-openai-test-resources) # TestSecrets-openai

sdk/ai/azopenaiassistants/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ extends:
3535
UsePipelineProxy: false
3636
CloudConfig:
3737
Public:
38+
ServiceConnection: azure-sdk-tests
39+
SubscriptionConfigurationFilePaths:
40+
- eng/common/TestResources/sub-config/AzurePublicMsft.json
3841
SubscriptionConfigurations:
3942
- $(sub-config-azure-cloud-test-resources)
4043
- $(sub-config-openai-test-resources) # TestSecrets-openai

sdk/azidentity/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,14 @@ extends:
2727
CloudConfig:
2828
Public:
2929
ServiceConnection: azure-sdk-tests
30+
SubscriptionConfigurationFilePaths:
31+
- eng/common/TestResources/sub-config/AzurePublicMsft.json
3032
SubscriptionConfigurations:
3133
- $(sub-config-azure-cloud-test-resources)
3234
- $(sub-config-identity-test-resources)
3335
EnableRaceDetector: true
3436
RunLiveTests: true
3537
ServiceDirectory: azidentity
36-
UseFederatedAuth: true
3738
UsePipelineProxy: false
3839

3940
${{ if endsWith(variables['Build.DefinitionName'], 'weekly') }}:

sdk/messaging/azservicebus/ci.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,17 @@ extends:
3030
SupportedClouds: 'China'
3131
CloudConfig:
3232
Public:
33-
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
33+
ServiceConnection: azure-sdk-tests
34+
SubscriptionConfigurationFilePaths:
35+
- eng/common/TestResources/sub-config/AzurePublicMsft.json
3436
UsGov:
35-
SubscriptionConfiguration: $(sub-config-gov-test-resources)
37+
ServiceConnection: usgov_azure-sdk-tests
38+
SubscriptionConfigurationFilePaths:
39+
- eng/common/TestResources/sub-config/AzureUsGovMsft.json
3640
China:
37-
SubscriptionConfiguration: $(sub-config-cn-test-resources)
41+
ServiceConnection: china_azure-sdk-tests
42+
SubscriptionConfigurationFilePaths:
43+
- eng/common/TestResources/sub-config/AzureChinaMsft.json
3844
MatrixReplace:
3945
# Use dedicated pool with regional affinity to China cloud
4046
- Pool=(.*)-general/$1-asia

sdk/resourcemanager/advisor/armadvisor/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,3 @@ extends:
2727
IncludeRelease: true
2828
ServiceDirectory: 'resourcemanager/advisor/armadvisor'
2929
UsePipelineProxy: false
30-
UseFederatedAuth: true

sdk/resourcemanager/alertsmanagement/armalertsmanagement/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,3 @@ extends:
2727
IncludeRelease: true
2828
ServiceDirectory: 'resourcemanager/alertsmanagement/armalertsmanagement'
2929
UsePipelineProxy: false
30-
UseFederatedAuth: true

sdk/resourcemanager/analysisservices/armanalysisservices/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,3 @@ extends:
2727
IncludeRelease: true
2828
ServiceDirectory: 'resourcemanager/analysisservices/armanalysisservices'
2929
UsePipelineProxy: false
30-
UseFederatedAuth: true

0 commit comments

Comments
 (0)