Merge pull request #49678 from resmo/fix/cloudstack-tests-unstable

cloudstack: Fixes for unstable tests

test/integration/targets/cs_instance/tasks/present.yml

@@ -212,46 +212,9 @@
     - instance.service_offering == "{{ test_cs_instance_offering_2 }}"
     - instance.state == "Stopped"
 
-- name: setup zone facts
-  cs_zone_facts:
-    name: "{{ cs_common_zone_basic }}"
-
-- name: setup find the host name
-  shell: cs listHosts type=routing zoneid="{{ cloudstack_zone.id }}"
-  args:
-    chdir: "{{ playbook_dir }}"
-  register: host
-
-- name: host convert from json
-  set_fact:
-    host_json: "{{ host.stdout | from_json }}"
-
-- name: select a host on which the instance is not running on
-  set_fact:
-    host: "{{ host_json | json_query('host[?name!=`' + cloudstack_instance.host + '`] | [0]') }}"
-
-- name: test starting instance in check mode
-  cs_instance:
-    name: "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
-    host: "{{ host.name }}"
-    state: started
-  register: instance
-  check_mode: true
-- name: verify starting instance in check mode
-  assert:
-    that:
-    - instance is successful
-    - instance is changed
-    - instance.name == "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
-    - instance.display_name == "{{ cs_resource_prefix }}-display-{{ instance_number }}"
-    - instance.service_offering == "{{ test_cs_instance_offering_2 }}"
-    - instance.host is not defined
-    - instance.state == "Stopped"
-
 - name: test starting instance
   cs_instance:
     name: "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
-    host: "{{ host.name }}"
     state: started
   register: instance
 - name: verify starting instance
@@ -262,14 +225,11 @@
     - instance.name == "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
     - instance.display_name == "{{ cs_resource_prefix }}-display-{{ instance_number }}"
     - instance.service_offering == "{{ test_cs_instance_offering_2 }}"
-    # TODO: this fails randomly, cloudstack issue?
-    #- instance.host == "{{ host.name }}"
     - instance.state == "Running"
 
 - name: test starting instance idempotence
   cs_instance:
     name: "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
-    host: "{{ host.name }}"
     state: started
   register: instance
 - name: verify starting instance idempotence
@@ -280,19 +240,12 @@
     - instance.name == "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
     - instance.display_name == "{{ cs_resource_prefix }}-display-{{ instance_number }}"
     - instance.service_offering == "{{ test_cs_instance_offering_2 }}"
-    # TODO: this fails randomly, cloudstack issue?
-    #- instance.host == "{{ host.name }}"
     - instance.state == "Running"
 
-- name: select a host on which the instance is not running on
-  set_fact:
-    host: "{{ host_json | json_query('host[?name!=`' + instance.host + '`] | [0]') }}"
-
 - name: test force update running instance in check mode
   cs_instance:
     name: "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
     service_offering: "{{ test_cs_instance_offering_1 }}"
-    host: "{{ host.name }}"
     force: true
   register: instance
   check_mode: true
@@ -304,14 +257,12 @@
     - instance.name == "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
     - instance.display_name == "{{ cs_resource_prefix }}-display-{{ instance_number }}"
     - instance.service_offering == "{{ test_cs_instance_offering_2 }}"
-    - instance.host != "{{ host.name }}"
     - instance.state == "Running"
 
 - name: test force update running instance
   cs_instance:
     name: "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
     service_offering: "{{ test_cs_instance_offering_1 }}"
-    host: "{{ host.name }}"
     force: true
   register: instance
 - name: verify force update running instance
@@ -322,14 +273,12 @@
     - instance.name == "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
     - instance.display_name == "{{ cs_resource_prefix }}-display-{{ instance_number }}"
     - instance.service_offering == "{{ test_cs_instance_offering_1 }}"
-    - instance.host == "{{ host.name }}"
     - instance.state == "Running"
 
 - name: test force update running instance idempotence
   cs_instance:
     name: "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
     service_offering: "{{ test_cs_instance_offering_1 }}"
-    host: "{{ host.name }}"
     force: true
   register: instance
 - name: verify force update running instance idempotence
@@ -340,7 +289,6 @@
     - instance.name == "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
     - instance.display_name == "{{ cs_resource_prefix }}-display-{{ instance_number }}"
     - instance.service_offering == "{{ test_cs_instance_offering_1 }}"
-    - instance.host == "{{ host.name }}"
     - instance.state == "Running"
 
 - name: test restore instance in check mode