From 6a82b6973d47ee90d4c1b9e16d32891d33856be7 Mon Sep 17 00:00:00 2001 From: anna-savina Date: Tue, 9 Jul 2024 09:19:54 +0300 Subject: [PATCH 1/7] fixed import of snapshot_management role --- .../tasks/manage_snapshot.yml | 2 +- .../tasks/remove_snapshot.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration/targets/vmware_ops_snapshot_management_test/tasks/manage_snapshot.yml b/tests/integration/targets/vmware_ops_snapshot_management_test/tasks/manage_snapshot.yml index c3b3c1f0..2a0a1298 100644 --- a/tests/integration/targets/vmware_ops_snapshot_management_test/tasks/manage_snapshot.yml +++ b/tests/integration/targets/vmware_ops_snapshot_management_test/tasks/manage_snapshot.yml @@ -1,6 +1,6 @@ - name: Manage snapshot of existing VM ansible.builtin.import_role: - name: snapshot_management + name: cloud.vmware_ops.snapshot_management vars: snapshot_management_vm_name: "{{ item.snapshot_management_vm_name | default(omit) }}" snapshot_management_state: "{{ item.snapshot_management_state | default(omit) }}" diff --git a/tests/integration/targets/vmware_ops_snapshot_management_test/tasks/remove_snapshot.yml b/tests/integration/targets/vmware_ops_snapshot_management_test/tasks/remove_snapshot.yml index 46ee4a87..712e24aa 100644 --- a/tests/integration/targets/vmware_ops_snapshot_management_test/tasks/remove_snapshot.yml +++ b/tests/integration/targets/vmware_ops_snapshot_management_test/tasks/remove_snapshot.yml @@ -1,6 +1,6 @@ - name: Remove snapshot {{ item.snapshot_management_new_snapshot_name }} ansible.builtin.include_role: - name: snapshot_management + name: cloud.vmware_ops.snapshot_management vars: snapshot_management_vm_name: "{{ item.snapshot_management_vm_name }}" snapshot_management_snapshot_name: "{{ item.snapshot_management_new_snapshot_name }}" From 21e898f8c906cd7a17ef422ab9b9534eabe901e0 Mon Sep 17 00:00:00 2001 From: anna-savina Date: Tue, 9 Jul 2024 09:20:09 +0300 Subject: [PATCH 2/7] added run_on_simulator var --- .../tasks/main.yml | 2 +- .../vmware_ops_cluster_settings_test/vars.yml | 2 ++ .../vars/main.yml | 2 ++ .../tasks/main.yml | 3 +-- .../vars/main.yml | 2 ++ .../vmware_ops_deploy_ovf_test/tasks/main.yml | 3 +-- .../vmware_ops_deploy_ovf_test/vars/main.yml | 1 + .../tasks/main.yml | 4 +-- .../vars.yml | 2 ++ .../vars/main.yml | 1 + .../tasks/main.yml | 3 +-- .../vars/main.yml | 2 ++ .../tasks/main.yml | 2 +- .../vmware_ops_manage_folder_test/vars.yml | 2 ++ .../vars/main.yml | 2 ++ .../tasks/main.yml | 4 +-- .../vars.yml | 2 ++ .../vars/main.yml | 2 ++ .../tasks/main.yml | 4 +-- .../vmware_ops_provision_vm_test/vars.yml | 3 +++ .../vars/main.yml | 2 ++ .../tasks/main.yml | 4 +-- .../vars.yml | 25 +++++++++++-------- .../vars/main.yml | 2 ++ .../tasks/main.yml | 4 +-- .../vars.yml | 2 ++ .../vars/main.yml | 1 + 27 files changed, 59 insertions(+), 29 deletions(-) diff --git a/tests/integration/targets/vmware_ops_cluster_settings_test/tasks/main.yml b/tests/integration/targets/vmware_ops_cluster_settings_test/tasks/main.yml index c70764df..c1a2a58f 100644 --- a/tests/integration/targets/vmware_ops_cluster_settings_test/tasks/main.yml +++ b/tests/integration/targets/vmware_ops_cluster_settings_test/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Run cluster settings role on the vCenter Env - tags: eco-vcenter-ci + when: not run_on_simulator block: - name: Import common vars ansible.builtin.include_vars: diff --git a/tests/integration/targets/vmware_ops_cluster_settings_test/vars.yml b/tests/integration/targets/vmware_ops_cluster_settings_test/vars.yml index 3be73328..c8b7c2f1 100644 --- a/tests/integration/targets/vmware_ops_cluster_settings_test/vars.yml +++ b/tests/integration/targets/vmware_ops_cluster_settings_test/vars.yml @@ -1,4 +1,6 @@ --- +run_on_simulator: true + cluster_settings_hostname: "127.0.0.1" cluster_settings_username: "test" cluster_settings_password: "test" diff --git a/tests/integration/targets/vmware_ops_cluster_settings_test/vars/main.yml b/tests/integration/targets/vmware_ops_cluster_settings_test/vars/main.yml index 04af1cf9..b43d3bcf 100644 --- a/tests/integration/targets/vmware_ops_cluster_settings_test/vars/main.yml +++ b/tests/integration/targets/vmware_ops_cluster_settings_test/vars/main.yml @@ -1,4 +1,6 @@ --- +run_on_simulator: false + cluster_settings_hostname: "{{ vcenter_hostname }}" cluster_settings_username: "{{ vcenter_username }}" cluster_settings_password: "{{ vcenter_password }}" diff --git a/tests/integration/targets/vmware_ops_content_library_test/tasks/main.yml b/tests/integration/targets/vmware_ops_content_library_test/tasks/main.yml index 78cf3fbd..952d3f8c 100644 --- a/tests/integration/targets/vmware_ops_content_library_test/tasks/main.yml +++ b/tests/integration/targets/vmware_ops_content_library_test/tasks/main.yml @@ -1,7 +1,6 @@ --- - name: Test - tags: - - eco-vcenter-ci + when: not run_on_simulator block: - name: Import common vars ansible.builtin.include_vars: diff --git a/tests/integration/targets/vmware_ops_content_library_test/vars/main.yml b/tests/integration/targets/vmware_ops_content_library_test/vars/main.yml index e68d998f..8a39b9dd 100644 --- a/tests/integration/targets/vmware_ops_content_library_test/vars/main.yml +++ b/tests/integration/targets/vmware_ops_content_library_test/vars/main.yml @@ -1,4 +1,6 @@ --- +run_on_simulator: false + content_library_hostname: "{{ vcenter_hostname }}" content_library_username: "{{ vcenter_username }}" content_library_password: "{{ vcenter_password }}" 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 index 35b31884..bd4ff13d 100644 --- a/tests/integration/targets/vmware_ops_deploy_ovf_test/tasks/main.yml +++ b/tests/integration/targets/vmware_ops_deploy_ovf_test/tasks/main.yml @@ -1,7 +1,6 @@ --- - name: Setup - tags: - - eco-vcenter-ci + when: not run_on_simulator block: - name: Import common vars ansible.builtin.include_vars: diff --git a/tests/integration/targets/vmware_ops_deploy_ovf_test/vars/main.yml b/tests/integration/targets/vmware_ops_deploy_ovf_test/vars/main.yml index 0fba6050..e062f406 100644 --- a/tests/integration/targets/vmware_ops_deploy_ovf_test/vars/main.yml +++ b/tests/integration/targets/vmware_ops_deploy_ovf_test/vars/main.yml @@ -1,4 +1,5 @@ --- +run_on_simulator: false vmware_deploy_ovf_test_export_dir: /tmp deploy_ovf_hostname: "{{ vcenter_hostname }}" diff --git a/tests/integration/targets/vmware_ops_esxi_maintenance_mode_test/tasks/main.yml b/tests/integration/targets/vmware_ops_esxi_maintenance_mode_test/tasks/main.yml index 28ddc6c2..3e6053f9 100644 --- a/tests/integration/targets/vmware_ops_esxi_maintenance_mode_test/tasks/main.yml +++ b/tests/integration/targets/vmware_ops_esxi_maintenance_mode_test/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Test esxi maintenance on simulator - tags: integration-ci + when: run_on_simulator block: - name: Enable Maintenance Mode ansible.builtin.include_role: @@ -15,7 +15,7 @@ esxi_maintenance_mode_enable: False - name: Test esxi maintenance mode on vcenter env - tags: eco-vcenter-ci + when: not run_on_simulator block: - name: Import common vars ansible.builtin.include_vars: diff --git a/tests/integration/targets/vmware_ops_esxi_maintenance_mode_test/vars.yml b/tests/integration/targets/vmware_ops_esxi_maintenance_mode_test/vars.yml index 4d5b1583..63521163 100644 --- a/tests/integration/targets/vmware_ops_esxi_maintenance_mode_test/vars.yml +++ b/tests/integration/targets/vmware_ops_esxi_maintenance_mode_test/vars.yml @@ -1,4 +1,6 @@ --- +run_on_simulator: true + esxi_maintenance_mode_hostname: "127.0.0.1" esxi_maintenance_mode_username: "test" esxi_maintenance_mode_password: "test" diff --git a/tests/integration/targets/vmware_ops_esxi_maintenance_mode_test/vars/main.yml b/tests/integration/targets/vmware_ops_esxi_maintenance_mode_test/vars/main.yml index 151ceea6..074ae4d4 100644 --- a/tests/integration/targets/vmware_ops_esxi_maintenance_mode_test/vars/main.yml +++ b/tests/integration/targets/vmware_ops_esxi_maintenance_mode_test/vars/main.yml @@ -1,5 +1,6 @@ --- # General vars +run_on_simulator: false resource_prefix: host-maintenance resource_pool_name: "{{ resource_prefix }}-pool" diff --git a/tests/integration/targets/vmware_ops_export_vm_as_ovf_test/tasks/main.yml b/tests/integration/targets/vmware_ops_export_vm_as_ovf_test/tasks/main.yml index 9d861750..09fadf3a 100644 --- a/tests/integration/targets/vmware_ops_export_vm_as_ovf_test/tasks/main.yml +++ b/tests/integration/targets/vmware_ops_export_vm_as_ovf_test/tasks/main.yml @@ -1,7 +1,6 @@ --- - name: Test - tags: - - eco-vcenter-ci + when: not run_on_simulator block: - name: Import common vars ansible.builtin.include_vars: diff --git a/tests/integration/targets/vmware_ops_export_vm_as_ovf_test/vars/main.yml b/tests/integration/targets/vmware_ops_export_vm_as_ovf_test/vars/main.yml index c727d7ff..9ebd98e3 100644 --- a/tests/integration/targets/vmware_ops_export_vm_as_ovf_test/vars/main.yml +++ b/tests/integration/targets/vmware_ops_export_vm_as_ovf_test/vars/main.yml @@ -1,4 +1,6 @@ --- +run_on_simulator: false + export_vm_as_ovf_hostname: "{{ vcenter_hostname }}" export_vm_as_ovf_username: "{{ vcenter_username }}" export_vm_as_ovf_password: "{{ vcenter_password }}" diff --git a/tests/integration/targets/vmware_ops_manage_folder_test/tasks/main.yml b/tests/integration/targets/vmware_ops_manage_folder_test/tasks/main.yml index 5751cd74..8c6cee49 100644 --- a/tests/integration/targets/vmware_ops_manage_folder_test/tasks/main.yml +++ b/tests/integration/targets/vmware_ops_manage_folder_test/tasks/main.yml @@ -2,7 +2,7 @@ - name: Import common vars for tests on vCenter Environment ansible.builtin.include_vars: file: ../group_vars.yml - tags: eco-vcenter-ci + when: not run_on_simulator - name: Create Folder Tree loop: "{{ folder_types }}" diff --git a/tests/integration/targets/vmware_ops_manage_folder_test/vars.yml b/tests/integration/targets/vmware_ops_manage_folder_test/vars.yml index 36d4edf6..56c75219 100644 --- a/tests/integration/targets/vmware_ops_manage_folder_test/vars.yml +++ b/tests/integration/targets/vmware_ops_manage_folder_test/vars.yml @@ -1,4 +1,6 @@ --- +run_on_simulator: true + manage_folder_hostname: "127.0.0.1" manage_folder_username: "test" manage_folder_password: "test" diff --git a/tests/integration/targets/vmware_ops_manage_folder_test/vars/main.yml b/tests/integration/targets/vmware_ops_manage_folder_test/vars/main.yml index 786949e7..af639c42 100644 --- a/tests/integration/targets/vmware_ops_manage_folder_test/vars/main.yml +++ b/tests/integration/targets/vmware_ops_manage_folder_test/vars/main.yml @@ -1,4 +1,6 @@ --- +run_on_simulator: false + manage_folder_hostname: "{{ vcenter_hostname }}" manage_folder_username: "{{ vcenter_username }}" manage_folder_password: "{{ vcenter_password }}" diff --git a/tests/integration/targets/vmware_ops_provision_virtual_esxi_test/tasks/main.yml b/tests/integration/targets/vmware_ops_provision_virtual_esxi_test/tasks/main.yml index 46fdb6a7..e5113a48 100644 --- a/tests/integration/targets/vmware_ops_provision_virtual_esxi_test/tasks/main.yml +++ b/tests/integration/targets/vmware_ops_provision_virtual_esxi_test/tasks/main.yml @@ -1,11 +1,11 @@ --- - name: Test Virtual Esxi Provisioning on Simulator - tags: integration-ci + when: run_on_simulator ansible.builtin.include_role: name: cloud.vmware_ops.provision_virtual_esxi - name: Test Virtual Esxi Provisioning on vCenter Env - tags: eco-vcenter-ci + when: not run_on_simulator block: - name: Import common vars ansible.builtin.include_vars: diff --git a/tests/integration/targets/vmware_ops_provision_virtual_esxi_test/vars.yml b/tests/integration/targets/vmware_ops_provision_virtual_esxi_test/vars.yml index 7b271f62..09aff66c 100644 --- a/tests/integration/targets/vmware_ops_provision_virtual_esxi_test/vars.yml +++ b/tests/integration/targets/vmware_ops_provision_virtual_esxi_test/vars.yml @@ -1,4 +1,6 @@ --- +run_on_simulator: true + provision_virtual_esxi_hostname: "127.0.0.1" provision_virtual_esxi_username: "test" provision_virtual_esxi_password: "test" diff --git a/tests/integration/targets/vmware_ops_provision_virtual_esxi_test/vars/main.yml b/tests/integration/targets/vmware_ops_provision_virtual_esxi_test/vars/main.yml index 54bfee41..f5da6f8c 100644 --- a/tests/integration/targets/vmware_ops_provision_virtual_esxi_test/vars/main.yml +++ b/tests/integration/targets/vmware_ops_provision_virtual_esxi_test/vars/main.yml @@ -1,4 +1,6 @@ --- +run_on_simulator: false + provision_virtual_esxi_hostname: "{{ vcenter_hostname }}" provision_virtual_esxi_username: "{{ vcenter_username }}" provision_virtual_esxi_password: "{{ vcenter_password }}" diff --git a/tests/integration/targets/vmware_ops_provision_vm_test/tasks/main.yml b/tests/integration/targets/vmware_ops_provision_vm_test/tasks/main.yml index 09514c09..a2572912 100644 --- a/tests/integration/targets/vmware_ops_provision_vm_test/tasks/main.yml +++ b/tests/integration/targets/vmware_ops_provision_vm_test/tasks/main.yml @@ -2,9 +2,10 @@ - name: Provision VM for simulator ansible.builtin.import_role: name: cloud.vmware_ops.provision_vm - tags: integration-ci + when: run_on_simulator - name: Perform VM Lifecycle Operations in vCenter Environment + when: not run_on_simulator block: - name: Import common vars ansible.builtin.include_vars: @@ -48,4 +49,3 @@ switch: "{{ vswitch_name }}" portgroup: "{{ portgroup_name }}" state: absent - tags: eco-vcenter-ci diff --git a/tests/integration/targets/vmware_ops_provision_vm_test/vars.yml b/tests/integration/targets/vmware_ops_provision_vm_test/vars.yml index afda0716..8915584b 100644 --- a/tests/integration/targets/vmware_ops_provision_vm_test/vars.yml +++ b/tests/integration/targets/vmware_ops_provision_vm_test/vars.yml @@ -1,3 +1,6 @@ +--- +run_on_simulator: true + provision_vm_hostname: "127.0.0.1" provision_vm_username: "test" provision_vm_password: "test" diff --git a/tests/integration/targets/vmware_ops_provision_vm_test/vars/main.yml b/tests/integration/targets/vmware_ops_provision_vm_test/vars/main.yml index e24a060b..db9e20f4 100644 --- a/tests/integration/targets/vmware_ops_provision_vm_test/vars/main.yml +++ b/tests/integration/targets/vmware_ops_provision_vm_test/vars/main.yml @@ -1,4 +1,6 @@ # vars.yaml +run_on_simulator: false + provision_vm_hostname: "{{ vcenter_hostname }}" provision_vm_username: "{{ vcenter_username }}" provision_vm_password: "{{ vcenter_password }}" diff --git a/tests/integration/targets/vmware_ops_snapshot_management_test/tasks/main.yml b/tests/integration/targets/vmware_ops_snapshot_management_test/tasks/main.yml index 61997877..81060667 100644 --- a/tests/integration/targets/vmware_ops_snapshot_management_test/tasks/main.yml +++ b/tests/integration/targets/vmware_ops_snapshot_management_test/tasks/main.yml @@ -4,9 +4,10 @@ ignore_errors: true ansible.builtin.import_role: name: cloud.vmware_ops.snapshot_management - tags: integration-ci + when: run_on_simulator - name: Test VM snapshot management role in vCenter Environment + when: not run_on_simulator block: - name: Import common vars ansible.builtin.include_vars: @@ -49,4 +50,3 @@ vars: provision_vm_state: absent provision_vm_force: true - tags: eco-vcenter-ci \ No newline at end of file diff --git a/tests/integration/targets/vmware_ops_snapshot_management_test/vars.yml b/tests/integration/targets/vmware_ops_snapshot_management_test/vars.yml index 5ac8c739..332907b7 100644 --- a/tests/integration/targets/vmware_ops_snapshot_management_test/vars.yml +++ b/tests/integration/targets/vmware_ops_snapshot_management_test/vars.yml @@ -1,11 +1,14 @@ - snapshot_management_hostname: "127.0.0.1" - snapshot_management_username: "test" - snapshot_management_password: "test" - snapshot_management_validate_certs: false - snapshot_management_folder: "/DC0/vm" - snapshot_management_datacenter: "DC0" - snapshot_management_vm_name: "DC0_H0_VM0" - snapshot_management_port: "8989" - snapshot_management_state: present - snapshot_management_snapshot_name: "snap1" - snapshot_management_snapshot_description: "snap1_description" \ No newline at end of file +--- +run_on_simulator: true + +snapshot_management_hostname: "127.0.0.1" +snapshot_management_username: "test" +snapshot_management_password: "test" +snapshot_management_validate_certs: false +snapshot_management_folder: "/DC0/vm" +snapshot_management_datacenter: "DC0" +snapshot_management_vm_name: "DC0_H0_VM0" +snapshot_management_port: "8989" +snapshot_management_state: present +snapshot_management_snapshot_name: "snap1" +snapshot_management_snapshot_description: "snap1_description" \ No newline at end of file diff --git a/tests/integration/targets/vmware_ops_snapshot_management_test/vars/main.yml b/tests/integration/targets/vmware_ops_snapshot_management_test/vars/main.yml index 87b4a7c0..8352b965 100644 --- a/tests/integration/targets/vmware_ops_snapshot_management_test/vars/main.yml +++ b/tests/integration/targets/vmware_ops_snapshot_management_test/vars/main.yml @@ -1,4 +1,6 @@ # vars.yaml +run_on_simulator: false + snapshot_management_hostname: "{{ vcenter_hostname }}" snapshot_management_username: "{{ vcenter_username }}" snapshot_management_password: "{{ vcenter_password }}" diff --git a/tests/integration/targets/vmware_ops_vcenter_host_connection_test/tasks/main.yml b/tests/integration/targets/vmware_ops_vcenter_host_connection_test/tasks/main.yml index f152e122..c490a515 100644 --- a/tests/integration/targets/vmware_ops_vcenter_host_connection_test/tasks/main.yml +++ b/tests/integration/targets/vmware_ops_vcenter_host_connection_test/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Test vCenter host connection role on vCenter env - tags: eco-vcenter-ci + when: not run_on_simulator block: - name: Import common vars ansible.builtin.include_vars: @@ -89,7 +89,7 @@ required_state: absent - name: Test vCenter host connection role on simulator - tags: integration-ci + when: run_on_simulator block: - name: Add ESXI Host to vCenter Cluster ansible.builtin.import_role: diff --git a/tests/integration/targets/vmware_ops_vcenter_host_connection_test/vars.yml b/tests/integration/targets/vmware_ops_vcenter_host_connection_test/vars.yml index 20c4996a..90c33d4c 100644 --- a/tests/integration/targets/vmware_ops_vcenter_host_connection_test/vars.yml +++ b/tests/integration/targets/vmware_ops_vcenter_host_connection_test/vars.yml @@ -1,4 +1,6 @@ --- +run_on_simulator: true + vcenter_host_connection_hostname: "127.0.0.1" vcenter_host_connection_username: "test" vcenter_host_connection_password: "test" diff --git a/tests/integration/targets/vmware_ops_vcenter_host_connection_test/vars/main.yml b/tests/integration/targets/vmware_ops_vcenter_host_connection_test/vars/main.yml index 57b36b42..e436b6b3 100644 --- a/tests/integration/targets/vmware_ops_vcenter_host_connection_test/vars/main.yml +++ b/tests/integration/targets/vmware_ops_vcenter_host_connection_test/vars/main.yml @@ -1,5 +1,6 @@ --- # General +run_on_simulator: false resource_pool_name: "host-connection-test-pool" # Vars for cloud.vmware_ops.provision_virtual_esxi role From bba2a00bd23c4a7f5b54738de28b7c91fa0863ab Mon Sep 17 00:00:00 2001 From: anna-savina Date: Tue, 9 Jul 2024 10:01:01 +0300 Subject: [PATCH 3/7] replaced include_role with import_role --- .../targets/vmware_ops_cluster_settings_test/run.yml | 2 +- .../targets/vmware_ops_deploy_ovf_test/tasks/main.yml | 3 +-- .../targets/vmware_ops_esxi_maintenance_mode_test/run.yml | 2 +- .../targets/vmware_ops_provision_virtual_esxi_test/run.yml | 2 +- .../integration/targets/vmware_ops_provision_vm_test/run.yml | 2 +- .../targets/vmware_ops_snapshot_management_test/run.yml | 4 ++-- .../targets/vmware_ops_vcenter_host_connection_test/run.yml | 2 +- 7 files changed, 8 insertions(+), 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 index 637c84c1..69ed829f 100644 --- 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 index bd4ff13d..eb0e9022 100644 --- 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 index 75e9b5d5..5cfcb1c5 100644 --- 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 index c9b60d6b..b0fdf722 100644 --- 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 index 6164f3f0..5b1953bd 100644 --- 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 index c5528529..a6221344 100644 --- 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 index da6e18b3..f10623db 100644 --- 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 From 9abbb3fdb03a6ad7ddc86730c9b267a1563ad549 Mon Sep 17 00:00:00 2001 From: anna-savina Date: Tue, 9 Jul 2024 19:59:58 +0300 Subject: [PATCH 4/7] removed provision_vm_datastore var --- .../targets/vmware_ops_provision_virtual_esxi_test/vars/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/integration/targets/vmware_ops_provision_virtual_esxi_test/vars/main.yml b/tests/integration/targets/vmware_ops_provision_virtual_esxi_test/vars/main.yml index f5da6f8c..9668e017 100644 --- a/tests/integration/targets/vmware_ops_provision_virtual_esxi_test/vars/main.yml +++ b/tests/integration/targets/vmware_ops_provision_virtual_esxi_test/vars/main.yml @@ -24,4 +24,3 @@ provision_virtual_esxi_disks: datastore: datastore1 provision_virtual_esxi_memory_mb: 10000 provision_virtual_esxi_cpus: 8 -provision_vm_datastore: "datastore1" From e0b9a569b69696e523e8bfd5e1f36c485eb9d6a4 Mon Sep 17 00:00:00 2001 From: anna-savina Date: Wed, 10 Jul 2024 09:49:47 +0300 Subject: [PATCH 5/7] added mock_side_effects to the provision virtual esxi test run --- .../mock_side_effects.yml | 2 +- .../runme.sh | 14 ++++++++++++++ tools/prepare_symlinks.yml | 4 +++- 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100755 tests/integration/targets/vmware_ops_provision_virtual_esxi_test/runme.sh diff --git a/tests/integration/targets/vmware_ops_provision_virtual_esxi_test/mock_side_effects.yml b/tests/integration/targets/vmware_ops_provision_virtual_esxi_test/mock_side_effects.yml index 3a8a05fb..80885403 100644 --- a/tests/integration/targets/vmware_ops_provision_virtual_esxi_test/mock_side_effects.yml +++ b/tests/integration/targets/vmware_ops_provision_virtual_esxi_test/mock_side_effects.yml @@ -2,7 +2,7 @@ - hosts: localhost gather_facts: false vars_files: - - "{{ playbook_dir }}/vars/main.yml" + - vars.yml tasks: # the esxi ISO usually powers down new hosts when they are done - name: Mock ESXi Host Power Down diff --git a/tests/integration/targets/vmware_ops_provision_virtual_esxi_test/runme.sh b/tests/integration/targets/vmware_ops_provision_virtual_esxi_test/runme.sh new file mode 100755 index 00000000..ae432936 --- /dev/null +++ b/tests/integration/targets/vmware_ops_provision_virtual_esxi_test/runme.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash +source ../init.sh + +# Extract the ansible_tags from integration_config.yml +ANSIBLE_TAGS=$(awk '/ansible_tags/ {print $2}' ../../integration_config.yml) + +# Check if the ANSIBLE_TAGS variable is set +if [[ -n "$ANSIBLE_TAGS" ]]; then + echo "ANSIBLE_TAGS is set to: $ANSIBLE_TAGS" + ansible-playbook run.yml --tags "$ANSIBLE_TAGS" +else + echo "ANSIBLE_TAGS is not set for Eco vCenter. Running on simulator." + ansible-playbook mock_side_effects.yml & ansible-playbook run.yml --tags integration-ci +fi diff --git a/tools/prepare_symlinks.yml b/tools/prepare_symlinks.yml index b69da192..a191ef13 100644 --- a/tools/prepare_symlinks.yml +++ b/tools/prepare_symlinks.yml @@ -16,4 +16,6 @@ mode: '0755' force: true loop: "{{ target_dirs.files }}" - when: item.path | basename | regex_search('^vmware_ops_') + when: + - item.path | basename | regex_search('^vmware_ops_') + - not item.path | basename | regex_search('vmware_ops_provision_virtual_esxi_test') From eb12f4e07c2385a362b0fe1d438d64c55130a84c Mon Sep 17 00:00:00 2001 From: anna-savina Date: Wed, 10 Jul 2024 10:50:28 +0300 Subject: [PATCH 6/7] removed trailing spaces --- tools/prepare_symlinks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/prepare_symlinks.yml b/tools/prepare_symlinks.yml index a191ef13..5433b697 100644 --- a/tools/prepare_symlinks.yml +++ b/tools/prepare_symlinks.yml @@ -16,6 +16,6 @@ mode: '0755' force: true loop: "{{ target_dirs.files }}" - when: + when: - item.path | basename | regex_search('^vmware_ops_') - not item.path | basename | regex_search('vmware_ops_provision_virtual_esxi_test') From 1c177c1e354f3cad55d4726490477594d5c29975 Mon Sep 17 00:00:00 2001 From: anna-savina Date: Wed, 10 Jul 2024 12:24:25 +0300 Subject: [PATCH 7/7] added comment about exception for runme.sh for provision_virtual_esxi test --- tools/prepare_symlinks.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/prepare_symlinks.yml b/tools/prepare_symlinks.yml index 5433b697..4110c775 100644 --- a/tools/prepare_symlinks.yml +++ b/tools/prepare_symlinks.yml @@ -18,4 +18,5 @@ loop: "{{ target_dirs.files }}" when: - item.path | basename | regex_search('^vmware_ops_') + # the test is excluded because it has a unique runme.sh created manually - not item.path | basename | regex_search('vmware_ops_provision_virtual_esxi_test')