diff --git a/sdk/cosmos/kafka.yml b/sdk/cosmos/kafka.yml index 76acbfe0cac7..f05c3a78bf11 100644 --- a/sdk/cosmos/kafka.yml +++ b/sdk/cosmos/kafka.yml @@ -8,7 +8,7 @@ extends: parameters: TestName: 'Kafka_TestContainer_Integration' EnvVars: - ACCOUNT_TENANT_ID: '72f988bf-86f1-41af-91ab-2d7cd011db47' + ACCOUNT_TENANT_ID: '70a036f6-8e4d-4615-bad6-149c02e7720d' ACCOUNT_AAD_CLIENT_ID: $(spark-databricks-cosmos-spn-clientId) ACCOUNT_AAD_CLIENT_SECRET: $(spark-databricks-cosmos-spn-clientSecret) COSMOS.CLIENT_TELEMETRY_ENDPOINT: $(cosmos-client-telemetry-endpoint) @@ -16,7 +16,7 @@ extends: COSMOS_ACR_NAME: $(kafka-mcr-name) CloudConfig: Public: - ServiceConnection: azure-sdk-tests-cosmos + ServiceConnection: azure-sdk-tests-cosmos-tme MatrixConfigs: - Name: Kafka_TestContainer_Integration_Test Path: sdk/cosmos/kafka-testcontainer-matrix.json diff --git a/sdk/cosmos/spark.yml b/sdk/cosmos/spark.yml index fe4d3dc79f4e..6e14f125d79c 100644 --- a/sdk/cosmos/spark.yml +++ b/sdk/cosmos/spark.yml @@ -14,9 +14,9 @@ stages: CosmosEndpoint: $(spark-databricks-cosmos-endpoint) CosmosKey: $(spark-databricks-cosmos-key) DatabricksEndpoint: $(spark-databricks-endpoint-with-msi) - SubscriptionId: '8fba6d4f-7c37-4d13-9063-fd58ad2b86e2' - TenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47' - ResourceGroupName: 'oltp-spark-ci' + SubscriptionId: '7cc44528-8730-4b11-ae30-5738d333ff2d' + TenantId: '70a036f6-8e4d-4615-bad6-149c02e7720d' + ResourceGroupName: 'SSS3PT_oltp-spark-ci' ClientId: $(spark-databricks-cosmos-spn-clientId) ClientSecret: $(spark-databricks-cosmos-spn-clientSecret) CosmosContainerName: 'sampleContainer3' @@ -36,9 +36,9 @@ stages: CosmosEndpoint: $(spark-databricks-cosmos-endpoint) CosmosKey: $(spark-databricks-cosmos-key) DatabricksEndpoint: $(spark-databricks-endpoint-with-msi) - SubscriptionId: '8fba6d4f-7c37-4d13-9063-fd58ad2b86e2' - TenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47' - ResourceGroupName: 'oltp-spark-ci' + SubscriptionId: '7cc44528-8730-4b11-ae30-5738d333ff2d' + TenantId: '70a036f6-8e4d-4615-bad6-149c02e7720d' + ResourceGroupName: 'SSS3PT_oltp-spark-ci' ClientId: $(spark-databricks-cosmos-spn-clientId) ClientSecret: $(spark-databricks-cosmos-spn-clientSecret) CosmosContainerName: 'sampleContainer4' @@ -58,9 +58,9 @@ stages: CosmosEndpoint: $(spark-databricks-cosmos-endpoint) CosmosKey: $(spark-databricks-cosmos-key) DatabricksEndpoint: $(spark-databricks-endpoint-with-msi) - SubscriptionId: '8fba6d4f-7c37-4d13-9063-fd58ad2b86e2' - TenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47' - ResourceGroupName: 'oltp-spark-ci' + SubscriptionId: '7cc44528-8730-4b11-ae30-5738d333ff2d' + TenantId: '70a036f6-8e4d-4615-bad6-149c02e7720d' + ResourceGroupName: 'SSS3PT_oltp-spark-ci' ClientId: $(spark-databricks-cosmos-spn-clientId) ClientSecret: $(spark-databricks-cosmos-spn-clientSecret) CosmosContainerName: 'sampleContainer5' @@ -81,9 +81,9 @@ stages: CosmosEndpoint: $(spark-databricks-cosmos-endpoint) CosmosKey: $(spark-databricks-cosmos-key) DatabricksEndpoint: $(spark-databricks-endpoint-with-msi) - SubscriptionId: '8fba6d4f-7c37-4d13-9063-fd58ad2b86e2' - TenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47' - ResourceGroupName: 'oltp-spark-ci' + SubscriptionId: '7cc44528-8730-4b11-ae30-5738d333ff2d' + TenantId: '70a036f6-8e4d-4615-bad6-149c02e7720d' + ResourceGroupName: 'SSS3PT_oltp-spark-ci' ClientId: $(spark-databricks-cosmos-spn-clientId) ClientSecret: $(spark-databricks-cosmos-spn-clientSecret) CosmosContainerName: 'sampleContainer6' @@ -104,9 +104,9 @@ stages: CosmosEndpoint: $(spark-databricks-cosmos-endpoint) CosmosKey: $(spark-databricks-cosmos-key) DatabricksEndpoint: $(spark-databricks-endpoint-with-msi) - SubscriptionId: '8fba6d4f-7c37-4d13-9063-fd58ad2b86e2' - TenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47' - ResourceGroupName: 'oltp-spark-ci' + SubscriptionId: '7cc44528-8730-4b11-ae30-5738d333ff2d' + TenantId: '70a036f6-8e4d-4615-bad6-149c02e7720d' + ResourceGroupName: 'SSS3PT_oltp-spark-ci' ClientId: $(spark-databricks-cosmos-spn-clientId) ClientSecret: $(spark-databricks-cosmos-spn-clientSecret) CosmosContainerName: 'sampleContainer7' @@ -127,9 +127,9 @@ stages: CosmosEndpoint: $(spark-databricks-cosmos-endpoint) CosmosKey: $(spark-databricks-cosmos-key) DatabricksEndpoint: $(spark-databricks-endpoint-with-msi) - SubscriptionId: '8fba6d4f-7c37-4d13-9063-fd58ad2b86e2' - TenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47' - ResourceGroupName: 'oltp-spark-ci' + SubscriptionId: '7cc44528-8730-4b11-ae30-5738d333ff2d' + TenantId: '70a036f6-8e4d-4615-bad6-149c02e7720d' + ResourceGroupName: 'SSS3PT_oltp-spark-ci' ClientId: $(spark-databricks-cosmos-spn-clientId) ClientSecret: $(spark-databricks-cosmos-spn-clientSecret) CosmosContainerName: 'sampleContainer8' diff --git a/sdk/cosmos/tests.yml b/sdk/cosmos/tests.yml index 92bbc0347acb..df40ab53793f 100644 --- a/sdk/cosmos/tests.yml +++ b/sdk/cosmos/tests.yml @@ -8,7 +8,7 @@ extends: parameters: CloudConfig: Public: - ServiceConnection: azure-sdk-tests-cosmos + ServiceConnection: azure-sdk-tests-cosmos-tme MatrixConfigs: - Name: Cosmos_live_test Path: sdk/cosmos/live-platform-matrix.json @@ -40,7 +40,7 @@ extends: TestName: 'Cosmos_Live_Test_Http2' CloudConfig: Public: - ServiceConnection: azure-sdk-tests-cosmos + ServiceConnection: azure-sdk-tests-cosmos-tme MatrixConfigs: - Name: Cosmos_live_test_http2 Path: sdk/cosmos/live-http2-platform-matrix.json @@ -72,7 +72,7 @@ extends: TestName: 'Cosmos_Live_Test_ThinClient' CloudConfig: Public: - ServiceConnection: azure-sdk-tests-cosmos + ServiceConnection: azure-sdk-tests-cosmos-tme MatrixConfigs: - Name: Cosmos_live_test_thinclient Path: sdk/cosmos/live-thinclient-platform-matrix.json @@ -104,7 +104,7 @@ extends: TestName: 'Cosmos_Live_Test_ThinClient_MultiRegion' CloudConfig: Public: - ServiceConnection: azure-sdk-tests-cosmos + ServiceConnection: azure-sdk-tests-cosmos-tme MatrixConfigs: - Name: Cosmos_live_test_thinclient_multiregion Path: sdk/cosmos/live-thinclient-multi-region-platform-matrix.json @@ -136,7 +136,7 @@ extends: TestName: 'Cosmos_Live_Test_ThinClient_MultiMaster' CloudConfig: Public: - ServiceConnection: azure-sdk-tests-cosmos + ServiceConnection: azure-sdk-tests-cosmos-tme MatrixConfigs: - Name: Cosmos_live_test_thinclient_multimaster Path: sdk/cosmos/live-thinclient-multi-master-platform-matrix.json @@ -168,7 +168,7 @@ extends: TestName: 'Spring_Data_Cosmos_Integration' CloudConfig: Public: - ServiceConnection: azure-sdk-tests-cosmos + ServiceConnection: azure-sdk-tests-cosmos-tme MatrixConfigs: - Name: Cosmos_live_test_integration Path: sdk/spring/pipeline/cosmos-integration-matrix.json @@ -193,7 +193,7 @@ extends: TestName: 'Kafka_Cosmos_Integration' CloudConfig: Public: - ServiceConnection: azure-sdk-tests-cosmos + ServiceConnection: azure-sdk-tests-cosmos-tme MatrixConfigs: - Name: Kafka_Cosmos_Integration_Test Path: sdk/cosmos/kafka-cosmos-matrix.json diff --git a/sdk/spring/pipeline/tests-supported-spring-versions-filter-template.yml b/sdk/spring/pipeline/tests-supported-spring-versions-filter-template.yml index 6a615c3f8c46..dc30812ac825 100644 --- a/sdk/spring/pipeline/tests-supported-spring-versions-filter-template.yml +++ b/sdk/spring/pipeline/tests-supported-spring-versions-filter-template.yml @@ -14,6 +14,11 @@ parameters: - name: TestResourceDirectories type: object default: [] + - name: CloudConfig + type: object + default: + Public: + Preview: stages: - template: /sdk/spring/pipeline/tests-supported-spring-versions-template.yml @@ -22,6 +27,7 @@ stages: TimeoutInMinutes: ${{ parameters.TimeoutInMinutes }} TestOptions: ' ${{ parameters.TestOptions }} -Dit.test=${{ parameters.TestClassPatterns }} ' TestResourceDirectories: ${{ parameters.TestResourceDirectories }} + CloudConfig: ${{ parameters.CloudConfig }} Artifacts: - name: spring-cloud-azure-integration-tests groupId: com.azure.spring diff --git a/sdk/spring/pipeline/tests-supported-spring-versions-template.yml b/sdk/spring/pipeline/tests-supported-spring-versions-template.yml index 4578041b21e9..c4bfa733f2c9 100644 --- a/sdk/spring/pipeline/tests-supported-spring-versions-template.yml +++ b/sdk/spring/pipeline/tests-supported-spring-versions-template.yml @@ -35,6 +35,11 @@ parameters: - name: MatrixConfigFileName type: string default: '' + - name: CloudConfig + type: object + default: + Public: + Preview: stages: - template: /eng/pipelines/templates/stages/archetype-sdk-tests-isolated.yml @@ -49,6 +54,7 @@ stages: TestGoals: "clean verify" TestOptions: ${{ parameters.TestOptions }} MatrixConfigs: ${{ parameters.MatrixConfigs }} + CloudConfig: ${{ parameters.CloudConfig }} PreGenerationSteps: - script: | python -m pip install termcolor diff --git a/sdk/spring/tests.yml b/sdk/spring/tests.yml index 506ed7c2bef4..164a3a9bfb58 100644 --- a/sdk/spring/tests.yml +++ b/sdk/spring/tests.yml @@ -16,6 +16,9 @@ extends: TestClassPatterns: com.azure.spring.cloud.integration.tests.cosmos.*IT,com.azure.spring.cloud.integration.tests.cosmos.*.*IT TestResourceDirectories: - spring/spring-cloud-azure-integration-tests/test-resources/cosmos + CloudConfig: + Public: + ServiceConnection: azure-sdk-tests-cosmos-tme - template: /sdk/spring/pipeline/tests-supported-spring-versions-filter-template.yml parameters: TestName: IT_ServiceBus @@ -67,3 +70,6 @@ extends: # -U forces Maven to re-check remote repositories for failed artifact downloads, # preventing cached "Connection reset" errors from blocking the From Source build. BuildOptions: '-Denforcer.skip=true -U' + CloudConfig: + Public: + ServiceConnection: azure-sdk-tests-cosmos-tme