Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a resource group locate in westus2 #1642

Merged
merged 5 commits into from
Jul 24, 2024
Merged

Add a resource group locate in westus2 #1642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5570dbe
Change the location of the resource group to westus
Fred-sun Jul 22, 2024
0c61688
New change for azure_rm_webapp test
Fred-sun Jul 22, 2024
77114f9
Add a new resource group
Fred-sun Jul 22, 2024
7cdd095
Add location
Fred-sun Jul 22, 2024
34a5694
New location for webslot
Fred-sun Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion pr-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,12 @@ 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_third;isOutput=true]ansibletest3-$(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), $(setvar.resource_group_datalake)"
echo "Generate test resource group $(setvar.resource_group), $(setvar.resource_group_secondary), $(setvar.resoruce_group_third), $(setvar.resource_group_datalake)"
- task: AzureCLI@2
inputs:
azureSubscription: '$(SUBSCRIPTION_FULL_NAME)'
Expand All @@ -177,6 +178,7 @@ 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 westus2 -n $(setvar.resource_group_third)
az group create -l eastus2 -n $(setvar.resource_group_datalake)

- job: RunTests
Expand All @@ -185,6 +187,7 @@ jobs:
variables:
TEST_RESOURCE_GROUP: $[ dependencies.CreateResourceGroups.outputs['setvar.resource_group'] ]
TEST_RESOURCE_GROUP_SECONDARY: $[ dependencies.CreateResourceGroups.outputs['setvar.resource_group_secondary'] ]
TEST_RESOURCE_GROUP_THIRD: $[ dependencies.CreateResourceGroups.outputs['setvar.resource_group_third'] ]
TEST_RESOURCE_GROUP_DATALAKE: $[ dependencies.CreateResourceGroups.outputs['setvar.resource_group_datalake'] ]
strategy:
matrix:
Expand Down Expand Up @@ -253,6 +256,7 @@ jobs:
AZURE_ROLE_DEFINITION_ID: $(AZURE_ROLE_DEFINITION_ID)
RESOURCE_GROUP: $(TEST_RESOURCE_GROUP)
RESOURCE_GROUP_SECONDARY: $(TEST_RESOURCE_GROUP_SECONDARY)
RESOURCE_GROUP_THIRD: $(TEST_RESOURCE_GROUP_THIRD)
RESOURCE_GROUP_DATALAKE: $(TEST_RESOURCE_GROUP_DATALAKE)
displayName: 'Running Tests'

Expand All @@ -264,6 +268,7 @@ jobs:
variables:
TEST_RESOURCE_GROUP: $[ dependencies.CreateResourceGroups.outputs['setvar.resource_group'] ]
TEST_RESOURCE_GROUP_SECONDARY: $[ dependencies.CreateResourceGroups.outputs['setvar.resource_group_secondary'] ]
TEST_RESOURCE_GROUP_THIRD: $[ dependencies.CreateResourceGroups.outputs['setvar.resource_group_third'] ]
TEST_RESOURCE_GROUP_DATALAKE: $[ dependencies.CreateResourceGroups.outputs['setvar.resource_group_datalake'] ]
steps:
- task: AzureCLI@2
Expand All @@ -274,4 +279,5 @@ jobs:
inlineScript: |
az group delete -n $(TEST_RESOURCE_GROUP) --yes --no-wait
az group delete -n $(TEST_RESOURCE_GROUP_SECONDARY) --yes --no-wait
az group delete -n $(TEST_RESOURCE_GROUP_THIRD) --yes --no-wait
az group delete -n $(TEST_RESOURCE_GROUP_DATALAKE) --yes --no-wait
22 changes: 21 additions & 1 deletion tests/integration/targets/azure_rm_webapp/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

- name: Fix resource prefix
ansible.builtin.set_fact:
linux_app_plan_resource_group: "{{ resource_group_secondary }}"
linux_app_plan_resource_group: "{{ resource_group_third }}"
win_app_name: "{{ (resource_prefix | replace('-', 'x'))[-8:] }}{{ 1000 | random }}winapp"
linux_app_name: "{{ (resource_prefix | replace('-', 'x'))[-8:] }}{{ 1000 | random }}linuxapp"
win_plan_name: "{{ (resource_prefix | replace('-', 'x'))[-8:] }}winplan"
Expand Down Expand Up @@ -214,6 +214,7 @@
azure_rm_webapp:
resource_group: "{{ resource_group }}"
name: "{{ win_app_name }}6"
location: westus2
plan:
resource_group: "{{ linux_app_plan_resource_group }}"
name: "{{ linux_plan_name }}"
Expand All @@ -232,6 +233,7 @@
azure_rm_webapp:
resource_group: "{{ resource_group }}"
name: "{{ win_app_name }}7"
location: westus2
plan:
resource_group: "{{ linux_app_plan_resource_group }}"
name: "{{ linux_plan_name }}"
Expand All @@ -250,6 +252,7 @@
azure_rm_webapp:
resource_group: "{{ resource_group }}"
name: "{{ win_app_name }}8"
location: westus2
plan:
resource_group: "{{ linux_app_plan_resource_group }}"
name: "{{ linux_plan_name }}"
Expand All @@ -262,6 +265,7 @@
azure_rm_webapp:
resource_group: "{{ resource_group }}"
name: "{{ win_app_name }}8"
location: westus2
plan:
resource_group: "{{ linux_app_plan_resource_group }}"
name: "{{ linux_plan_name }}"
Expand All @@ -278,6 +282,7 @@
azure_rm_webapp:
resource_group: "{{ resource_group }}"
name: "{{ win_app_name }}8"
location: westus2
plan:
resource_group: "{{ linux_app_plan_resource_group }}"
name: "{{ linux_plan_name }}"
Expand All @@ -294,6 +299,7 @@
azure_rm_webapp:
resource_group: "{{ resource_group }}"
name: "{{ win_app_name }}10"
location: westus2
plan:
resource_group: "{{ linux_app_plan_resource_group }}"
name: "{{ linux_plan_name }}"
Expand Down Expand Up @@ -335,6 +341,7 @@
azure_rm_webapp:
resource_group: "{{ resource_group }}"
name: "{{ linux_plan_name }}12"
location: westus2
plan:
resource_group: "{{ linux_app_plan_resource_group }}"
name: "{{ linux_plan_name }}"
Expand All @@ -350,6 +357,7 @@
azure_rm_webapp:
resource_group: "{{ resource_group }}"
name: "{{ win_app_name }}13"
location: westus2
plan:
resource_group: "{{ linux_app_plan_resource_group }}"
name: "{{ linux_plan_name }}"
Expand Down Expand Up @@ -381,6 +389,7 @@
azure_rm_webapp:
resource_group: "{{ linux_app_plan_resource_group }}"
name: "{{ linux_app_name }}-siteconfig"
location: westus2
plan:
resource_group: "{{ linux_app_plan_resource_group }}"
name: "{{ linux_app_name }}-siteconfig-plan"
Expand All @@ -406,6 +415,7 @@
azure_rm_webapp:
resource_group: "{{ linux_app_plan_resource_group }}"
name: "{{ linux_app_name }}-siteconfig"
location: westus2
plan:
resource_group: "{{ linux_app_plan_resource_group }}"
name: "{{ linux_app_name }}-siteconfig-plan"
Expand Down Expand Up @@ -444,6 +454,7 @@
azure_rm_webapp:
resource_group: "{{ linux_app_plan_resource_group }}"
name: "{{ linux_app_name }}-siteconfig"
location: westus2
plan:
resource_group: "{{ linux_app_plan_resource_group }}"
name: "{{ linux_app_name }}-siteconfig-plan"
Expand Down Expand Up @@ -482,6 +493,7 @@
azure_rm_webapp:
resource_group: "{{ linux_app_plan_resource_group }}"
name: "{{ linux_app_name }}-http20"
location: westus2
plan:
resource_group: "{{ linux_app_plan_resource_group }}"
name: "{{ linux_app_name }}-http20-plan"
Expand All @@ -508,6 +520,7 @@
azure_rm_webapp:
resource_group: "{{ linux_app_plan_resource_group }}"
name: "{{ linux_app_name }}-http20"
location: westus2
plan:
resource_group: "{{ linux_app_plan_resource_group }}"
name: "{{ linux_app_name }}-http20-plan"
Expand Down Expand Up @@ -547,6 +560,7 @@
azure_rm_webapp:
resource_group: "{{ linux_app_plan_resource_group }}"
name: "{{ linux_app_name }}-http20"
location: westus2
plan:
resource_group: "{{ linux_app_plan_resource_group }}"
name: "{{ linux_app_name }}-http20-plan"
Expand Down Expand Up @@ -786,6 +800,7 @@
resource_group: "{{ resource_group }}"
webapp_name: "{{ win_app_name }}13"
name: "{{ slot1_name }}"
location: westus2
configuration_source: "{{ win_app_name }}13"
app_settings:
testkey: testvalue
Expand All @@ -802,6 +817,7 @@
resource_group: "{{ resource_group }}"
webapp_name: "{{ win_app_name }}13"
name: "{{ slot1_name }}"
location: westus2
configuration_source: "{{ win_app_name }}13"
app_settings:
testkey: testvalueslot
Expand All @@ -816,6 +832,7 @@
azure_rm_webappslot:
resource_group: "{{ resource_group }}"
webapp_name: "{{ win_app_name }}13"
location: westus2
name: "{{ slot1_name }}"
app_settings:
testkey: testvalueslot
Expand All @@ -830,6 +847,7 @@
azure_rm_webappslot:
resource_group: "{{ resource_group }}"
webapp_name: "{{ win_app_name }}13"
location: westus2
name: "{{ slot1_name }}"
frameworks:
- name: "node"
Expand All @@ -847,6 +865,7 @@
azure_rm_webappslot:
resource_group: "{{ resource_group }}"
webapp_name: "{{ win_app_name }}13"
location: westus2
name: "{{ slot1_name }}"
swap:
action: swap
Expand All @@ -860,6 +879,7 @@
- name: Stop webapp slot
azure_rm_webappslot:
resource_group: "{{ resource_group }}"
location: westus2
webapp_name: "{{ win_app_name }}13"
name: "{{ slot1_name }}"
app_state: stopped
Expand Down
1 change: 1 addition & 0 deletions tests/utils/ado/ado.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ AZURE_SUBSCRIPTION_SEC_ID:${AZURE_SUBSCRIPTION_SEC_ID}
AZURE_TENANT:${AZURE_TENANT}
RESOURCE_GROUP:${RESOURCE_GROUP}
RESOURCE_GROUP_SECONDARY:${RESOURCE_GROUP_SECONDARY}
RESOURCE_GROUP_THIRD:${RESOURCE_GROUP_THIRD}
RESOURCE_GROUP_DATALAKE:${RESOURCE_GROUP_DATALAKE}
AZURE_PRINCIPAL_ID:${AZURE_PRINCIPAL_ID}
AZURE_MANAGED_BY_TENANT_ID:${AZURE_MANAGED_BY_TENANT_ID}
Expand Down