diff --git a/pr-pipelines.yml b/pr-pipelines.yml index 54cd96263..a78ec27f5 100644 --- a/pr-pipelines.yml +++ b/pr-pipelines.yml @@ -101,9 +101,11 @@ jobs: - bash: | echo "##vso[task.setvariable variable=resource_group;isOutput=true]ansibletest-$(uuidgen)" echo "##vso[task.setvariable variable=resource_group_secondary;isOutput=true]ansibletest2-$(uuidgen)" + echo "##vso[task.setvariable variable=resource_group_datalake;isOutput=true]ansibletest-$(uuidgen)" + name: setvar - bash: | - echo "Generate test resource group $(setvar.resource_group), $(setvar.resource_group_secondary)" + echo "Generate test resource group $(setvar.resource_group), $(setvar.resource_group_secondary), $(setvar.resource_group_datalake)" - task: AzureCLI@2 inputs: azureSubscription: '$(SUBSCRIPTION_FULL_NAME)' @@ -112,12 +114,14 @@ jobs: inlineScript: | az group create -l eastus -n $(setvar.resource_group) az group create -l eastus -n $(setvar.resource_group_secondary) + az group create -l eastus2 -n $(setvar.resource_group_datalake) - job: RunTests dependsOn: CreateResourceGroups variables: TEST_RESOURCE_GROUP: $[ dependencies.CreateResourceGroups.outputs['setvar.resource_group'] ] TEST_RESOURCE_GROUP_SECONDARY: $[ dependencies.CreateResourceGroups.outputs['setvar.resource_group_secondary'] ] + TEST_RESOURCE_GROUP_DATALAKE: $[ dependencies.CreateResourceGroups.outputs['setvar.resource_group_datalake'] ] strategy: matrix: "Python${{ parameters.PYTHON_VER }}_sanity": @@ -182,6 +186,7 @@ jobs: AZURE_ROLE_DEFINITION_ID: $(AZURE_ROLE_DEFINITION_ID) RESOURCE_GROUP: $(TEST_RESOURCE_GROUP) RESOURCE_GROUP_SECONDARY: $(TEST_RESOURCE_GROUP_SECONDARY) + RESOURCE_GROUP_DATALAKE: $(TEST_RESOURCE_GROUP_DATALAKE) displayName: 'Running Tests' - job: CleanupResourceGroups diff --git a/tests/integration/targets/azure_rm_resourcegroup/tasks/main.yml b/tests/integration/targets/azure_rm_resourcegroup/tasks/main.yml index 238509695..706a855e8 100644 --- a/tests/integration/targets/azure_rm_resourcegroup/tasks/main.yml +++ b/tests/integration/targets/azure_rm_resourcegroup/tasks/main.yml @@ -1,3 +1,14 @@ +- name: Get resource group datalake info + azure_rm_resourcegroup_info: + name: "{{ resource_group_datalake }}" + list_resources: yes + register: rg + +- assert: + that: + - rg.resourcegroups | length == 1 + - rg.resourcegroups[0].resources | length >= 0 + - name: Get resource group info azure_rm_resourcegroup_info: register: rg diff --git a/tests/utils/ado/ado.sh b/tests/utils/ado/ado.sh index 9638318fd..d9eb05a8e 100755 --- a/tests/utils/ado/ado.sh +++ b/tests/utils/ado/ado.sh @@ -123,10 +123,11 @@ AZURE_SUBSCRIPTION_ID:${AZURE_SUBSCRIPTION_ID} AZURE_SUBSCRIPTION_SEC_ID:${AZURE_SUBSCRIPTION_SEC_ID} AZURE_TENANT:${AZURE_TENANT} RESOURCE_GROUP:${RESOURCE_GROUP} +RESOURCE_GROUP_SECONDARY:${RESOURCE_GROUP_SECONDARY} +RESOURCE_GROUP_DATALAKE:${RESOURCE_GROUP_DATALAKE} AZURE_PRINCIPAL_ID:${AZURE_PRINCIPAL_ID} AZURE_MANAGED_BY_TENANT_ID:${AZURE_MANAGED_BY_TENANT_ID} AZURE_ROLE_DEFINITION_ID:${AZURE_ROLE_DEFINITION_ID} -RESOURCE_GROUP_SECONDARY:${RESOURCE_GROUP_SECONDARY} EOF if [ "sanity" = "${group}" ]