replaced include_role with import_role

redhat-cop · Jul 9, 2024 · 01891d9 · 01891d9
1 parent 67cc085
commit 01891d9
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 9 deletions.
diff --git a/tests/integration/targets/vmware_ops_cluster_settings_test/run.yml b/tests/integration/targets/vmware_ops_cluster_settings_test/run.yml
@@ -10,7 +10,7 @@
       tags: eco-vcenter-ci
 
     - name: Import cluster_settings role
-      ansible.builtin.include_role:
+      ansible.builtin.import_role:
         name: vmware_ops_cluster_settings_test
       tags:
         - eco-vcenter-ci
diff --git a/tests/integration/targets/vmware_ops_deploy_ovf_test/tasks/main.yml b/tests/integration/targets/vmware_ops_deploy_ovf_test/tasks/main.yml
@@ -46,8 +46,7 @@
         state: absent
 
 - name: Test
-  tags:
-    - eco-vcenter-ci
+  when: not run_on_simulator
   block:
     - name: Test Deploy OVF From Local Filesystem
       ansible.builtin.import_role:

diff --git a/tests/integration/targets/vmware_ops_esxi_maintenance_mode_test/run.yml b/tests/integration/targets/vmware_ops_esxi_maintenance_mode_test/run.yml
@@ -20,7 +20,7 @@
       tags: integration-ci
 
     - name: Import esxi maintenance test
-      ansible.builtin.include_role:
+      ansible.builtin.import_role:
         name: vmware_ops_esxi_maintenance_mode_test
       tags:
         - eco-vcenter-ci

diff --git a/tests/integration/targets/vmware_ops_provision_virtual_esxi_test/run.yml b/tests/integration/targets/vmware_ops_provision_virtual_esxi_test/run.yml
@@ -21,7 +21,7 @@
       tags: integration-ci
 
     - name: Import provision virtual ESXi role
-      ansible.builtin.include_role:
+      ansible.builtin.import_role:
         name: vmware_ops_provision_virtual_esxi_test
       tags:
         - integration-ci

diff --git a/tests/integration/targets/vmware_ops_provision_vm_test/run.yml b/tests/integration/targets/vmware_ops_provision_vm_test/run.yml
@@ -20,7 +20,7 @@
       tags: integration-ci
 
     - name: Import provision VM role
-      ansible.builtin.include_role:
+      ansible.builtin.import_role:
         name: vmware_ops_provision_vm_test
       tags:
         - eco-vcenter-ci

diff --git a/tests/integration/targets/vmware_ops_snapshot_management_test/run.yml b/tests/integration/targets/vmware_ops_snapshot_management_test/run.yml
@@ -15,12 +15,12 @@
       tags: integration-ci
 
     - name: Vcsim
-      ansible.builtin.include_role:
+      ansible.builtin.import_role:
         name: prepare_soap
       tags: integration-ci
 
     - name: Import manage VM snapshot role
-      ansible.builtin.include_role:
+      ansible.builtin.import_role:
         name: vmware_ops_snapshot_management_test
       tags:
         - eco-vcenter-ci

diff --git a/tests/integration/targets/vmware_ops_vcenter_host_connection_test/run.yml b/tests/integration/targets/vmware_ops_vcenter_host_connection_test/run.yml
@@ -25,7 +25,7 @@
       tags: integration-ci
 
     - name: Import vcenter_host_connection_test
-      ansible.builtin.include_role:
+      ansible.builtin.import_role:
         name: vmware_ops_vcenter_host_connection_test
       tags:
         - eco-vcenter-ci