Skip to content

Commit

Permalink
Incorporate common sub config changes to live testing (#23240)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
benbp authored Aug 30, 2024
1 parent 6ca9816 commit 3e1a752
Show file tree
Hide file tree
Showing 78 changed files with 38 additions and 93 deletions.
19 changes: 7 additions & 12 deletions eng/pipelines/templates/jobs/archetype-sdk-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,31 +39,26 @@ parameters:
type: object
default:
Public:
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
ServiceConnection: azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePublicMsft.json
Preview:
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview)
ServiceConnection: azure-sdk-tests
# TODO:
ServiceConnection: azure-sdk-tests-preview
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePreviewMsft.json
Canary:
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
ServiceConnection: azure-sdk-tests
# TODO:
ServiceConnection: azure-sdk-tests-preview
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePreviewMsft.json
Location: 'centraluseuap'
UsGov:
SubscriptionConfiguration: $(sub-config-gov-test-resources)
ServiceConnection: usgov_azure-sdk-tests
# TODO:
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzureUsGovMsft.json
China:
SubscriptionConfiguration: $(sub-config-cn-test-resources)
ServiceConnection: china_azure-sdk-tests
# TODO:
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzureChinaMsft.json
- name: MatrixConfigs
type: object
default:
Expand Down Expand Up @@ -103,7 +98,7 @@ parameters:
default: false
- name: UseFederatedAuth
type: boolean
default: false
default: true

extends:
template: /eng/pipelines/templates/stages/1es-redirect.yml
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/templates/jobs/ci.tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
strategy:
matrix: $[ ${{ parameters.Matrix }} ]

dependsOn:
dependsOn:
- ${{ parameters.DependsOn }}

pool:
Expand Down Expand Up @@ -78,4 +78,4 @@ jobs:
- template: /eng/pipelines/templates/jobs/mgmt-mock-test.yml
parameters:
ServiceDirectory: ${{ parameters.ServiceDirectory }}
OSName: ${{ parameters.OSName }}
OSName: ${{ parameters.OSName }}
3 changes: 2 additions & 1 deletion eng/pipelines/templates/jobs/live.tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ parameters:
type: string
- name: UseFederatedAuth
type: boolean
default: false
default: true

jobs:
- job:
Expand Down Expand Up @@ -77,6 +77,7 @@ jobs:
parameters:
SubscriptionConfiguration: ${{ parameters.CloudConfig.SubscriptionConfiguration }}
SubscriptionConfigurations: ${{ parameters.CloudConfig.SubscriptionConfigurations }}
SubscriptionConfigurationFilePaths: ${{ parameters.CloudConfig.SubscriptionConfigurationFilePaths }}
EnvVars:
Pool: $(Pool)
${{ insert }}: ${{ parameters.EnvVars }}
Expand Down
3 changes: 3 additions & 0 deletions sdk/ai/azopenai/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ extends:
UsePipelineProxy: false
CloudConfig:
Public:
ServiceConnection: azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePublicMsft.json
SubscriptionConfigurations:
- $(sub-config-azure-cloud-test-resources)
- $(sub-config-openai-test-resources) # TestSecrets-openai
Expand Down
3 changes: 3 additions & 0 deletions sdk/ai/azopenaiassistants/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ extends:
UsePipelineProxy: false
CloudConfig:
Public:
ServiceConnection: azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePublicMsft.json
SubscriptionConfigurations:
- $(sub-config-azure-cloud-test-resources)
- $(sub-config-openai-test-resources) # TestSecrets-openai
Expand Down
3 changes: 2 additions & 1 deletion sdk/azidentity/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,14 @@ extends:
CloudConfig:
Public:
ServiceConnection: azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePublicMsft.json
SubscriptionConfigurations:
- $(sub-config-azure-cloud-test-resources)
- $(sub-config-identity-test-resources)
EnableRaceDetector: true
RunLiveTests: true
ServiceDirectory: azidentity
UseFederatedAuth: true
UsePipelineProxy: false

${{ if endsWith(variables['Build.DefinitionName'], 'weekly') }}:
Expand Down
12 changes: 9 additions & 3 deletions sdk/messaging/azservicebus/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,17 @@ extends:
SupportedClouds: 'China'
CloudConfig:
Public:
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
ServiceConnection: azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePublicMsft.json
UsGov:
SubscriptionConfiguration: $(sub-config-gov-test-resources)
ServiceConnection: usgov_azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzureUsGovMsft.json
China:
SubscriptionConfiguration: $(sub-config-cn-test-resources)
ServiceConnection: china_azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzureChinaMsft.json
MatrixReplace:
# Use dedicated pool with regional affinity to China cloud
- Pool=(.*)-general/$1-asia
Expand Down
1 change: 0 additions & 1 deletion sdk/resourcemanager/advisor/armadvisor/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/advisor/armadvisor'
UsePipelineProxy: false
UseFederatedAuth: true
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/alertsmanagement/armalertsmanagement'
UsePipelineProxy: false
UseFederatedAuth: true
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/analysisservices/armanalysisservices'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/apicenter/armapicenter/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/apicenter/armapicenter'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/apimanagement/armapimanagement/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/apimanagement/armapimanagement'
UsePipelineProxy: false
UseFederatedAuth: true
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/appconfiguration/armappconfiguration'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/appplatform/armappplatform/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/appplatform/armappplatform'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/attestation/armattestation/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/attestation/armattestation'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/batch/armbatch/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/batch/armbatch'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/botservice/armbotservice/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/botservice/armbotservice'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/cdn/armcdn/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/cdn/armcdn'
UsePipelineProxy: false
UseFederatedAuth: true
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/changeanalysis/armchangeanalysis'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/chaos/armchaos/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/chaos/armchaos'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/communication/armcommunication/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/communication/armcommunication'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/compute/armcompute/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/compute/armcompute'
UsePipelineProxy: false
UseFederatedAuth: true
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/containerregistry/armcontainerregistry'
UsePipelineProxy: false
UseFederatedAuth: true
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/containerservice/armcontainerservice'
UsePipelineProxy: false
UseFederatedAuth: true
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/containerservicefleet/armcontainerservicefleet'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/cosmos/armcosmos/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/cosmos/armcosmos'
UsePipelineProxy: false
UseFederatedAuth: true
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/cosmosforpostgresql/armcosmosforpostgresql'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/databricks/armdatabricks/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/databricks/armdatabricks'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/datafactory/armdatafactory/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/datafactory/armdatafactory'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/datalake-store/armdatalakestore/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/datalake-store/armdatalakestore'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/devcenter/armdevcenter/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/devcenter/armdevcenter'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/dns/armdns/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/dns/armdns'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/dnsresolver/armdnsresolver/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/dnsresolver/armdnsresolver'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/dynatrace/armdynatrace/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/dynatrace/armdynatrace'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/eventgrid/armeventgrid/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/eventgrid/armeventgrid'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/eventhub/armeventhub/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/eventhub/armeventhub'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/iotcentral/armiotcentral/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/iotcentral/armiotcentral'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/iothub/armiothub/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/iothub/armiothub'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/keyvault/armkeyvault/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/keyvault/armkeyvault'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/kusto/armkusto/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/kusto/armkusto'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/labservices/armlabservices/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/labservices/armlabservices'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/loadtesting/armloadtesting/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/loadtesting/armloadtesting'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/logic/armlogic/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/logic/armlogic'
UsePipelineProxy: false
UseFederatedAuth: true
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/managementgroups/armmanagementgroups'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/maps/armmaps/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/maps/armmaps'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/mariadb/armmariadb/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/mariadb/armmariadb'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/mediaservices/armmediaservices/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/mediaservices/armmediaservices'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/mobilenetwork/armmobilenetwork/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/mobilenetwork/armmobilenetwork'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/mongocluster/armmongocluster/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/mongocluster/armmongocluster'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/monitor/armmonitor/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/monitor/armmonitor'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/msi/armmsi/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/msi/armmsi'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/network/armnetwork/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/network/armnetwork'
UsePipelineProxy: false
UseFederatedAuth: true
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/notificationhubs/armnotificationhubs'
UsePipelineProxy: false
UseFederatedAuth: true
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/operationalinsights/armoperationalinsights'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/postgresql/armpostgresql/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/postgresql/armpostgresql'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/privatedns/armprivatedns/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/privatedns/armprivatedns'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/quota/armquota/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/quota/armquota'
UsePipelineProxy: false
UseFederatedAuth: true
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/recoveryservices/armrecoveryservices'
UsePipelineProxy: false
UseFederatedAuth: true
1 change: 0 additions & 1 deletion sdk/resourcemanager/redis/armredis/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ extends:
IncludeRelease: true
ServiceDirectory: 'resourcemanager/redis/armredis'
UsePipelineProxy: false
UseFederatedAuth: true
Loading

0 comments on commit 3e1a752

Please sign in to comment.