Skip to content
Draft
4 changes: 2 additions & 2 deletions sdk/cosmos/kafka.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ 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)
COSMOS.CLIENT_TELEMETRY_COSMOS_ACCOUNT: $(cosmos-client-telemetry-cosmos-account)
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
Expand Down
36 changes: 18 additions & 18 deletions sdk/cosmos/spark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand All @@ -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'
Expand All @@ -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'
Expand All @@ -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'
Expand All @@ -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'
Expand Down
14 changes: 7 additions & 7 deletions sdk/cosmos/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -49,6 +54,7 @@ stages:
TestGoals: "clean verify"
TestOptions: ${{ parameters.TestOptions }}
MatrixConfigs: ${{ parameters.MatrixConfigs }}
CloudConfig: ${{ parameters.CloudConfig }}
PreGenerationSteps:
- script: |
python -m pip install termcolor
Expand Down
6 changes: 6 additions & 0 deletions sdk/spring/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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