diff --git a/sdk/devcenter/ci.yml b/sdk/devcenter/ci.yml index 182298149fd2..436e439415ba 100644 --- a/sdk/devcenter/ci.yml +++ b/sdk/devcenter/ci.yml @@ -11,6 +11,8 @@ trigger: - sdk/devcenter/ci.yml - sdk/devcenter/Azure.Developer.DevCenter/ - sdk/devcenter/service.projects + - sdk/devcenter/test-resources.bicep + - sdk/devcenter/tests.yml pr: branches: @@ -24,6 +26,8 @@ pr: - sdk/devcenter/ci.yml - sdk/devcenter/Azure.Developer.DevCenter/ - sdk/devcenter/service.projects + - sdk/devcenter/test-resources.bicep + - sdk/devcenter/tests.yml extends: template: /eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/devcenter/test-resources.bicep b/sdk/devcenter/test-resources.bicep index bd98fdc47dda..6ede7375ce7c 100644 --- a/sdk/devcenter/test-resources.bicep +++ b/sdk/devcenter/test-resources.bicep @@ -1,5 +1,6 @@ param resourceLocation string = resourceGroup().location -param catalogSecretIdentifier string +param baseName string = resourceGroup().name +param catalogPatIdentifier string param devCenterPresetMsi string param projectEnvironmentTypePresetMsi string param testUserOid string @@ -7,7 +8,8 @@ param testUserName string param projectAdminRoleDefinitionId string param deploymentEnvironmentsRoleDefinitionId string -var defaultDevCenterName = 'sdk-default-devcenter' +var defaultDevCenterName = 'sdk-dc-${uniqueString('devcenter', baseName, resourceGroup().name)}' + var defaultProjectName = 'sdk-default-project' var defaultPoolName = 'sdk-default-pool' var defaultNetworkConnectionName = 'sdk-default-networkconnection' @@ -166,7 +168,7 @@ resource catalog 'Microsoft.DevCenter/devcenters/catalogs@2022-09-01-preview' = properties: { gitHub: { branch: 'main' - secretIdentifier: catalogSecretIdentifier + secretIdentifier: catalogPatIdentifier path: '/NewFormat' uri: gitUri } @@ -184,7 +186,7 @@ resource projectEnvironmentType 'Microsoft.DevCenter/projects/environmentTypes@2 identity: { type: 'UserAssigned' userAssignedIdentities: { - '${devCenterPresetMsi}': {} + '${projectEnvironmentTypePresetMsi}': {} } } properties: {