Upddate test case (#585)

ansible-collections · Jul 22, 2021 · 356c17e · 356c17e
1 parent bd40c1d
commit 356c17e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/tests/integration/targets/azure_rm_aks/tasks/main.yml b/tests/integration/targets/azure_rm_aks/tasks/main.yml
@@ -2,6 +2,8 @@
      rpfx: "{{ resource_group | hash('md5') | truncate(8, True, '') }}"
      noderpfx: "{{ resource_group | hash('md5') | truncate(4, True, '') }}"
 
+ - include: minimal-cluster.yml
+
  - name: Find available k8s version
    azure_rm_aksversion_info:
      location: eastus

diff --git a/tests/integration/targets/azure_rm_aks/tasks/minimal-cluster.yml b/tests/integration/targets/azure_rm_aks/tasks/minimal-cluster.yml
@@ -1,17 +1,23 @@
 - set_fact:
     rpfx: "{{ resource_group | hash('md5') | truncate(8, True, '') }}"
-    noderpfx: "{{ resource_group | hash('md5') | truncate(4, True, '') }}"
+
+- name: Find available k8s version
+  azure_rm_aksversion_info:
+    location: eastus
+  register: versions
 
 - name: Use minimal parameters and system-assigned identity
   azure_rm_aks:
     name: "minimal{{ rpfx }}"
     location: eastus
     resource_group: "{{ resource_group }}"
+    kubernetes_version: "{{ versions.azure_aks_versions[0] }}"
     dns_prefix: "aks{{ rpfx }}"
     agent_pool_profiles:
       - name: default
         count: 1
-        vm_size: Standard_DS1_v2
+        vm_size: Standard_B2s
+        mode: System
   register: output
 
 - name: Assert the AKS instance is well created
@@ -37,11 +43,13 @@
     name: "minimal{{ rpfx }}"
     location: eastus
     resource_group: "{{ resource_group }}"
+    kubernetes_version: "{{ versions.azure_aks_versions[0] }}"
     dns_prefix: "aks{{ rpfx }}"
     agent_pool_profiles:
       - name: default
         count: 1
-        vm_size: Standard_DS1_v2
+        vm_size: Standard_B2s
+        mode: System
   register: output
 
 - name: Assert idempotent

diff --git a/tests/integration/targets/azure_rm_cosmosdbaccount/tasks/main.yml b/tests/integration/targets/azure_rm_cosmosdbaccount/tasks/main.yml
@@ -27,9 +27,9 @@
   azure_rm_cosmosdbaccount:
     resource_group: "{{ resource_group }}"
     name: "{{ dbname }}"
-    location: eastus
+    location: eastasia
     geo_rep_locations:
-      - name: eastus
+      - name: eastasia
         failover_priority: 0
     database_account_offer_type: Standard
   check_mode: yes
@@ -43,10 +43,10 @@
   azure_rm_cosmosdbaccount:
     resource_group: "{{ resource_group }}"
     name: "{{ dbname }}"
-    location: eastus
+    location: eastasia
     kind: global_document_db
     geo_rep_locations:
-      - name: eastus
+      - name: eastasia
         failover_priority: 0
       - name: westus
         failover_priority: 1
@@ -68,10 +68,10 @@
   azure_rm_cosmosdbaccount:
     resource_group: "{{ resource_group }}"
     name: "{{ dbname }}"
-    location: eastus
+    location: eastasia
     kind: global_document_db
     geo_rep_locations:
-      - name: eastus
+      - name: eastasia
         failover_priority: 0
       - name: westus
         failover_priority: 1
@@ -93,10 +93,10 @@
   azure_rm_cosmosdbaccount:
     resource_group: "{{ resource_group }}"
     name: "{{ dbname }}"
-    location: eastus
+    location: eastasia
     kind: global_document_db
     geo_rep_locations:
-      - name: eastus
+      - name: eastasia
         failover_priority: 0
       - name: westus
         failover_priority: 1