diff --git a/test/integration/targets/prepare_vmware_tests/tasks/setup_attach_hosts.yml b/test/integration/targets/prepare_vmware_tests/tasks/setup_attach_hosts.yml index 73942b68c24..0df7541ac3d 100644 --- a/test/integration/targets/prepare_vmware_tests/tasks/setup_attach_hosts.yml +++ b/test/integration/targets/prepare_vmware_tests/tasks/setup_attach_hosts.yml @@ -1,3 +1,7 @@ +- fail: + msg: "No ESXi hosts defined. esxi_hosts is empty." + when: "esxi_hosts|length == 0" + - name: Add ESXi Hosts to vCenter vmware_host: datacenter_name: '{{ dc1 }}' diff --git a/test/integration/targets/vcenter_folder/aliases b/test/integration/targets/vcenter_folder/aliases index 32dd9d53456..be8c5b72ffd 100644 --- a/test/integration/targets/vcenter_folder/aliases +++ b/test/integration/targets/vcenter_folder/aliases @@ -1,2 +1,3 @@ shippable/vcenter/group1 cloud/vcenter +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vcenter_license/aliases b/test/integration/targets/vcenter_license/aliases index 32dd9d53456..be8c5b72ffd 100644 --- a/test/integration/targets/vcenter_license/aliases +++ b/test/integration/targets/vcenter_license/aliases @@ -1,2 +1,3 @@ shippable/vcenter/group1 cloud/vcenter +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_about_facts/aliases b/test/integration/targets/vmware_about_facts/aliases index eb39c07bac0..b6fc00bfec4 100644 --- a/test/integration/targets/vmware_about_facts/aliases +++ b/test/integration/targets/vmware_about_facts/aliases @@ -1,3 +1,4 @@ shippable/vcenter/group1 cloud/vcenter needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_about_info/aliases b/test/integration/targets/vmware_about_info/aliases index eb39c07bac0..b6fc00bfec4 100644 --- a/test/integration/targets/vmware_about_info/aliases +++ b/test/integration/targets/vmware_about_info/aliases @@ -1,3 +1,4 @@ shippable/vcenter/group1 cloud/vcenter needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_cluster/aliases b/test/integration/targets/vmware_cluster/aliases index eb39c07bac0..b6fc00bfec4 100644 --- a/test/integration/targets/vmware_cluster/aliases +++ b/test/integration/targets/vmware_cluster/aliases @@ -1,3 +1,4 @@ shippable/vcenter/group1 cloud/vcenter needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_cluster_drs/aliases b/test/integration/targets/vmware_cluster_drs/aliases index eb39c07bac0..b6fc00bfec4 100644 --- a/test/integration/targets/vmware_cluster_drs/aliases +++ b/test/integration/targets/vmware_cluster_drs/aliases @@ -1,3 +1,4 @@ shippable/vcenter/group1 cloud/vcenter needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_cluster_ha/aliases b/test/integration/targets/vmware_cluster_ha/aliases index eb39c07bac0..b6fc00bfec4 100644 --- a/test/integration/targets/vmware_cluster_ha/aliases +++ b/test/integration/targets/vmware_cluster_ha/aliases @@ -1,3 +1,4 @@ shippable/vcenter/group1 cloud/vcenter needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_cluster_vsan/aliases b/test/integration/targets/vmware_cluster_vsan/aliases index eb39c07bac0..b6fc00bfec4 100644 --- a/test/integration/targets/vmware_cluster_vsan/aliases +++ b/test/integration/targets/vmware_cluster_vsan/aliases @@ -1,3 +1,4 @@ shippable/vcenter/group1 cloud/vcenter needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_content_deploy_template/aliases b/test/integration/targets/vmware_content_deploy_template/aliases index f44f70d85fd..b3bf7b222c2 100644 --- a/test/integration/targets/vmware_content_deploy_template/aliases +++ b/test/integration/targets/vmware_content_deploy_template/aliases @@ -1,3 +1,4 @@ cloud/vcenter unsupported needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_datacenter/aliases b/test/integration/targets/vmware_datacenter/aliases index eb39c07bac0..b6fc00bfec4 100644 --- a/test/integration/targets/vmware_datacenter/aliases +++ b/test/integration/targets/vmware_datacenter/aliases @@ -1,3 +1,4 @@ shippable/vcenter/group1 cloud/vcenter needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_datastore_cluster/aliases b/test/integration/targets/vmware_datastore_cluster/aliases index eb39c07bac0..b6fc00bfec4 100644 --- a/test/integration/targets/vmware_datastore_cluster/aliases +++ b/test/integration/targets/vmware_datastore_cluster/aliases @@ -1,3 +1,4 @@ shippable/vcenter/group1 cloud/vcenter needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_drs_group_facts/aliases b/test/integration/targets/vmware_drs_group_facts/aliases index eb39c07bac0..b6fc00bfec4 100644 --- a/test/integration/targets/vmware_drs_group_facts/aliases +++ b/test/integration/targets/vmware_drs_group_facts/aliases @@ -1,3 +1,4 @@ shippable/vcenter/group1 cloud/vcenter needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_drs_group_info/aliases b/test/integration/targets/vmware_drs_group_info/aliases index eb39c07bac0..b6fc00bfec4 100644 --- a/test/integration/targets/vmware_drs_group_info/aliases +++ b/test/integration/targets/vmware_drs_group_info/aliases @@ -1,3 +1,4 @@ shippable/vcenter/group1 cloud/vcenter needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_drs_rule_facts/aliases b/test/integration/targets/vmware_drs_rule_facts/aliases index eb39c07bac0..b6fc00bfec4 100644 --- a/test/integration/targets/vmware_drs_rule_facts/aliases +++ b/test/integration/targets/vmware_drs_rule_facts/aliases @@ -1,3 +1,4 @@ shippable/vcenter/group1 cloud/vcenter needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_drs_rule_info/aliases b/test/integration/targets/vmware_drs_rule_info/aliases index eb39c07bac0..b6fc00bfec4 100644 --- a/test/integration/targets/vmware_drs_rule_info/aliases +++ b/test/integration/targets/vmware_drs_rule_info/aliases @@ -1,3 +1,4 @@ shippable/vcenter/group1 cloud/vcenter needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_dvs_portgroup/aliases b/test/integration/targets/vmware_dvs_portgroup/aliases index eb39c07bac0..b6fc00bfec4 100644 --- a/test/integration/targets/vmware_dvs_portgroup/aliases +++ b/test/integration/targets/vmware_dvs_portgroup/aliases @@ -1,3 +1,4 @@ shippable/vcenter/group1 cloud/vcenter needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_dvs_portgroup_facts/aliases b/test/integration/targets/vmware_dvs_portgroup_facts/aliases index 3eede2cbf01..b1212da1b7f 100644 --- a/test/integration/targets/vmware_dvs_portgroup_facts/aliases +++ b/test/integration/targets/vmware_dvs_portgroup_facts/aliases @@ -1,3 +1,4 @@ cloud/vcenter shippable/vcenter/group1 needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_dvs_portgroup_find/aliases b/test/integration/targets/vmware_dvs_portgroup_find/aliases index 3eede2cbf01..b1212da1b7f 100644 --- a/test/integration/targets/vmware_dvs_portgroup_find/aliases +++ b/test/integration/targets/vmware_dvs_portgroup_find/aliases @@ -1,3 +1,4 @@ cloud/vcenter shippable/vcenter/group1 needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_dvs_portgroup_info/aliases b/test/integration/targets/vmware_dvs_portgroup_info/aliases index 3eede2cbf01..b1212da1b7f 100644 --- a/test/integration/targets/vmware_dvs_portgroup_info/aliases +++ b/test/integration/targets/vmware_dvs_portgroup_info/aliases @@ -1,3 +1,4 @@ cloud/vcenter shippable/vcenter/group1 needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_dvswitch/aliases b/test/integration/targets/vmware_dvswitch/aliases index eb39c07bac0..b6fc00bfec4 100644 --- a/test/integration/targets/vmware_dvswitch/aliases +++ b/test/integration/targets/vmware_dvswitch/aliases @@ -1,3 +1,4 @@ shippable/vcenter/group1 cloud/vcenter needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_dvswitch_nioc/aliases b/test/integration/targets/vmware_dvswitch_nioc/aliases index 3eede2cbf01..b1212da1b7f 100644 --- a/test/integration/targets/vmware_dvswitch_nioc/aliases +++ b/test/integration/targets/vmware_dvswitch_nioc/aliases @@ -1,3 +1,4 @@ cloud/vcenter shippable/vcenter/group1 needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_dvswitch_pvlans/aliases b/test/integration/targets/vmware_dvswitch_pvlans/aliases index 3eede2cbf01..b1212da1b7f 100644 --- a/test/integration/targets/vmware_dvswitch_pvlans/aliases +++ b/test/integration/targets/vmware_dvswitch_pvlans/aliases @@ -1,3 +1,4 @@ cloud/vcenter shippable/vcenter/group1 needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_dvswitch_uplink_pg/aliases b/test/integration/targets/vmware_dvswitch_uplink_pg/aliases index 3eede2cbf01..b1212da1b7f 100644 --- a/test/integration/targets/vmware_dvswitch_uplink_pg/aliases +++ b/test/integration/targets/vmware_dvswitch_uplink_pg/aliases @@ -1,3 +1,4 @@ cloud/vcenter shippable/vcenter/group1 needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_evc_mode/aliases b/test/integration/targets/vmware_evc_mode/aliases index 32dd9d53456..be8c5b72ffd 100644 --- a/test/integration/targets/vmware_evc_mode/aliases +++ b/test/integration/targets/vmware_evc_mode/aliases @@ -1,2 +1,3 @@ shippable/vcenter/group1 cloud/vcenter +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_export_ovf/aliases b/test/integration/targets/vmware_export_ovf/aliases index 3eede2cbf01..b1212da1b7f 100644 --- a/test/integration/targets/vmware_export_ovf/aliases +++ b/test/integration/targets/vmware_export_ovf/aliases @@ -1,3 +1,4 @@ cloud/vcenter shippable/vcenter/group1 needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_folder_info/aliases b/test/integration/targets/vmware_folder_info/aliases index eb39c07bac0..b6fc00bfec4 100644 --- a/test/integration/targets/vmware_folder_info/aliases +++ b/test/integration/targets/vmware_folder_info/aliases @@ -1,3 +1,4 @@ shippable/vcenter/group1 cloud/vcenter needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_host_acceptance/aliases b/test/integration/targets/vmware_host_acceptance/aliases index 3eede2cbf01..b1212da1b7f 100644 --- a/test/integration/targets/vmware_host_acceptance/aliases +++ b/test/integration/targets/vmware_host_acceptance/aliases @@ -1,3 +1,4 @@ cloud/vcenter shippable/vcenter/group1 needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_host_active_directory/aliases b/test/integration/targets/vmware_host_active_directory/aliases index 3eede2cbf01..b1212da1b7f 100644 --- a/test/integration/targets/vmware_host_active_directory/aliases +++ b/test/integration/targets/vmware_host_active_directory/aliases @@ -1,3 +1,4 @@ cloud/vcenter shippable/vcenter/group1 needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_host_auto_start/aliases b/test/integration/targets/vmware_host_auto_start/aliases index a2e6ae0c1ef..54d83761aec 100644 --- a/test/integration/targets/vmware_host_auto_start/aliases +++ b/test/integration/targets/vmware_host_auto_start/aliases @@ -1,3 +1,4 @@ cloud/vcenter unsupported skip/python2.6 +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_host_powerstate/aliases b/test/integration/targets/vmware_host_powerstate/aliases index 3eede2cbf01..b1212da1b7f 100644 --- a/test/integration/targets/vmware_host_powerstate/aliases +++ b/test/integration/targets/vmware_host_powerstate/aliases @@ -1,3 +1,4 @@ cloud/vcenter shippable/vcenter/group1 needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_inventory/aliases b/test/integration/targets/vmware_inventory/aliases index 0c9c2f70c00..a1ab2b3d9db 100644 --- a/test/integration/targets/vmware_inventory/aliases +++ b/test/integration/targets/vmware_inventory/aliases @@ -4,3 +4,4 @@ destructive needs/file/contrib/inventory/vmware_inventory.py needs/file/contrib/inventory/vmware_inventory.ini needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_local_role_manager/aliases b/test/integration/targets/vmware_local_role_manager/aliases index eb39c07bac0..b6fc00bfec4 100644 --- a/test/integration/targets/vmware_local_role_manager/aliases +++ b/test/integration/targets/vmware_local_role_manager/aliases @@ -1,3 +1,4 @@ shippable/vcenter/group1 cloud/vcenter needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_local_user_manager/aliases b/test/integration/targets/vmware_local_user_manager/aliases index 3eede2cbf01..b1212da1b7f 100644 --- a/test/integration/targets/vmware_local_user_manager/aliases +++ b/test/integration/targets/vmware_local_user_manager/aliases @@ -1,3 +1,4 @@ cloud/vcenter shippable/vcenter/group1 needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_resource_pool_facts/aliases b/test/integration/targets/vmware_resource_pool_facts/aliases index eb39c07bac0..b6fc00bfec4 100644 --- a/test/integration/targets/vmware_resource_pool_facts/aliases +++ b/test/integration/targets/vmware_resource_pool_facts/aliases @@ -1,3 +1,4 @@ shippable/vcenter/group1 cloud/vcenter needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_resource_pool_info/aliases b/test/integration/targets/vmware_resource_pool_info/aliases index eb39c07bac0..b6fc00bfec4 100644 --- a/test/integration/targets/vmware_resource_pool_info/aliases +++ b/test/integration/targets/vmware_resource_pool_info/aliases @@ -1,3 +1,4 @@ shippable/vcenter/group1 cloud/vcenter needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_tag/aliases b/test/integration/targets/vmware_tag/aliases index 845e8a6dad5..9cc67c4113a 100644 --- a/test/integration/targets/vmware_tag/aliases +++ b/test/integration/targets/vmware_tag/aliases @@ -1,2 +1,3 @@ cloud/vcenter unsupported +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_vcenter_settings/aliases b/test/integration/targets/vmware_vcenter_settings/aliases index eb39c07bac0..b6fc00bfec4 100644 --- a/test/integration/targets/vmware_vcenter_settings/aliases +++ b/test/integration/targets/vmware_vcenter_settings/aliases @@ -1,3 +1,4 @@ shippable/vcenter/group1 cloud/vcenter needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_vcenter_statistics/aliases b/test/integration/targets/vmware_vcenter_statistics/aliases index eb39c07bac0..b6fc00bfec4 100644 --- a/test/integration/targets/vmware_vcenter_statistics/aliases +++ b/test/integration/targets/vmware_vcenter_statistics/aliases @@ -1,3 +1,4 @@ shippable/vcenter/group1 cloud/vcenter needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only diff --git a/test/integration/targets/vmware_vsan_health_info/aliases b/test/integration/targets/vmware_vsan_health_info/aliases index f44f70d85fd..b3bf7b222c2 100644 --- a/test/integration/targets/vmware_vsan_health_info/aliases +++ b/test/integration/targets/vmware_vsan_health_info/aliases @@ -1,3 +1,4 @@ cloud/vcenter unsupported needs/target/prepare_vmware_tests +zuul/vmware/vcenter_only