summaryrefslogtreecommitdiff
path: root/test/integration
diff options
context:
space:
mode:
Diffstat (limited to 'test/integration')
-rw-r--r--test/integration/targets/acl/aliases2
-rw-r--r--test/integration/targets/acme_account/aliases2
-rw-r--r--test/integration/targets/add_host/aliases2
-rw-r--r--test/integration/targets/alternatives/aliases2
-rw-r--r--test/integration/targets/ansible-galaxy/aliases2
-rw-r--r--test/integration/targets/ansible/aliases2
-rw-r--r--test/integration/targets/any_errors_fatal/aliases2
-rw-r--r--test/integration/targets/apache2_module/aliases2
-rw-r--r--test/integration/targets/apt/aliases2
-rw-r--r--test/integration/targets/apt_key/aliases2
-rw-r--r--test/integration/targets/apt_repository/aliases2
-rw-r--r--test/integration/targets/archive/aliases2
-rw-r--r--test/integration/targets/args/aliases2
-rw-r--r--test/integration/targets/assemble/aliases2
-rw-r--r--test/integration/targets/async/aliases2
-rw-r--r--test/integration/targets/async_extra_data/aliases2
-rw-r--r--test/integration/targets/async_fail/aliases2
-rw-r--r--test/integration/targets/at/aliases2
-rw-r--r--test/integration/targets/authorized_key/aliases2
-rw-r--r--test/integration/targets/aws_api_gateway/aliases2
-rw-r--r--test/integration/targets/aws_caller_facts/aliases2
-rw-r--r--test/integration/targets/aws_config/aliases2
-rw-r--r--test/integration/targets/aws_ec2_inventory/aliases2
-rw-r--r--test/integration/targets/aws_elasticbeanstalk_app/aliases2
-rw-r--r--test/integration/targets/aws_glue_connection/aliases2
-rw-r--r--test/integration/targets/aws_inspector/aliases2
-rw-r--r--test/integration/targets/aws_lambda/aliases2
-rw-r--r--test/integration/targets/aws_s3/aliases2
-rw-r--r--test/integration/targets/aws_ses_identity/aliases2
-rw-r--r--test/integration/targets/aws_ses_identity_policy/aliases2
-rw-r--r--test/integration/targets/aws_ssm_parameters/aliases2
-rw-r--r--test/integration/targets/azure_rm_availabilityset/aliases2
-rw-r--r--test/integration/targets/azure_rm_availabilityset_facts/aliases4
-rw-r--r--test/integration/targets/azure_rm_containerinstance/aliases2
-rw-r--r--test/integration/targets/azure_rm_containerregistry/aliases2
-rw-r--r--test/integration/targets/azure_rm_deployment/aliases2
-rw-r--r--test/integration/targets/azure_rm_dnsrecordset/aliases2
-rw-r--r--test/integration/targets/azure_rm_dnsrecordset_facts/aliases2
-rw-r--r--test/integration/targets/azure_rm_dnszone/aliases2
-rw-r--r--test/integration/targets/azure_rm_dnszone_facts/aliases4
-rw-r--r--test/integration/targets/azure_rm_functionapp/aliases2
-rw-r--r--test/integration/targets/azure_rm_image/aliases2
-rw-r--r--test/integration/targets/azure_rm_keyvault/aliases2
-rw-r--r--test/integration/targets/azure_rm_keyvaultkey/aliases2
-rw-r--r--test/integration/targets/azure_rm_keyvaultsecret/aliases2
-rw-r--r--test/integration/targets/azure_rm_loadbalancer/aliases2
-rw-r--r--test/integration/targets/azure_rm_managed_disk/aliases2
-rw-r--r--test/integration/targets/azure_rm_mysqldatabase/aliases2
-rw-r--r--test/integration/targets/azure_rm_mysqlserver/aliases2
-rw-r--r--test/integration/targets/azure_rm_networkinterface/aliases2
-rw-r--r--test/integration/targets/azure_rm_postgresqldatabase/aliases2
-rw-r--r--test/integration/targets/azure_rm_postgresqlserver/aliases2
-rw-r--r--test/integration/targets/azure_rm_publicipaddress/aliases2
-rw-r--r--test/integration/targets/azure_rm_resource/aliases2
-rw-r--r--test/integration/targets/azure_rm_securitygroup/aliases2
-rw-r--r--test/integration/targets/azure_rm_sqldatabase/aliases2
-rw-r--r--test/integration/targets/azure_rm_sqlserver/aliases2
-rw-r--r--test/integration/targets/azure_rm_sqlserver_facts/aliases2
-rw-r--r--test/integration/targets/azure_rm_storageaccount/aliases2
-rw-r--r--test/integration/targets/azure_rm_storageblob/aliases2
-rw-r--r--test/integration/targets/azure_rm_subnet/aliases2
-rw-r--r--test/integration/targets/azure_rm_virtualmachine/aliases2
-rw-r--r--test/integration/targets/azure_rm_virtualmachine_extension/aliases2
-rw-r--r--test/integration/targets/azure_rm_virtualmachine_scaleset/aliases2
-rw-r--r--test/integration/targets/azure_rm_virtualmachineimage_facts/aliases4
-rw-r--r--test/integration/targets/azure_rm_virtualnetwork/aliases2
-rw-r--r--test/integration/targets/become/aliases2
-rw-r--r--test/integration/targets/binary/aliases2
-rw-r--r--test/integration/targets/binary_modules_posix/aliases2
-rw-r--r--test/integration/targets/binary_modules_winrm/aliases4
-rw-r--r--test/integration/targets/blockinfile/aliases2
-rw-r--r--test/integration/targets/blocks/aliases2
-rw-r--r--test/integration/targets/callback_retry_task_name/aliases2
-rw-r--r--test/integration/targets/changed_when/aliases2
-rw-r--r--test/integration/targets/check_mode/aliases2
-rw-r--r--test/integration/targets/cloud_init_data_facts/aliases2
-rw-r--r--test/integration/targets/command_shell/aliases2
-rw-r--r--test/integration/targets/conditionals/aliases2
-rw-r--r--test/integration/targets/connection/aliases2
-rw-r--r--test/integration/targets/connection_chroot/aliases2
-rw-r--r--test/integration/targets/connection_local/aliases2
-rw-r--r--test/integration/targets/connection_paramiko_ssh/aliases2
-rw-r--r--test/integration/targets/connection_ssh/aliases2
-rw-r--r--test/integration/targets/connection_winrm/aliases5
-rw-r--r--test/integration/targets/copy/aliases2
-rw-r--r--test/integration/targets/cs_account/aliases2
-rw-r--r--test/integration/targets/cs_affinitygroup/aliases2
-rw-r--r--test/integration/targets/cs_cluster/aliases2
-rw-r--r--test/integration/targets/cs_configuration/aliases2
-rw-r--r--test/integration/targets/cs_disk_offering/aliases2
-rw-r--r--test/integration/targets/cs_domain/aliases2
-rw-r--r--test/integration/targets/cs_firewall/aliases2
-rw-r--r--test/integration/targets/cs_host/aliases2
-rw-r--r--test/integration/targets/cs_instance/aliases2
-rw-r--r--test/integration/targets/cs_instance_facts/aliases2
-rw-r--r--test/integration/targets/cs_instance_nic/aliases2
-rw-r--r--test/integration/targets/cs_instance_nic_secondaryip/aliases2
-rw-r--r--test/integration/targets/cs_instancegroup/aliases2
-rw-r--r--test/integration/targets/cs_ip_address/aliases2
-rw-r--r--test/integration/targets/cs_iso/aliases2
-rw-r--r--test/integration/targets/cs_loadbalancer_rule/aliases2
-rw-r--r--test/integration/targets/cs_network/aliases2
-rw-r--r--test/integration/targets/cs_network_acl/aliases2
-rw-r--r--test/integration/targets/cs_network_acl_rule/aliases2
-rw-r--r--test/integration/targets/cs_network_offering/aliases2
-rw-r--r--test/integration/targets/cs_pod/aliases2
-rw-r--r--test/integration/targets/cs_portforward/aliases2
-rw-r--r--test/integration/targets/cs_project/aliases2
-rw-r--r--test/integration/targets/cs_region/aliases2
-rw-r--r--test/integration/targets/cs_resourcelimit/aliases2
-rw-r--r--test/integration/targets/cs_role/aliases2
-rw-r--r--test/integration/targets/cs_role_permission/aliases2
-rw-r--r--test/integration/targets/cs_router/aliases2
-rw-r--r--test/integration/targets/cs_securitygroup/aliases2
-rw-r--r--test/integration/targets/cs_securitygroup_rule/aliases2
-rw-r--r--test/integration/targets/cs_service_offering/aliases2
-rw-r--r--test/integration/targets/cs_snapshot_policy/aliases2
-rw-r--r--test/integration/targets/cs_sshkeypair/aliases2
-rw-r--r--test/integration/targets/cs_storage_pool/aliases2
-rw-r--r--test/integration/targets/cs_user/aliases2
-rw-r--r--test/integration/targets/cs_vmsnapshot/aliases2
-rw-r--r--test/integration/targets/cs_volume/aliases2
-rw-r--r--test/integration/targets/cs_vpc/aliases2
-rw-r--r--test/integration/targets/cs_vpc_offering/aliases2
-rw-r--r--test/integration/targets/cs_vpn_connection/aliases2
-rw-r--r--test/integration/targets/cs_vpn_customer_gateway/aliases2
-rw-r--r--test/integration/targets/cs_vpn_gateway/aliases2
-rw-r--r--test/integration/targets/cs_zone/aliases2
-rw-r--r--test/integration/targets/cs_zone_facts/aliases2
-rw-r--r--test/integration/targets/debconf/aliases2
-rw-r--r--test/integration/targets/debug/aliases2
-rw-r--r--test/integration/targets/delegate_to/aliases2
-rw-r--r--test/integration/targets/deploy_helper/aliases2
-rw-r--r--test/integration/targets/dnf/aliases2
-rw-r--r--test/integration/targets/docker_secret/aliases2
-rw-r--r--test/integration/targets/docker_swarm/aliases2
-rw-r--r--test/integration/targets/dpkg_selections/aliases2
-rw-r--r--test/integration/targets/ec2_ami/aliases2
-rw-r--r--test/integration/targets/ec2_elb_lb/aliases2
-rw-r--r--test/integration/targets/ec2_group/aliases2
-rw-r--r--test/integration/targets/ec2_key/aliases2
-rw-r--r--test/integration/targets/ec2_metadata_facts/aliases4
-rw-r--r--test/integration/targets/ec2_tag/aliases2
-rw-r--r--test/integration/targets/ec2_vol/aliases2
-rw-r--r--test/integration/targets/ec2_vpc_egress_igw/aliases2
-rw-r--r--test/integration/targets/ec2_vpc_net/aliases2
-rw-r--r--test/integration/targets/ec2_vpc_route_table/aliases2
-rw-r--r--test/integration/targets/ec2_vpc_subnet/aliases2
-rw-r--r--test/integration/targets/ec2_vpc_vgw/aliases2
-rw-r--r--test/integration/targets/ec2_vpc_vpn_facts/aliases2
-rw-r--r--test/integration/targets/ecs_ecr/aliases2
-rw-r--r--test/integration/targets/elb_classic_lb/aliases2
-rw-r--r--test/integration/targets/embedded_module/aliases2
-rw-r--r--test/integration/targets/environment/aliases2
-rw-r--r--test/integration/targets/etcd3/aliases2
-rw-r--r--test/integration/targets/expect/aliases2
-rw-r--r--test/integration/targets/facts_d/aliases2
-rw-r--r--test/integration/targets/failed_when/aliases2
-rw-r--r--test/integration/targets/fetch/aliases2
-rw-r--r--test/integration/targets/file/aliases2
-rw-r--r--test/integration/targets/filesystem/aliases2
-rw-r--r--test/integration/targets/filters/aliases2
-rw-r--r--test/integration/targets/find/aliases2
-rw-r--r--test/integration/targets/firewalld/aliases2
-rw-r--r--test/integration/targets/foreman_inventory/aliases2
-rw-r--r--test/integration/targets/fortios_address/aliases2
-rw-r--r--test/integration/targets/fortios_ipv4_policy/aliases2
-rw-r--r--test/integration/targets/gathering_facts/aliases2
-rw-r--r--test/integration/targets/gem/aliases2
-rw-r--r--test/integration/targets/get_url/aliases2
-rw-r--r--test/integration/targets/getent/aliases2
-rw-r--r--test/integration/targets/git/aliases2
-rw-r--r--test/integration/targets/github_issue/aliases2
-rw-r--r--test/integration/targets/group/aliases2
-rw-r--r--test/integration/targets/group_by/aliases2
-rw-r--r--test/integration/targets/groupby_filter/aliases2
-rw-r--r--test/integration/targets/handlers/aliases2
-rw-r--r--test/integration/targets/hash/aliases2
-rw-r--r--test/integration/targets/hg/aliases2
-rw-r--r--test/integration/targets/hosts_field/aliases2
-rw-r--r--test/integration/targets/ignore_errors/aliases2
-rw-r--r--test/integration/targets/include_import/aliases2
-rw-r--r--test/integration/targets/include_vars/aliases2
-rw-r--r--test/integration/targets/includes/aliases2
-rw-r--r--test/integration/targets/influxdb_user/aliases2
-rw-r--r--test/integration/targets/ini_file/aliases2
-rw-r--r--test/integration/targets/inventory_path_with_comma/aliases2
-rw-r--r--test/integration/targets/inventory_plugin_config/aliases2
-rw-r--r--test/integration/targets/ipify_facts/aliases2
-rw-r--r--test/integration/targets/iso_extract/aliases2
-rw-r--r--test/integration/targets/iterators/aliases2
-rw-r--r--test/integration/targets/jinja2_native_types/aliases2
-rw-r--r--test/integration/targets/k8s/aliases2
-rw-r--r--test/integration/targets/known_hosts/aliases2
-rw-r--r--test/integration/targets/lambda_policy/aliases2
-rw-r--r--test/integration/targets/lineinfile/aliases2
-rw-r--r--test/integration/targets/locale_gen/aliases2
-rw-r--r--test/integration/targets/lookup_passwordstore/aliases2
-rw-r--r--test/integration/targets/lookup_paths/aliases2
-rw-r--r--test/integration/targets/lookup_properties/aliases2
-rw-r--r--test/integration/targets/lookups/aliases2
-rw-r--r--test/integration/targets/loops/aliases2
-rw-r--r--test/integration/targets/module_defaults/aliases2
-rw-r--r--test/integration/targets/module_precedence/aliases2
-rw-r--r--test/integration/targets/module_utils/aliases2
-rw-r--r--test/integration/targets/mount/aliases2
-rw-r--r--test/integration/targets/mysql_db/aliases2
-rw-r--r--test/integration/targets/mysql_user/aliases2
-rw-r--r--test/integration/targets/mysql_variables/aliases2
-rw-r--r--test/integration/targets/nios_dns_view/aliases2
-rw-r--r--test/integration/targets/nios_host_record/aliases2
-rw-r--r--test/integration/targets/nios_network/aliases2
-rw-r--r--test/integration/targets/nios_network_view/aliases2
-rw-r--r--test/integration/targets/nios_ptr_record/aliases2
-rw-r--r--test/integration/targets/nios_zone/aliases2
-rw-r--r--test/integration/targets/no_log/aliases2
-rw-r--r--test/integration/targets/npm/aliases2
-rw-r--r--test/integration/targets/nuage_vspk/aliases2
-rw-r--r--test/integration/targets/one_host/aliases2
-rw-r--r--test/integration/targets/openssl_certificate/aliases2
-rw-r--r--test/integration/targets/openssl_csr/aliases2
-rw-r--r--test/integration/targets/openssl_dhparam/aliases2
-rw-r--r--test/integration/targets/openssl_privatekey/aliases2
-rw-r--r--test/integration/targets/openssl_publickey/aliases2
-rw-r--r--test/integration/targets/package/aliases2
-rw-r--r--test/integration/targets/package_facts/aliases2
-rw-r--r--test/integration/targets/parsing/aliases2
-rw-r--r--test/integration/targets/patch/aliases2
-rw-r--r--test/integration/targets/pause/aliases2
-rw-r--r--test/integration/targets/ping/aliases2
-rw-r--r--test/integration/targets/pip/aliases2
-rw-r--r--test/integration/targets/plugin_filtering/aliases2
-rw-r--r--test/integration/targets/plugin_loader/aliases2
-rw-r--r--test/integration/targets/postgresql/aliases2
-rw-r--r--test/integration/targets/psexec/aliases3
-rw-r--r--test/integration/targets/pull/aliases2
-rw-r--r--test/integration/targets/rabbitmq_plugin/aliases2
-rw-r--r--test/integration/targets/rabbitmq_user/aliases2
-rw-r--r--test/integration/targets/rabbitmq_vhost/aliases2
-rw-r--r--test/integration/targets/raw/aliases2
-rw-r--r--test/integration/targets/rds_param_group/aliases2
-rw-r--r--test/integration/targets/remote_tmp/aliases2
-rw-r--r--test/integration/targets/route53_zone/aliases2
-rw-r--r--test/integration/targets/rpm_key/aliases2
-rw-r--r--test/integration/targets/s3_bucket/aliases2
-rw-r--r--test/integration/targets/s3_lifecycle/aliases2
-rw-r--r--test/integration/targets/script/aliases2
-rw-r--r--test/integration/targets/seboolean/aliases2
-rw-r--r--test/integration/targets/sefcontext/aliases2
-rw-r--r--test/integration/targets/selinux/aliases2
-rw-r--r--test/integration/targets/sensu_client/aliases2
-rw-r--r--test/integration/targets/sensu_handler/aliases2
-rw-r--r--test/integration/targets/service/aliases2
-rw-r--r--test/integration/targets/service_facts/aliases2
-rw-r--r--test/integration/targets/set_fact/aliases2
-rw-r--r--test/integration/targets/setup_zabbix/aliases2
-rw-r--r--test/integration/targets/shadowed_module/aliases2
-rw-r--r--test/integration/targets/slurp/aliases2
-rw-r--r--test/integration/targets/special_vars/aliases2
-rw-r--r--test/integration/targets/sqs_queue/aliases2
-rw-r--r--test/integration/targets/stat/aliases2
-rw-r--r--test/integration/targets/strategy_linear/aliases2
-rw-r--r--test/integration/targets/sts_assume_role/aliases2
-rw-r--r--test/integration/targets/subversion/aliases2
-rw-r--r--test/integration/targets/supervisorctl/aliases2
-rw-r--r--test/integration/targets/synchronize/aliases2
-rw-r--r--test/integration/targets/sysctl/aliases2
-rw-r--r--test/integration/targets/systemd/aliases2
-rw-r--r--test/integration/targets/tags/aliases2
-rw-r--r--test/integration/targets/task_ordering/aliases2
-rw-r--r--test/integration/targets/template/aliases2
-rw-r--r--test/integration/targets/templating_settings/aliases2
-rw-r--r--test/integration/targets/test_infra/aliases2
-rw-r--r--test/integration/targets/timezone/aliases2
-rw-r--r--test/integration/targets/tower_credential/aliases2
-rw-r--r--test/integration/targets/tower_group/aliases2
-rw-r--r--test/integration/targets/tower_host/aliases2
-rw-r--r--test/integration/targets/tower_inventory/aliases2
-rw-r--r--test/integration/targets/tower_inventory_source/aliases2
-rw-r--r--test/integration/targets/tower_job_cancel/aliases2
-rw-r--r--test/integration/targets/tower_job_launch/aliases2
-rw-r--r--test/integration/targets/tower_job_list/aliases2
-rw-r--r--test/integration/targets/tower_job_template/aliases2
-rw-r--r--test/integration/targets/tower_job_wait/aliases2
-rw-r--r--test/integration/targets/tower_label/aliases2
-rw-r--r--test/integration/targets/tower_organization/aliases2
-rw-r--r--test/integration/targets/tower_project/aliases2
-rw-r--r--test/integration/targets/tower_role/aliases2
-rw-r--r--test/integration/targets/tower_team/aliases2
-rw-r--r--test/integration/targets/tower_user/aliases2
-rw-r--r--test/integration/targets/unarchive/aliases2
-rw-r--r--test/integration/targets/unicode/aliases2
-rw-r--r--test/integration/targets/until/aliases2
-rw-r--r--test/integration/targets/uri/aliases2
-rw-r--r--test/integration/targets/user/aliases2
-rw-r--r--test/integration/targets/var_blending/aliases2
-rw-r--r--test/integration/targets/var_precedence/aliases2
-rw-r--r--test/integration/targets/vault/aliases2
-rw-r--r--test/integration/targets/vcenter_folder/aliases2
-rw-r--r--test/integration/targets/vcenter_license/aliases2
-rw-r--r--test/integration/targets/vmware_cluster/aliases2
-rw-r--r--test/integration/targets/vmware_cluster_facts/aliases2
-rw-r--r--test/integration/targets/vmware_datacenter/aliases2
-rw-r--r--test/integration/targets/vmware_datastore_cluster/aliases2
-rw-r--r--test/integration/targets/vmware_datastore_facts/aliases2
-rw-r--r--test/integration/targets/vmware_drs_rule_facts/aliases2
-rw-r--r--test/integration/targets/vmware_dvs_portgroup/aliases2
-rw-r--r--test/integration/targets/vmware_dvswitch/aliases2
-rw-r--r--test/integration/targets/vmware_guest/aliases2
-rw-r--r--test/integration/targets/vmware_guest_facts/aliases2
-rw-r--r--test/integration/targets/vmware_guest_find/aliases2
-rw-r--r--test/integration/targets/vmware_guest_powerstate/aliases2
-rw-r--r--test/integration/targets/vmware_guest_tools_wait/aliases2
-rw-r--r--test/integration/targets/vmware_host/aliases2
-rw-r--r--test/integration/targets/vmware_host_config_facts/aliases2
-rw-r--r--test/integration/targets/vmware_host_dns_facts/aliases2
-rw-r--r--test/integration/targets/vmware_host_facts/aliases2
-rw-r--r--test/integration/targets/vmware_host_firewall_facts/aliases2
-rw-r--r--test/integration/targets/vmware_host_firewall_manager/aliases2
-rw-r--r--test/integration/targets/vmware_local_role_manager/aliases2
-rw-r--r--test/integration/targets/vmware_maintenancemode/aliases2
-rw-r--r--test/integration/targets/vmware_portgroup_facts/aliases2
-rw-r--r--test/integration/targets/vmware_resource_pool/aliases2
-rw-r--r--test/integration/targets/vmware_resource_pool_facts/aliases2
-rw-r--r--test/integration/targets/vmware_vm_facts/aliases4
-rw-r--r--test/integration/targets/vyos_banner/aliases2
-rw-r--r--test/integration/targets/vyos_command/aliases2
-rw-r--r--test/integration/targets/vyos_config/aliases2
-rw-r--r--test/integration/targets/vyos_facts/aliases2
-rw-r--r--test/integration/targets/vyos_lldp/aliases2
-rw-r--r--test/integration/targets/vyos_static_route/aliases2
-rw-r--r--test/integration/targets/wait_for/aliases2
-rw-r--r--test/integration/targets/wait_for_connection/aliases4
-rw-r--r--test/integration/targets/wakeonlan/aliases2
-rw-r--r--test/integration/targets/win_acl/aliases2
-rw-r--r--test/integration/targets/win_acl_inheritance/aliases2
-rw-r--r--test/integration/targets/win_async_wrapper/aliases4
-rw-r--r--test/integration/targets/win_audit_policy_system/aliases2
-rw-r--r--test/integration/targets/win_audit_rule/aliases2
-rw-r--r--test/integration/targets/win_become/aliases4
-rw-r--r--test/integration/targets/win_certificate_store/aliases2
-rw-r--r--test/integration/targets/win_chocolatey/aliases2
-rw-r--r--test/integration/targets/win_chocolatey_config/aliases2
-rw-r--r--test/integration/targets/win_chocolatey_feature/aliases2
-rw-r--r--test/integration/targets/win_chocolatey_source/aliases2
-rw-r--r--test/integration/targets/win_command/aliases2
-rw-r--r--test/integration/targets/win_copy/aliases2
-rw-r--r--test/integration/targets/win_disk_facts/aliases2
-rw-r--r--test/integration/targets/win_domain_membership/aliases2
-rw-r--r--test/integration/targets/win_dotnet_ngen/aliases2
-rw-r--r--test/integration/targets/win_dsc/aliases2
-rw-r--r--test/integration/targets/win_environment/aliases2
-rw-r--r--test/integration/targets/win_eventlog/aliases2
-rw-r--r--test/integration/targets/win_eventlog_entry/aliases2
-rw-r--r--test/integration/targets/win_exec_wrapper/aliases4
-rw-r--r--test/integration/targets/win_feature/aliases2
-rw-r--r--test/integration/targets/win_fetch/aliases2
-rw-r--r--test/integration/targets/win_file/aliases4
-rw-r--r--test/integration/targets/win_find/aliases2
-rw-r--r--test/integration/targets/win_firewall/aliases2
-rw-r--r--test/integration/targets/win_firewall_rule/aliases2
-rw-r--r--test/integration/targets/win_get_url/aliases2
-rw-r--r--test/integration/targets/win_group/aliases4
-rw-r--r--test/integration/targets/win_group_membership/aliases2
-rw-r--r--test/integration/targets/win_hostname/aliases2
-rw-r--r--test/integration/targets/win_hotfix/aliases2
-rw-r--r--test/integration/targets/win_iis_webapppool/aliases2
-rw-r--r--test/integration/targets/win_iis_webbinding/aliases2
-rw-r--r--test/integration/targets/win_lineinfile/aliases2
-rw-r--r--test/integration/targets/win_mapped_drive/aliases2
-rw-r--r--test/integration/targets/win_module_utils/aliases4
-rw-r--r--test/integration/targets/win_module_utils_legacy/aliases4
-rw-r--r--test/integration/targets/win_msg/aliases2
-rw-r--r--test/integration/targets/win_msi/aliases2
-rw-r--r--test/integration/targets/win_owner/aliases4
-rw-r--r--test/integration/targets/win_package/aliases2
-rw-r--r--test/integration/targets/win_pagefile/aliases2
-rw-r--r--test/integration/targets/win_path/aliases4
-rw-r--r--test/integration/targets/win_pester/aliases2
-rw-r--r--test/integration/targets/win_ping/aliases6
-rw-r--r--test/integration/targets/win_power_plan/aliases2
-rw-r--r--test/integration/targets/win_product_facts/aliases2
-rw-r--r--test/integration/targets/win_psexec/aliases2
-rw-r--r--test/integration/targets/win_psmodule/aliases2
-rw-r--r--test/integration/targets/win_rabbitmq_plugin/aliases2
-rw-r--r--test/integration/targets/win_raw/aliases4
-rw-r--r--test/integration/targets/win_reboot/aliases4
-rw-r--r--test/integration/targets/win_reg_stat/aliases2
-rw-r--r--test/integration/targets/win_regedit/aliases2
-rw-r--r--test/integration/targets/win_region/aliases2
-rw-r--r--test/integration/targets/win_regmerge/aliases2
-rw-r--r--test/integration/targets/win_route/aliases2
-rw-r--r--test/integration/targets/win_say/aliases2
-rw-r--r--test/integration/targets/win_scheduled_task/aliases2
-rw-r--r--test/integration/targets/win_scheduled_task_stat/aliases2
-rw-r--r--test/integration/targets/win_script/aliases4
-rw-r--r--test/integration/targets/win_security_policy/aliases2
-rw-r--r--test/integration/targets/win_service/aliases4
-rw-r--r--test/integration/targets/win_setup/aliases2
-rw-r--r--test/integration/targets/win_share/aliases2
-rw-r--r--test/integration/targets/win_shell/aliases4
-rw-r--r--test/integration/targets/win_shortcut/aliases2
-rw-r--r--test/integration/targets/win_slurp/aliases2
-rw-r--r--test/integration/targets/win_stat/aliases2
-rw-r--r--test/integration/targets/win_tempfile/aliases2
-rw-r--r--test/integration/targets/win_template/aliases4
-rw-r--r--test/integration/targets/win_timezone/aliases2
-rw-r--r--test/integration/targets/win_toast/aliases2
-rw-r--r--test/integration/targets/win_unzip/aliases2
-rw-r--r--test/integration/targets/win_updates/aliases2
-rw-r--r--test/integration/targets/win_uri/aliases2
-rw-r--r--test/integration/targets/win_user/aliases2
-rw-r--r--test/integration/targets/win_user_right/aliases2
-rw-r--r--test/integration/targets/win_wait_for/aliases2
-rw-r--r--test/integration/targets/win_wakeonlan/aliases2
-rw-r--r--test/integration/targets/win_whoami/aliases2
-rw-r--r--test/integration/targets/windows-paths/aliases5
-rw-r--r--test/integration/targets/xattr/aliases2
-rw-r--r--test/integration/targets/xml/aliases2
-rw-r--r--test/integration/targets/yarn/aliases4
-rw-r--r--test/integration/targets/yum/aliases2
-rw-r--r--test/integration/targets/yum_repository/aliases2
-rw-r--r--test/integration/targets/zabbix_host/aliases2
-rw-r--r--test/integration/targets/zypper/aliases2
-rw-r--r--test/integration/targets/zypper_repository/aliases2
425 files changed, 455 insertions, 452 deletions
diff --git a/test/integration/targets/acl/aliases b/test/integration/targets/acl/aliases
index 7af8b7f05b..765b70da79 100644
--- a/test/integration/targets/acl/aliases
+++ b/test/integration/targets/acl/aliases
@@ -1 +1 @@
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/acme_account/aliases b/test/integration/targets/acme_account/aliases
index 37b197e0df..b159f9e760 100644
--- a/test/integration/targets/acme_account/aliases
+++ b/test/integration/targets/acme_account/aliases
@@ -1,3 +1,3 @@
-posix/ci/group1
+shippable/posix/group1
destructive
disabled
diff --git a/test/integration/targets/add_host/aliases b/test/integration/targets/add_host/aliases
index 7af8b7f05b..765b70da79 100644
--- a/test/integration/targets/add_host/aliases
+++ b/test/integration/targets/add_host/aliases
@@ -1 +1 @@
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/alternatives/aliases b/test/integration/targets/alternatives/aliases
index 66ed33bd3a..c38fe636c9 100644
--- a/test/integration/targets/alternatives/aliases
+++ b/test/integration/targets/alternatives/aliases
@@ -1,4 +1,4 @@
-posix/ci/group3
+shippable/posix/group3
destructive
needs/root
skip/freebsd
diff --git a/test/integration/targets/ansible-galaxy/aliases b/test/integration/targets/ansible-galaxy/aliases
index 20777639a7..3b1fcf53cb 100644
--- a/test/integration/targets/ansible-galaxy/aliases
+++ b/test/integration/targets/ansible-galaxy/aliases
@@ -1,2 +1,2 @@
destructive
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/ansible/aliases b/test/integration/targets/ansible/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/ansible/aliases
+++ b/test/integration/targets/ansible/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/any_errors_fatal/aliases b/test/integration/targets/any_errors_fatal/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/any_errors_fatal/aliases
+++ b/test/integration/targets/any_errors_fatal/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/apache2_module/aliases b/test/integration/targets/apache2_module/aliases
index 8e7d715f9c..a4c92ef853 100644
--- a/test/integration/targets/apache2_module/aliases
+++ b/test/integration/targets/apache2_module/aliases
@@ -1,2 +1,2 @@
destructive
-posix/ci/group1
+shippable/posix/group1
diff --git a/test/integration/targets/apt/aliases b/test/integration/targets/apt/aliases
index c52a478d10..6b34357ded 100644
--- a/test/integration/targets/apt/aliases
+++ b/test/integration/targets/apt/aliases
@@ -1,4 +1,4 @@
-posix/ci/group1
+shippable/posix/group1
destructive
skip/freebsd
skip/osx
diff --git a/test/integration/targets/apt_key/aliases b/test/integration/targets/apt_key/aliases
index d60d204372..3a6df92ae5 100644
--- a/test/integration/targets/apt_key/aliases
+++ b/test/integration/targets/apt_key/aliases
@@ -1,4 +1,4 @@
-posix/ci/group1
+shippable/posix/group1
skip/freebsd
skip/osx
skip/rhel
diff --git a/test/integration/targets/apt_repository/aliases b/test/integration/targets/apt_repository/aliases
index 36121c02ae..418ff6b0c7 100644
--- a/test/integration/targets/apt_repository/aliases
+++ b/test/integration/targets/apt_repository/aliases
@@ -1,6 +1,6 @@
apt_key
destructive
-posix/ci/group1
+shippable/posix/group1
skip/freebsd
skip/osx
skip/rhel
diff --git a/test/integration/targets/archive/aliases b/test/integration/targets/archive/aliases
index c7e2dbad67..961b20518e 100644
--- a/test/integration/targets/archive/aliases
+++ b/test/integration/targets/archive/aliases
@@ -1,3 +1,3 @@
needs/root
-posix/ci/group2
+shippable/posix/group2
destructive
diff --git a/test/integration/targets/args/aliases b/test/integration/targets/args/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/args/aliases
+++ b/test/integration/targets/args/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/assemble/aliases b/test/integration/targets/assemble/aliases
index 7af8b7f05b..765b70da79 100644
--- a/test/integration/targets/assemble/aliases
+++ b/test/integration/targets/assemble/aliases
@@ -1 +1 @@
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/async/aliases b/test/integration/targets/async/aliases
index 8fb1c443d3..c989cd70c3 100644
--- a/test/integration/targets/async/aliases
+++ b/test/integration/targets/async/aliases
@@ -1,3 +1,3 @@
async_status
async_wrapper
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/async_extra_data/aliases b/test/integration/targets/async_extra_data/aliases
index 4cfb31df36..a5c224e448 100644
--- a/test/integration/targets/async_extra_data/aliases
+++ b/test/integration/targets/async_extra_data/aliases
@@ -1,4 +1,4 @@
needs/ssh
-posix/ci/group3
+shippable/posix/group3
skip/freebsd
skip/osx
diff --git a/test/integration/targets/async_fail/aliases b/test/integration/targets/async_fail/aliases
index 8fb1c443d3..c989cd70c3 100644
--- a/test/integration/targets/async_fail/aliases
+++ b/test/integration/targets/async_fail/aliases
@@ -1,3 +1,3 @@
async_status
async_wrapper
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/at/aliases b/test/integration/targets/at/aliases
index 7978f4a6ce..6eae8bd8dd 100644
--- a/test/integration/targets/at/aliases
+++ b/test/integration/targets/at/aliases
@@ -1,2 +1,2 @@
-posix/ci/group1
+shippable/posix/group1
destructive
diff --git a/test/integration/targets/authorized_key/aliases b/test/integration/targets/authorized_key/aliases
index 53b32510a0..9af2d79042 100644
--- a/test/integration/targets/authorized_key/aliases
+++ b/test/integration/targets/authorized_key/aliases
@@ -1,2 +1,2 @@
needs/root
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/aws_api_gateway/aliases b/test/integration/targets/aws_api_gateway/aliases
index d6ae2f116b..a112c3d1bb 100644
--- a/test/integration/targets/aws_api_gateway/aliases
+++ b/test/integration/targets/aws_api_gateway/aliases
@@ -1,2 +1,2 @@
cloud/aws
-posix/ci/cloud/group4/aws
+shippable/aws/group1
diff --git a/test/integration/targets/aws_caller_facts/aliases b/test/integration/targets/aws_caller_facts/aliases
index d6ae2f116b..a112c3d1bb 100644
--- a/test/integration/targets/aws_caller_facts/aliases
+++ b/test/integration/targets/aws_caller_facts/aliases
@@ -1,2 +1,2 @@
cloud/aws
-posix/ci/cloud/group4/aws
+shippable/aws/group1
diff --git a/test/integration/targets/aws_config/aliases b/test/integration/targets/aws_config/aliases
index 61587c726c..7a18fbcd1b 100644
--- a/test/integration/targets/aws_config/aliases
+++ b/test/integration/targets/aws_config/aliases
@@ -1,3 +1,3 @@
cloud/aws
disabled
-posix/ci/cloud/group4/aws
+shippable/aws/group1
diff --git a/test/integration/targets/aws_ec2_inventory/aliases b/test/integration/targets/aws_ec2_inventory/aliases
index d6ae2f116b..a112c3d1bb 100644
--- a/test/integration/targets/aws_ec2_inventory/aliases
+++ b/test/integration/targets/aws_ec2_inventory/aliases
@@ -1,2 +1,2 @@
cloud/aws
-posix/ci/cloud/group4/aws
+shippable/aws/group1
diff --git a/test/integration/targets/aws_elasticbeanstalk_app/aliases b/test/integration/targets/aws_elasticbeanstalk_app/aliases
index d6ae2f116b..a112c3d1bb 100644
--- a/test/integration/targets/aws_elasticbeanstalk_app/aliases
+++ b/test/integration/targets/aws_elasticbeanstalk_app/aliases
@@ -1,2 +1,2 @@
cloud/aws
-posix/ci/cloud/group4/aws
+shippable/aws/group1
diff --git a/test/integration/targets/aws_glue_connection/aliases b/test/integration/targets/aws_glue_connection/aliases
index d6ae2f116b..a112c3d1bb 100644
--- a/test/integration/targets/aws_glue_connection/aliases
+++ b/test/integration/targets/aws_glue_connection/aliases
@@ -1,2 +1,2 @@
cloud/aws
-posix/ci/cloud/group4/aws
+shippable/aws/group1
diff --git a/test/integration/targets/aws_inspector/aliases b/test/integration/targets/aws_inspector/aliases
index 9e624ab960..a112c3d1bb 100644
--- a/test/integration/targets/aws_inspector/aliases
+++ b/test/integration/targets/aws_inspector/aliases
@@ -1,2 +1,2 @@
cloud/aws
-posix/ci/cloud/group3/aws
+shippable/aws/group1
diff --git a/test/integration/targets/aws_lambda/aliases b/test/integration/targets/aws_lambda/aliases
index 27a0a52c07..57820ebc2a 100644
--- a/test/integration/targets/aws_lambda/aliases
+++ b/test/integration/targets/aws_lambda/aliases
@@ -1,4 +1,4 @@
cloud/aws
-posix/ci/cloud/group4/aws
+shippable/aws/group1
execute_lambda
lambda
diff --git a/test/integration/targets/aws_s3/aliases b/test/integration/targets/aws_s3/aliases
index d6ae2f116b..a112c3d1bb 100644
--- a/test/integration/targets/aws_s3/aliases
+++ b/test/integration/targets/aws_s3/aliases
@@ -1,2 +1,2 @@
cloud/aws
-posix/ci/cloud/group4/aws
+shippable/aws/group1
diff --git a/test/integration/targets/aws_ses_identity/aliases b/test/integration/targets/aws_ses_identity/aliases
index d6ae2f116b..a112c3d1bb 100644
--- a/test/integration/targets/aws_ses_identity/aliases
+++ b/test/integration/targets/aws_ses_identity/aliases
@@ -1,2 +1,2 @@
cloud/aws
-posix/ci/cloud/group4/aws
+shippable/aws/group1
diff --git a/test/integration/targets/aws_ses_identity_policy/aliases b/test/integration/targets/aws_ses_identity_policy/aliases
index d6ae2f116b..a112c3d1bb 100644
--- a/test/integration/targets/aws_ses_identity_policy/aliases
+++ b/test/integration/targets/aws_ses_identity_policy/aliases
@@ -1,2 +1,2 @@
cloud/aws
-posix/ci/cloud/group4/aws
+shippable/aws/group1
diff --git a/test/integration/targets/aws_ssm_parameters/aliases b/test/integration/targets/aws_ssm_parameters/aliases
index d6ae2f116b..a112c3d1bb 100644
--- a/test/integration/targets/aws_ssm_parameters/aliases
+++ b/test/integration/targets/aws_ssm_parameters/aliases
@@ -1,2 +1,2 @@
cloud/aws
-posix/ci/cloud/group4/aws
+shippable/aws/group1
diff --git a/test/integration/targets/azure_rm_availabilityset/aliases b/test/integration/targets/azure_rm_availabilityset/aliases
index 9e23ddb721..8f7a9a2e56 100644
--- a/test/integration/targets/azure_rm_availabilityset/aliases
+++ b/test/integration/targets/azure_rm_availabilityset/aliases
@@ -1,3 +1,3 @@
cloud/azure
-posix/ci/cloud/group2/azure
+shippable/azure/group1
destructive
diff --git a/test/integration/targets/azure_rm_availabilityset_facts/aliases b/test/integration/targets/azure_rm_availabilityset_facts/aliases
index fdf4dafc4a..385e51ef1d 100644
--- a/test/integration/targets/azure_rm_availabilityset_facts/aliases
+++ b/test/integration/targets/azure_rm_availabilityset_facts/aliases
@@ -1,4 +1,4 @@
cloud/azure
-posix/ci/cloud/group3/azure
-posix/ci/cloud/group3/smoketest
+shippable/azure/group4
+shippable/azure/smoketest
destructive
diff --git a/test/integration/targets/azure_rm_containerinstance/aliases b/test/integration/targets/azure_rm_containerinstance/aliases
index 538083df28..095e5ec347 100644
--- a/test/integration/targets/azure_rm_containerinstance/aliases
+++ b/test/integration/targets/azure_rm_containerinstance/aliases
@@ -1,3 +1,3 @@
cloud/azure
destructive
-posix/ci/cloud/group2/azure
+shippable/azure/group1
diff --git a/test/integration/targets/azure_rm_containerregistry/aliases b/test/integration/targets/azure_rm_containerregistry/aliases
index 9e23ddb721..8f7a9a2e56 100644
--- a/test/integration/targets/azure_rm_containerregistry/aliases
+++ b/test/integration/targets/azure_rm_containerregistry/aliases
@@ -1,3 +1,3 @@
cloud/azure
-posix/ci/cloud/group2/azure
+shippable/azure/group1
destructive
diff --git a/test/integration/targets/azure_rm_deployment/aliases b/test/integration/targets/azure_rm_deployment/aliases
index 538083df28..49acfee76c 100644
--- a/test/integration/targets/azure_rm_deployment/aliases
+++ b/test/integration/targets/azure_rm_deployment/aliases
@@ -1,3 +1,3 @@
cloud/azure
destructive
-posix/ci/cloud/group2/azure
+shippable/azure/group2
diff --git a/test/integration/targets/azure_rm_dnsrecordset/aliases b/test/integration/targets/azure_rm_dnsrecordset/aliases
index 9e23ddb721..8f7a9a2e56 100644
--- a/test/integration/targets/azure_rm_dnsrecordset/aliases
+++ b/test/integration/targets/azure_rm_dnsrecordset/aliases
@@ -1,3 +1,3 @@
cloud/azure
-posix/ci/cloud/group2/azure
+shippable/azure/group1
destructive
diff --git a/test/integration/targets/azure_rm_dnsrecordset_facts/aliases b/test/integration/targets/azure_rm_dnsrecordset_facts/aliases
index 9e23ddb721..8f7a9a2e56 100644
--- a/test/integration/targets/azure_rm_dnsrecordset_facts/aliases
+++ b/test/integration/targets/azure_rm_dnsrecordset_facts/aliases
@@ -1,3 +1,3 @@
cloud/azure
-posix/ci/cloud/group2/azure
+shippable/azure/group1
destructive
diff --git a/test/integration/targets/azure_rm_dnszone/aliases b/test/integration/targets/azure_rm_dnszone/aliases
index 9e23ddb721..8f7a9a2e56 100644
--- a/test/integration/targets/azure_rm_dnszone/aliases
+++ b/test/integration/targets/azure_rm_dnszone/aliases
@@ -1,3 +1,3 @@
cloud/azure
-posix/ci/cloud/group2/azure
+shippable/azure/group1
destructive
diff --git a/test/integration/targets/azure_rm_dnszone_facts/aliases b/test/integration/targets/azure_rm_dnszone_facts/aliases
index 652b6ec82f..01fee7d451 100644
--- a/test/integration/targets/azure_rm_dnszone_facts/aliases
+++ b/test/integration/targets/azure_rm_dnszone_facts/aliases
@@ -1,4 +1,4 @@
cloud/azure
-posix/ci/cloud/group2/azure
-posix/ci/cloud/group2/smoketest
+shippable/azure/group1
+shippable/azure/smoketest
destructive
diff --git a/test/integration/targets/azure_rm_functionapp/aliases b/test/integration/targets/azure_rm_functionapp/aliases
index 41d4983007..2e68c2ffbc 100644
--- a/test/integration/targets/azure_rm_functionapp/aliases
+++ b/test/integration/targets/azure_rm_functionapp/aliases
@@ -1,4 +1,4 @@
cloud/azure
-posix/ci/cloud/group2/azure
+shippable/azure/group1
destructive
unstable
diff --git a/test/integration/targets/azure_rm_image/aliases b/test/integration/targets/azure_rm_image/aliases
index ba650dc8a8..759eafa2de 100644
--- a/test/integration/targets/azure_rm_image/aliases
+++ b/test/integration/targets/azure_rm_image/aliases
@@ -1,3 +1,3 @@
cloud/azure
-posix/ci/cloud/group5/azure
+shippable/azure/group3
destructive
diff --git a/test/integration/targets/azure_rm_keyvault/aliases b/test/integration/targets/azure_rm_keyvault/aliases
index 538083df28..095e5ec347 100644
--- a/test/integration/targets/azure_rm_keyvault/aliases
+++ b/test/integration/targets/azure_rm_keyvault/aliases
@@ -1,3 +1,3 @@
cloud/azure
destructive
-posix/ci/cloud/group2/azure
+shippable/azure/group1
diff --git a/test/integration/targets/azure_rm_keyvaultkey/aliases b/test/integration/targets/azure_rm_keyvaultkey/aliases
index 9e23ddb721..8f7a9a2e56 100644
--- a/test/integration/targets/azure_rm_keyvaultkey/aliases
+++ b/test/integration/targets/azure_rm_keyvaultkey/aliases
@@ -1,3 +1,3 @@
cloud/azure
-posix/ci/cloud/group2/azure
+shippable/azure/group1
destructive
diff --git a/test/integration/targets/azure_rm_keyvaultsecret/aliases b/test/integration/targets/azure_rm_keyvaultsecret/aliases
index 3ec6a794c8..fd1a5ed5a8 100644
--- a/test/integration/targets/azure_rm_keyvaultsecret/aliases
+++ b/test/integration/targets/azure_rm_keyvaultsecret/aliases
@@ -1,3 +1,3 @@
cloud/azure
-posix/ci/cloud/group2/azure
+shippable/azure/group1
destructive \ No newline at end of file
diff --git a/test/integration/targets/azure_rm_loadbalancer/aliases b/test/integration/targets/azure_rm_loadbalancer/aliases
index 17006e57f6..239e365779 100644
--- a/test/integration/targets/azure_rm_loadbalancer/aliases
+++ b/test/integration/targets/azure_rm_loadbalancer/aliases
@@ -1,3 +1,3 @@
cloud/azure
-posix/ci/cloud/group3/azure
+shippable/azure/group4
destructive
diff --git a/test/integration/targets/azure_rm_managed_disk/aliases b/test/integration/targets/azure_rm_managed_disk/aliases
index ba650dc8a8..759eafa2de 100644
--- a/test/integration/targets/azure_rm_managed_disk/aliases
+++ b/test/integration/targets/azure_rm_managed_disk/aliases
@@ -1,3 +1,3 @@
cloud/azure
-posix/ci/cloud/group5/azure
+shippable/azure/group3
destructive
diff --git a/test/integration/targets/azure_rm_mysqldatabase/aliases b/test/integration/targets/azure_rm_mysqldatabase/aliases
index 538083df28..021f5cf05b 100644
--- a/test/integration/targets/azure_rm_mysqldatabase/aliases
+++ b/test/integration/targets/azure_rm_mysqldatabase/aliases
@@ -1,3 +1,3 @@
cloud/azure
destructive
-posix/ci/cloud/group2/azure
+shippable/azure/group4
diff --git a/test/integration/targets/azure_rm_mysqlserver/aliases b/test/integration/targets/azure_rm_mysqlserver/aliases
index 538083df28..021f5cf05b 100644
--- a/test/integration/targets/azure_rm_mysqlserver/aliases
+++ b/test/integration/targets/azure_rm_mysqlserver/aliases
@@ -1,3 +1,3 @@
cloud/azure
destructive
-posix/ci/cloud/group2/azure
+shippable/azure/group4
diff --git a/test/integration/targets/azure_rm_networkinterface/aliases b/test/integration/targets/azure_rm_networkinterface/aliases
index 9e23ddb721..8f7a9a2e56 100644
--- a/test/integration/targets/azure_rm_networkinterface/aliases
+++ b/test/integration/targets/azure_rm_networkinterface/aliases
@@ -1,3 +1,3 @@
cloud/azure
-posix/ci/cloud/group2/azure
+shippable/azure/group1
destructive
diff --git a/test/integration/targets/azure_rm_postgresqldatabase/aliases b/test/integration/targets/azure_rm_postgresqldatabase/aliases
index 538083df28..49acfee76c 100644
--- a/test/integration/targets/azure_rm_postgresqldatabase/aliases
+++ b/test/integration/targets/azure_rm_postgresqldatabase/aliases
@@ -1,3 +1,3 @@
cloud/azure
destructive
-posix/ci/cloud/group2/azure
+shippable/azure/group2
diff --git a/test/integration/targets/azure_rm_postgresqlserver/aliases b/test/integration/targets/azure_rm_postgresqlserver/aliases
index 538083df28..021f5cf05b 100644
--- a/test/integration/targets/azure_rm_postgresqlserver/aliases
+++ b/test/integration/targets/azure_rm_postgresqlserver/aliases
@@ -1,3 +1,3 @@
cloud/azure
destructive
-posix/ci/cloud/group2/azure
+shippable/azure/group4
diff --git a/test/integration/targets/azure_rm_publicipaddress/aliases b/test/integration/targets/azure_rm_publicipaddress/aliases
index 9e23ddb721..8f7a9a2e56 100644
--- a/test/integration/targets/azure_rm_publicipaddress/aliases
+++ b/test/integration/targets/azure_rm_publicipaddress/aliases
@@ -1,3 +1,3 @@
cloud/azure
-posix/ci/cloud/group2/azure
+shippable/azure/group1
destructive
diff --git a/test/integration/targets/azure_rm_resource/aliases b/test/integration/targets/azure_rm_resource/aliases
index 538083df28..095e5ec347 100644
--- a/test/integration/targets/azure_rm_resource/aliases
+++ b/test/integration/targets/azure_rm_resource/aliases
@@ -1,3 +1,3 @@
cloud/azure
destructive
-posix/ci/cloud/group2/azure
+shippable/azure/group1
diff --git a/test/integration/targets/azure_rm_securitygroup/aliases b/test/integration/targets/azure_rm_securitygroup/aliases
index 6622a9d9bc..f9abd37c25 100644
--- a/test/integration/targets/azure_rm_securitygroup/aliases
+++ b/test/integration/targets/azure_rm_securitygroup/aliases
@@ -1,4 +1,4 @@
cloud/azure
-posix/ci/cloud/group2/azure
+shippable/azure/group1
destructive
azure_rm_securitygroup_facts
diff --git a/test/integration/targets/azure_rm_sqldatabase/aliases b/test/integration/targets/azure_rm_sqldatabase/aliases
index 376fb93822..99b85e0e6b 100644
--- a/test/integration/targets/azure_rm_sqldatabase/aliases
+++ b/test/integration/targets/azure_rm_sqldatabase/aliases
@@ -1,4 +1,4 @@
cloud/azure
destructive
-posix/ci/cloud/group2/azure
+shippable/azure/group3
unstable
diff --git a/test/integration/targets/azure_rm_sqlserver/aliases b/test/integration/targets/azure_rm_sqlserver/aliases
index 538083df28..021f5cf05b 100644
--- a/test/integration/targets/azure_rm_sqlserver/aliases
+++ b/test/integration/targets/azure_rm_sqlserver/aliases
@@ -1,3 +1,3 @@
cloud/azure
destructive
-posix/ci/cloud/group2/azure
+shippable/azure/group4
diff --git a/test/integration/targets/azure_rm_sqlserver_facts/aliases b/test/integration/targets/azure_rm_sqlserver_facts/aliases
index 376fb93822..99b85e0e6b 100644
--- a/test/integration/targets/azure_rm_sqlserver_facts/aliases
+++ b/test/integration/targets/azure_rm_sqlserver_facts/aliases
@@ -1,4 +1,4 @@
cloud/azure
destructive
-posix/ci/cloud/group2/azure
+shippable/azure/group3
unstable
diff --git a/test/integration/targets/azure_rm_storageaccount/aliases b/test/integration/targets/azure_rm_storageaccount/aliases
index 9e23ddb721..8f7a9a2e56 100644
--- a/test/integration/targets/azure_rm_storageaccount/aliases
+++ b/test/integration/targets/azure_rm_storageaccount/aliases
@@ -1,3 +1,3 @@
cloud/azure
-posix/ci/cloud/group2/azure
+shippable/azure/group1
destructive
diff --git a/test/integration/targets/azure_rm_storageblob/aliases b/test/integration/targets/azure_rm_storageblob/aliases
index 41d4983007..2e68c2ffbc 100644
--- a/test/integration/targets/azure_rm_storageblob/aliases
+++ b/test/integration/targets/azure_rm_storageblob/aliases
@@ -1,4 +1,4 @@
cloud/azure
-posix/ci/cloud/group2/azure
+shippable/azure/group1
destructive
unstable
diff --git a/test/integration/targets/azure_rm_subnet/aliases b/test/integration/targets/azure_rm_subnet/aliases
index 9e23ddb721..8f7a9a2e56 100644
--- a/test/integration/targets/azure_rm_subnet/aliases
+++ b/test/integration/targets/azure_rm_subnet/aliases
@@ -1,3 +1,3 @@
cloud/azure
-posix/ci/cloud/group2/azure
+shippable/azure/group1
destructive
diff --git a/test/integration/targets/azure_rm_virtualmachine/aliases b/test/integration/targets/azure_rm_virtualmachine/aliases
index 44e6c25ba7..b72b2736dd 100644
--- a/test/integration/targets/azure_rm_virtualmachine/aliases
+++ b/test/integration/targets/azure_rm_virtualmachine/aliases
@@ -1,4 +1,4 @@
cloud/azure
-posix/ci/cloud/group3/azure
+shippable/azure/group2
unstable
destructive
diff --git a/test/integration/targets/azure_rm_virtualmachine_extension/aliases b/test/integration/targets/azure_rm_virtualmachine_extension/aliases
index ba650dc8a8..8f7a9a2e56 100644
--- a/test/integration/targets/azure_rm_virtualmachine_extension/aliases
+++ b/test/integration/targets/azure_rm_virtualmachine_extension/aliases
@@ -1,3 +1,3 @@
cloud/azure
-posix/ci/cloud/group5/azure
+shippable/azure/group1
destructive
diff --git a/test/integration/targets/azure_rm_virtualmachine_scaleset/aliases b/test/integration/targets/azure_rm_virtualmachine_scaleset/aliases
index 17006e57f6..239e365779 100644
--- a/test/integration/targets/azure_rm_virtualmachine_scaleset/aliases
+++ b/test/integration/targets/azure_rm_virtualmachine_scaleset/aliases
@@ -1,3 +1,3 @@
cloud/azure
-posix/ci/cloud/group3/azure
+shippable/azure/group4
destructive
diff --git a/test/integration/targets/azure_rm_virtualmachineimage_facts/aliases b/test/integration/targets/azure_rm_virtualmachineimage_facts/aliases
index a26fa01736..9175999b45 100644
--- a/test/integration/targets/azure_rm_virtualmachineimage_facts/aliases
+++ b/test/integration/targets/azure_rm_virtualmachineimage_facts/aliases
@@ -1,4 +1,4 @@
cloud/azure
-posix/ci/cloud/group5/azure
-posix/ci/cloud/group5/smoketest
+shippable/azure/group3
+shippable/azure/smoketest
destructive
diff --git a/test/integration/targets/azure_rm_virtualnetwork/aliases b/test/integration/targets/azure_rm_virtualnetwork/aliases
index 9e23ddb721..8f7a9a2e56 100644
--- a/test/integration/targets/azure_rm_virtualnetwork/aliases
+++ b/test/integration/targets/azure_rm_virtualnetwork/aliases
@@ -1,3 +1,3 @@
cloud/azure
-posix/ci/cloud/group2/azure
+shippable/azure/group1
destructive
diff --git a/test/integration/targets/become/aliases b/test/integration/targets/become/aliases
index 8e7d715f9c..a4c92ef853 100644
--- a/test/integration/targets/become/aliases
+++ b/test/integration/targets/become/aliases
@@ -1,2 +1,2 @@
destructive
-posix/ci/group1
+shippable/posix/group1
diff --git a/test/integration/targets/binary/aliases b/test/integration/targets/binary/aliases
index 7af8b7f05b..765b70da79 100644
--- a/test/integration/targets/binary/aliases
+++ b/test/integration/targets/binary/aliases
@@ -1 +1 @@
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/binary_modules_posix/aliases b/test/integration/targets/binary_modules_posix/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/binary_modules_posix/aliases
+++ b/test/integration/targets/binary_modules_posix/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/binary_modules_winrm/aliases b/test/integration/targets/binary_modules_winrm/aliases
index a00acdfc75..93e9504f14 100644
--- a/test/integration/targets/binary_modules_winrm/aliases
+++ b/test/integration/targets/binary_modules_winrm/aliases
@@ -1,3 +1,3 @@
-windows/ci/group1
-windows/ci/smoketest
+shippable/windows/group1
+shippable/windows/smoketest
windows
diff --git a/test/integration/targets/blockinfile/aliases b/test/integration/targets/blockinfile/aliases
index 4485d76162..a6dafcf8cd 100644
--- a/test/integration/targets/blockinfile/aliases
+++ b/test/integration/targets/blockinfile/aliases
@@ -1 +1 @@
-posix/ci/group1
+shippable/posix/group1
diff --git a/test/integration/targets/blocks/aliases b/test/integration/targets/blocks/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/blocks/aliases
+++ b/test/integration/targets/blocks/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/callback_retry_task_name/aliases b/test/integration/targets/callback_retry_task_name/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/callback_retry_task_name/aliases
+++ b/test/integration/targets/callback_retry_task_name/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/changed_when/aliases b/test/integration/targets/changed_when/aliases
index 7af8b7f05b..765b70da79 100644
--- a/test/integration/targets/changed_when/aliases
+++ b/test/integration/targets/changed_when/aliases
@@ -1 +1 @@
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/check_mode/aliases b/test/integration/targets/check_mode/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/check_mode/aliases
+++ b/test/integration/targets/check_mode/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/cloud_init_data_facts/aliases b/test/integration/targets/cloud_init_data_facts/aliases
index b31f76595c..5eb727b09b 100644
--- a/test/integration/targets/cloud_init_data_facts/aliases
+++ b/test/integration/targets/cloud_init_data_facts/aliases
@@ -1,4 +1,4 @@
destructive
-posix/ci/group1
+shippable/posix/group1
skip/osx
skip/freebsd
diff --git a/test/integration/targets/command_shell/aliases b/test/integration/targets/command_shell/aliases
index dc4f3c4502..a1bd9947de 100644
--- a/test/integration/targets/command_shell/aliases
+++ b/test/integration/targets/command_shell/aliases
@@ -1,3 +1,3 @@
command
-posix/ci/group2
+shippable/posix/group2
shell
diff --git a/test/integration/targets/conditionals/aliases b/test/integration/targets/conditionals/aliases
index 7af8b7f05b..765b70da79 100644
--- a/test/integration/targets/conditionals/aliases
+++ b/test/integration/targets/conditionals/aliases
@@ -1 +1 @@
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/connection/aliases b/test/integration/targets/connection/aliases
index 7af8b7f05b..765b70da79 100644
--- a/test/integration/targets/connection/aliases
+++ b/test/integration/targets/connection/aliases
@@ -1 +1 @@
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/connection_chroot/aliases b/test/integration/targets/connection_chroot/aliases
index e33b2794c9..bd318e6146 100644
--- a/test/integration/targets/connection_chroot/aliases
+++ b/test/integration/targets/connection_chroot/aliases
@@ -1,2 +1,2 @@
needs/root
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/connection_local/aliases b/test/integration/targets/connection_local/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/connection_local/aliases
+++ b/test/integration/targets/connection_local/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/connection_paramiko_ssh/aliases b/test/integration/targets/connection_paramiko_ssh/aliases
index c9362781f6..1bb4547c51 100644
--- a/test/integration/targets/connection_paramiko_ssh/aliases
+++ b/test/integration/targets/connection_paramiko_ssh/aliases
@@ -1,2 +1,2 @@
needs/ssh
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/connection_ssh/aliases b/test/integration/targets/connection_ssh/aliases
index c9362781f6..1bb4547c51 100644
--- a/test/integration/targets/connection_ssh/aliases
+++ b/test/integration/targets/connection_ssh/aliases
@@ -1,2 +1,2 @@
needs/ssh
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/connection_winrm/aliases b/test/integration/targets/connection_winrm/aliases
index 0589efba85..cf714783f5 100644
--- a/test/integration/targets/connection_winrm/aliases
+++ b/test/integration/targets/connection_winrm/aliases
@@ -1,2 +1,3 @@
-windows/ci/group1
-windows/ci/smoketest
+windows
+shippable/windows/group1
+shippable/windows/smoketest
diff --git a/test/integration/targets/copy/aliases b/test/integration/targets/copy/aliases
index 53b32510a0..9af2d79042 100644
--- a/test/integration/targets/copy/aliases
+++ b/test/integration/targets/copy/aliases
@@ -1,2 +1,2 @@
needs/root
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/cs_account/aliases b/test/integration/targets/cs_account/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_account/aliases
+++ b/test/integration/targets/cs_account/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_affinitygroup/aliases b/test/integration/targets/cs_affinitygroup/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_affinitygroup/aliases
+++ b/test/integration/targets/cs_affinitygroup/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_cluster/aliases b/test/integration/targets/cs_cluster/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_cluster/aliases
+++ b/test/integration/targets/cs_cluster/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_configuration/aliases b/test/integration/targets/cs_configuration/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_configuration/aliases
+++ b/test/integration/targets/cs_configuration/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_disk_offering/aliases b/test/integration/targets/cs_disk_offering/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_disk_offering/aliases
+++ b/test/integration/targets/cs_disk_offering/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_domain/aliases b/test/integration/targets/cs_domain/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_domain/aliases
+++ b/test/integration/targets/cs_domain/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_firewall/aliases b/test/integration/targets/cs_firewall/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_firewall/aliases
+++ b/test/integration/targets/cs_firewall/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_host/aliases b/test/integration/targets/cs_host/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_host/aliases
+++ b/test/integration/targets/cs_host/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_instance/aliases b/test/integration/targets/cs_instance/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_instance/aliases
+++ b/test/integration/targets/cs_instance/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_instance_facts/aliases b/test/integration/targets/cs_instance_facts/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_instance_facts/aliases
+++ b/test/integration/targets/cs_instance_facts/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_instance_nic/aliases b/test/integration/targets/cs_instance_nic/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_instance_nic/aliases
+++ b/test/integration/targets/cs_instance_nic/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_instance_nic_secondaryip/aliases b/test/integration/targets/cs_instance_nic_secondaryip/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_instance_nic_secondaryip/aliases
+++ b/test/integration/targets/cs_instance_nic_secondaryip/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_instancegroup/aliases b/test/integration/targets/cs_instancegroup/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_instancegroup/aliases
+++ b/test/integration/targets/cs_instancegroup/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_ip_address/aliases b/test/integration/targets/cs_ip_address/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_ip_address/aliases
+++ b/test/integration/targets/cs_ip_address/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_iso/aliases b/test/integration/targets/cs_iso/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_iso/aliases
+++ b/test/integration/targets/cs_iso/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_loadbalancer_rule/aliases b/test/integration/targets/cs_loadbalancer_rule/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_loadbalancer_rule/aliases
+++ b/test/integration/targets/cs_loadbalancer_rule/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_network/aliases b/test/integration/targets/cs_network/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_network/aliases
+++ b/test/integration/targets/cs_network/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_network_acl/aliases b/test/integration/targets/cs_network_acl/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_network_acl/aliases
+++ b/test/integration/targets/cs_network_acl/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_network_acl_rule/aliases b/test/integration/targets/cs_network_acl_rule/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_network_acl_rule/aliases
+++ b/test/integration/targets/cs_network_acl_rule/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_network_offering/aliases b/test/integration/targets/cs_network_offering/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_network_offering/aliases
+++ b/test/integration/targets/cs_network_offering/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_pod/aliases b/test/integration/targets/cs_pod/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_pod/aliases
+++ b/test/integration/targets/cs_pod/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_portforward/aliases b/test/integration/targets/cs_portforward/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_portforward/aliases
+++ b/test/integration/targets/cs_portforward/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_project/aliases b/test/integration/targets/cs_project/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_project/aliases
+++ b/test/integration/targets/cs_project/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_region/aliases b/test/integration/targets/cs_region/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_region/aliases
+++ b/test/integration/targets/cs_region/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_resourcelimit/aliases b/test/integration/targets/cs_resourcelimit/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_resourcelimit/aliases
+++ b/test/integration/targets/cs_resourcelimit/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_role/aliases b/test/integration/targets/cs_role/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_role/aliases
+++ b/test/integration/targets/cs_role/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_role_permission/aliases b/test/integration/targets/cs_role_permission/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_role_permission/aliases
+++ b/test/integration/targets/cs_role_permission/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_router/aliases b/test/integration/targets/cs_router/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_router/aliases
+++ b/test/integration/targets/cs_router/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_securitygroup/aliases b/test/integration/targets/cs_securitygroup/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_securitygroup/aliases
+++ b/test/integration/targets/cs_securitygroup/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_securitygroup_rule/aliases b/test/integration/targets/cs_securitygroup_rule/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_securitygroup_rule/aliases
+++ b/test/integration/targets/cs_securitygroup_rule/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_service_offering/aliases b/test/integration/targets/cs_service_offering/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_service_offering/aliases
+++ b/test/integration/targets/cs_service_offering/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_snapshot_policy/aliases b/test/integration/targets/cs_snapshot_policy/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_snapshot_policy/aliases
+++ b/test/integration/targets/cs_snapshot_policy/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_sshkeypair/aliases b/test/integration/targets/cs_sshkeypair/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_sshkeypair/aliases
+++ b/test/integration/targets/cs_sshkeypair/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_storage_pool/aliases b/test/integration/targets/cs_storage_pool/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_storage_pool/aliases
+++ b/test/integration/targets/cs_storage_pool/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_user/aliases b/test/integration/targets/cs_user/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_user/aliases
+++ b/test/integration/targets/cs_user/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_vmsnapshot/aliases b/test/integration/targets/cs_vmsnapshot/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_vmsnapshot/aliases
+++ b/test/integration/targets/cs_vmsnapshot/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_volume/aliases b/test/integration/targets/cs_volume/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_volume/aliases
+++ b/test/integration/targets/cs_volume/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_vpc/aliases b/test/integration/targets/cs_vpc/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_vpc/aliases
+++ b/test/integration/targets/cs_vpc/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_vpc_offering/aliases b/test/integration/targets/cs_vpc_offering/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_vpc_offering/aliases
+++ b/test/integration/targets/cs_vpc_offering/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_vpn_connection/aliases b/test/integration/targets/cs_vpn_connection/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_vpn_connection/aliases
+++ b/test/integration/targets/cs_vpn_connection/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_vpn_customer_gateway/aliases b/test/integration/targets/cs_vpn_customer_gateway/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_vpn_customer_gateway/aliases
+++ b/test/integration/targets/cs_vpn_customer_gateway/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_vpn_gateway/aliases b/test/integration/targets/cs_vpn_gateway/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_vpn_gateway/aliases
+++ b/test/integration/targets/cs_vpn_gateway/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_zone/aliases b/test/integration/targets/cs_zone/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_zone/aliases
+++ b/test/integration/targets/cs_zone/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/cs_zone_facts/aliases b/test/integration/targets/cs_zone_facts/aliases
index ee8454c6d1..c89c86d7d2 100644
--- a/test/integration/targets/cs_zone_facts/aliases
+++ b/test/integration/targets/cs_zone_facts/aliases
@@ -1,2 +1,2 @@
cloud/cs
-posix/ci/cloud/group1/cs
+shippable/cs/group1
diff --git a/test/integration/targets/debconf/aliases b/test/integration/targets/debconf/aliases
index 4485d76162..a6dafcf8cd 100644
--- a/test/integration/targets/debconf/aliases
+++ b/test/integration/targets/debconf/aliases
@@ -1 +1 @@
-posix/ci/group1
+shippable/posix/group1
diff --git a/test/integration/targets/debug/aliases b/test/integration/targets/debug/aliases
index 4485d76162..a6dafcf8cd 100644
--- a/test/integration/targets/debug/aliases
+++ b/test/integration/targets/debug/aliases
@@ -1 +1 @@
-posix/ci/group1
+shippable/posix/group1
diff --git a/test/integration/targets/delegate_to/aliases b/test/integration/targets/delegate_to/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/delegate_to/aliases
+++ b/test/integration/targets/delegate_to/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/deploy_helper/aliases b/test/integration/targets/deploy_helper/aliases
index 4485d76162..a6dafcf8cd 100644
--- a/test/integration/targets/deploy_helper/aliases
+++ b/test/integration/targets/deploy_helper/aliases
@@ -1 +1 @@
-posix/ci/group1
+shippable/posix/group1
diff --git a/test/integration/targets/dnf/aliases b/test/integration/targets/dnf/aliases
index 5d97a9be5e..c8c53ee688 100644
--- a/test/integration/targets/dnf/aliases
+++ b/test/integration/targets/dnf/aliases
@@ -1,4 +1,4 @@
destructive
-posix/ci/group1
+shippable/posix/group1
skip/freebsd
skip/osx
diff --git a/test/integration/targets/docker_secret/aliases b/test/integration/targets/docker_secret/aliases
index c210873cd8..2b3832dde5 100644
--- a/test/integration/targets/docker_secret/aliases
+++ b/test/integration/targets/docker_secret/aliases
@@ -1,4 +1,4 @@
-posix/ci/group2
+shippable/posix/group2
skip/osx
skip/freebsd
destructive
diff --git a/test/integration/targets/docker_swarm/aliases b/test/integration/targets/docker_swarm/aliases
index 195a96df6e..309f4b4664 100644
--- a/test/integration/targets/docker_swarm/aliases
+++ b/test/integration/targets/docker_swarm/aliases
@@ -1,4 +1,4 @@
-posix/ci/group2
+shippable/posix/group2
skip/osx
skip/freebsd
skip/rhel
diff --git a/test/integration/targets/dpkg_selections/aliases b/test/integration/targets/dpkg_selections/aliases
index c52a478d10..6b34357ded 100644
--- a/test/integration/targets/dpkg_selections/aliases
+++ b/test/integration/targets/dpkg_selections/aliases
@@ -1,4 +1,4 @@
-posix/ci/group1
+shippable/posix/group1
destructive
skip/freebsd
skip/osx
diff --git a/test/integration/targets/ec2_ami/aliases b/test/integration/targets/ec2_ami/aliases
index 95cde7df81..22dafb891a 100644
--- a/test/integration/targets/ec2_ami/aliases
+++ b/test/integration/targets/ec2_ami/aliases
@@ -1,4 +1,4 @@
cloud/aws
-posix/ci/cloud/group4/aws
+shippable/aws/group2
unstable
ec2_ami_facts
diff --git a/test/integration/targets/ec2_elb_lb/aliases b/test/integration/targets/ec2_elb_lb/aliases
index d6ae2f116b..6e3860bee2 100644
--- a/test/integration/targets/ec2_elb_lb/aliases
+++ b/test/integration/targets/ec2_elb_lb/aliases
@@ -1,2 +1,2 @@
cloud/aws
-posix/ci/cloud/group4/aws
+shippable/aws/group2
diff --git a/test/integration/targets/ec2_group/aliases b/test/integration/targets/ec2_group/aliases
index 61d921b093..5e7a8d3877 100644
--- a/test/integration/targets/ec2_group/aliases
+++ b/test/integration/targets/ec2_group/aliases
@@ -1,3 +1,3 @@
cloud/aws
-posix/ci/cloud/group4/aws
+shippable/aws/group2
unstable
diff --git a/test/integration/targets/ec2_key/aliases b/test/integration/targets/ec2_key/aliases
index d6ae2f116b..6e3860bee2 100644
--- a/test/integration/targets/ec2_key/aliases
+++ b/test/integration/targets/ec2_key/aliases
@@ -1,2 +1,2 @@
cloud/aws
-posix/ci/cloud/group4/aws
+shippable/aws/group2
diff --git a/test/integration/targets/ec2_metadata_facts/aliases b/test/integration/targets/ec2_metadata_facts/aliases
index 13c5250d2f..f9961d9a2f 100644
--- a/test/integration/targets/ec2_metadata_facts/aliases
+++ b/test/integration/targets/ec2_metadata_facts/aliases
@@ -1,3 +1,3 @@
cloud/aws
-posix/ci/cloud/group4/aws
-posix/ci/cloud/group4/smoketest
+shippable/aws/group2
+shippable/aws/smoketest
diff --git a/test/integration/targets/ec2_tag/aliases b/test/integration/targets/ec2_tag/aliases
index d6ae2f116b..6e3860bee2 100644
--- a/test/integration/targets/ec2_tag/aliases
+++ b/test/integration/targets/ec2_tag/aliases
@@ -1,2 +1,2 @@
cloud/aws
-posix/ci/cloud/group4/aws
+shippable/aws/group2
diff --git a/test/integration/targets/ec2_vol/aliases b/test/integration/targets/ec2_vol/aliases
index d6ae2f116b..6e3860bee2 100644
--- a/test/integration/targets/ec2_vol/aliases
+++ b/test/integration/targets/ec2_vol/aliases
@@ -1,2 +1,2 @@
cloud/aws
-posix/ci/cloud/group4/aws
+shippable/aws/group2
diff --git a/test/integration/targets/ec2_vpc_egress_igw/aliases b/test/integration/targets/ec2_vpc_egress_igw/aliases
index e4e6bccbd6..6e3860bee2 100644
--- a/test/integration/targets/ec2_vpc_egress_igw/aliases
+++ b/test/integration/targets/ec2_vpc_egress_igw/aliases
@@ -1,2 +1,2 @@
cloud/aws
-posix/ci/cloud/group4/aws \ No newline at end of file
+shippable/aws/group2
diff --git a/test/integration/targets/ec2_vpc_net/aliases b/test/integration/targets/ec2_vpc_net/aliases
index d6ae2f116b..6e3860bee2 100644
--- a/test/integration/targets/ec2_vpc_net/aliases
+++ b/test/integration/targets/ec2_vpc_net/aliases
@@ -1,2 +1,2 @@
cloud/aws
-posix/ci/cloud/group4/aws
+shippable/aws/group2
diff --git a/test/integration/targets/ec2_vpc_route_table/aliases b/test/integration/targets/ec2_vpc_route_table/aliases
index 61d921b093..5e7a8d3877 100644
--- a/test/integration/targets/ec2_vpc_route_table/aliases
+++ b/test/integration/targets/ec2_vpc_route_table/aliases
@@ -1,3 +1,3 @@
cloud/aws
-posix/ci/cloud/group4/aws
+shippable/aws/group2
unstable
diff --git a/test/integration/targets/ec2_vpc_subnet/aliases b/test/integration/targets/ec2_vpc_subnet/aliases
index 61d921b093..5e7a8d3877 100644
--- a/test/integration/targets/ec2_vpc_subnet/aliases
+++ b/test/integration/targets/ec2_vpc_subnet/aliases
@@ -1,3 +1,3 @@
cloud/aws
-posix/ci/cloud/group4/aws
+shippable/aws/group2
unstable
diff --git a/test/integration/targets/ec2_vpc_vgw/aliases b/test/integration/targets/ec2_vpc_vgw/aliases
index d6ae2f116b..6e3860bee2 100644
--- a/test/integration/targets/ec2_vpc_vgw/aliases
+++ b/test/integration/targets/ec2_vpc_vgw/aliases
@@ -1,2 +1,2 @@
cloud/aws
-posix/ci/cloud/group4/aws
+shippable/aws/group2
diff --git a/test/integration/targets/ec2_vpc_vpn_facts/aliases b/test/integration/targets/ec2_vpc_vpn_facts/aliases
index d6ae2f116b..6e3860bee2 100644
--- a/test/integration/targets/ec2_vpc_vpn_facts/aliases
+++ b/test/integration/targets/ec2_vpc_vpn_facts/aliases
@@ -1,2 +1,2 @@
cloud/aws
-posix/ci/cloud/group4/aws
+shippable/aws/group2
diff --git a/test/integration/targets/ecs_ecr/aliases b/test/integration/targets/ecs_ecr/aliases
index d6ae2f116b..a112c3d1bb 100644
--- a/test/integration/targets/ecs_ecr/aliases
+++ b/test/integration/targets/ecs_ecr/aliases
@@ -1,2 +1,2 @@
cloud/aws
-posix/ci/cloud/group4/aws
+shippable/aws/group1
diff --git a/test/integration/targets/elb_classic_lb/aliases b/test/integration/targets/elb_classic_lb/aliases
index d6ae2f116b..a112c3d1bb 100644
--- a/test/integration/targets/elb_classic_lb/aliases
+++ b/test/integration/targets/elb_classic_lb/aliases
@@ -1,2 +1,2 @@
cloud/aws
-posix/ci/cloud/group4/aws
+shippable/aws/group1
diff --git a/test/integration/targets/embedded_module/aliases b/test/integration/targets/embedded_module/aliases
index 7af8b7f05b..765b70da79 100644
--- a/test/integration/targets/embedded_module/aliases
+++ b/test/integration/targets/embedded_module/aliases
@@ -1 +1 @@
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/environment/aliases b/test/integration/targets/environment/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/environment/aliases
+++ b/test/integration/targets/environment/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/etcd3/aliases b/test/integration/targets/etcd3/aliases
index 4ff122a8d3..a03abe0c05 100644
--- a/test/integration/targets/etcd3/aliases
+++ b/test/integration/targets/etcd3/aliases
@@ -1,5 +1,5 @@
destructive
-posix/ci/group1
+shippable/posix/group1
skip/osx
skip/freebsd
disabled
diff --git a/test/integration/targets/expect/aliases b/test/integration/targets/expect/aliases
index 6056de5257..ca7c912851 100644
--- a/test/integration/targets/expect/aliases
+++ b/test/integration/targets/expect/aliases
@@ -1,2 +1,2 @@
-posix/ci/group2
+shippable/posix/group2
destructive
diff --git a/test/integration/targets/facts_d/aliases b/test/integration/targets/facts_d/aliases
index 7af8b7f05b..765b70da79 100644
--- a/test/integration/targets/facts_d/aliases
+++ b/test/integration/targets/facts_d/aliases
@@ -1 +1 @@
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/failed_when/aliases b/test/integration/targets/failed_when/aliases
index 7af8b7f05b..765b70da79 100644
--- a/test/integration/targets/failed_when/aliases
+++ b/test/integration/targets/failed_when/aliases
@@ -1 +1 @@
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/fetch/aliases b/test/integration/targets/fetch/aliases
index 7af8b7f05b..765b70da79 100644
--- a/test/integration/targets/fetch/aliases
+++ b/test/integration/targets/fetch/aliases
@@ -1 +1 @@
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/file/aliases b/test/integration/targets/file/aliases
index c605ecf0f4..6bd893d49f 100644
--- a/test/integration/targets/file/aliases
+++ b/test/integration/targets/file/aliases
@@ -1,2 +1,2 @@
-posix/ci/group2
+shippable/posix/group2
needs/root
diff --git a/test/integration/targets/filesystem/aliases b/test/integration/targets/filesystem/aliases
index 1ea8a0881a..7c04127209 100644
--- a/test/integration/targets/filesystem/aliases
+++ b/test/integration/targets/filesystem/aliases
@@ -1,3 +1,3 @@
destructive
-posix/ci/group3
+shippable/posix/group3
skip/osx
diff --git a/test/integration/targets/filters/aliases b/test/integration/targets/filters/aliases
index 7af8b7f05b..765b70da79 100644
--- a/test/integration/targets/filters/aliases
+++ b/test/integration/targets/filters/aliases
@@ -1 +1 @@
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/find/aliases b/test/integration/targets/find/aliases
index 4485d76162..a6dafcf8cd 100644
--- a/test/integration/targets/find/aliases
+++ b/test/integration/targets/find/aliases
@@ -1 +1 @@
-posix/ci/group1
+shippable/posix/group1
diff --git a/test/integration/targets/firewalld/aliases b/test/integration/targets/firewalld/aliases
index 20bbbe1f95..437b04d643 100644
--- a/test/integration/targets/firewalld/aliases
+++ b/test/integration/targets/firewalld/aliases
@@ -1,4 +1,4 @@
destructive
-posix/ci/group3
+shippable/posix/group3
skip/freebsd
skip/osx
diff --git a/test/integration/targets/foreman_inventory/aliases b/test/integration/targets/foreman_inventory/aliases
index 5454249a04..641e938ad2 100644
--- a/test/integration/targets/foreman_inventory/aliases
+++ b/test/integration/targets/foreman_inventory/aliases
@@ -1,3 +1,3 @@
-posix/ci/cloud/group4/foreman
+shippable/cloud/group1
cloud/foreman
destructive
diff --git a/test/integration/targets/fortios_address/aliases b/test/integration/targets/fortios_address/aliases
index 37b197e0df..b159f9e760 100644
--- a/test/integration/targets/fortios_address/aliases
+++ b/test/integration/targets/fortios_address/aliases
@@ -1,3 +1,3 @@
-posix/ci/group1
+shippable/posix/group1
destructive
disabled
diff --git a/test/integration/targets/fortios_ipv4_policy/aliases b/test/integration/targets/fortios_ipv4_policy/aliases
index 37b197e0df..b159f9e760 100644
--- a/test/integration/targets/fortios_ipv4_policy/aliases
+++ b/test/integration/targets/fortios_ipv4_policy/aliases
@@ -1,3 +1,3 @@
-posix/ci/group1
+shippable/posix/group1
destructive
disabled
diff --git a/test/integration/targets/gathering_facts/aliases b/test/integration/targets/gathering_facts/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/gathering_facts/aliases
+++ b/test/integration/targets/gathering_facts/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/gem/aliases b/test/integration/targets/gem/aliases
index 796f3e41ed..be1c87bfe9 100644
--- a/test/integration/targets/gem/aliases
+++ b/test/integration/targets/gem/aliases
@@ -1,3 +1,3 @@
destructive
-posix/ci/group1
+shippable/posix/group1
skip/osx
diff --git a/test/integration/targets/get_url/aliases b/test/integration/targets/get_url/aliases
index 632a671d27..90ef161f59 100644
--- a/test/integration/targets/get_url/aliases
+++ b/test/integration/targets/get_url/aliases
@@ -1,3 +1,3 @@
destructive
-posix/ci/group1
+shippable/posix/group1
needs/httptester
diff --git a/test/integration/targets/getent/aliases b/test/integration/targets/getent/aliases
index 4485d76162..a6dafcf8cd 100644
--- a/test/integration/targets/getent/aliases
+++ b/test/integration/targets/getent/aliases
@@ -1 +1 @@
-posix/ci/group1
+shippable/posix/group1
diff --git a/test/integration/targets/git/aliases b/test/integration/targets/git/aliases
index 4485d76162..a6dafcf8cd 100644
--- a/test/integration/targets/git/aliases
+++ b/test/integration/targets/git/aliases
@@ -1 +1 @@
-posix/ci/group1
+shippable/posix/group1
diff --git a/test/integration/targets/github_issue/aliases b/test/integration/targets/github_issue/aliases
index 458c0b6085..b1e2213f2d 100644
--- a/test/integration/targets/github_issue/aliases
+++ b/test/integration/targets/github_issue/aliases
@@ -1,3 +1,3 @@
destructive
-posix/ci/group1
+shippable/posix/group1
disabled
diff --git a/test/integration/targets/group/aliases b/test/integration/targets/group/aliases
index 4485d76162..a6dafcf8cd 100644
--- a/test/integration/targets/group/aliases
+++ b/test/integration/targets/group/aliases
@@ -1 +1 @@
-posix/ci/group1
+shippable/posix/group1
diff --git a/test/integration/targets/group_by/aliases b/test/integration/targets/group_by/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/group_by/aliases
+++ b/test/integration/targets/group_by/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/groupby_filter/aliases b/test/integration/targets/groupby_filter/aliases
index 7af8b7f05b..765b70da79 100644
--- a/test/integration/targets/groupby_filter/aliases
+++ b/test/integration/targets/groupby_filter/aliases
@@ -1 +1 @@
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/handlers/aliases b/test/integration/targets/handlers/aliases
index 73027b2573..a351185be8 100644
--- a/test/integration/targets/handlers/aliases
+++ b/test/integration/targets/handlers/aliases
@@ -1,2 +1,2 @@
-posix/ci/group3
+shippable/posix/group3
handlers
diff --git a/test/integration/targets/hash/aliases b/test/integration/targets/hash/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/hash/aliases
+++ b/test/integration/targets/hash/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/hg/aliases b/test/integration/targets/hg/aliases
index fbbde3a161..d3fbca9bca 100644
--- a/test/integration/targets/hg/aliases
+++ b/test/integration/targets/hg/aliases
@@ -1,2 +1,2 @@
-posix/ci/group2
+shippable/posix/group2
skip/python3
diff --git a/test/integration/targets/hosts_field/aliases b/test/integration/targets/hosts_field/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/hosts_field/aliases
+++ b/test/integration/targets/hosts_field/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/ignore_errors/aliases b/test/integration/targets/ignore_errors/aliases
index 7af8b7f05b..765b70da79 100644
--- a/test/integration/targets/ignore_errors/aliases
+++ b/test/integration/targets/ignore_errors/aliases
@@ -1 +1 @@
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/include_import/aliases b/test/integration/targets/include_import/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/include_import/aliases
+++ b/test/integration/targets/include_import/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/include_vars/aliases b/test/integration/targets/include_vars/aliases
index 7af8b7f05b..765b70da79 100644
--- a/test/integration/targets/include_vars/aliases
+++ b/test/integration/targets/include_vars/aliases
@@ -1 +1 @@
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/includes/aliases b/test/integration/targets/includes/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/includes/aliases
+++ b/test/integration/targets/includes/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/influxdb_user/aliases b/test/integration/targets/influxdb_user/aliases
index 51488b9ed9..3419dc45f3 100644
--- a/test/integration/targets/influxdb_user/aliases
+++ b/test/integration/targets/influxdb_user/aliases
@@ -1,5 +1,5 @@
destructive
-posix/ci/group1
+shippable/posix/group1
disabled
skip/osx
skip/freebsd
diff --git a/test/integration/targets/ini_file/aliases b/test/integration/targets/ini_file/aliases
index 7af8b7f05b..765b70da79 100644
--- a/test/integration/targets/ini_file/aliases
+++ b/test/integration/targets/ini_file/aliases
@@ -1 +1 @@
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/inventory_path_with_comma/aliases b/test/integration/targets/inventory_path_with_comma/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/inventory_path_with_comma/aliases
+++ b/test/integration/targets/inventory_path_with_comma/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/inventory_plugin_config/aliases b/test/integration/targets/inventory_plugin_config/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/inventory_plugin_config/aliases
+++ b/test/integration/targets/inventory_plugin_config/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/ipify_facts/aliases b/test/integration/targets/ipify_facts/aliases
index 7af8b7f05b..765b70da79 100644
--- a/test/integration/targets/ipify_facts/aliases
+++ b/test/integration/targets/ipify_facts/aliases
@@ -1 +1 @@
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/iso_extract/aliases b/test/integration/targets/iso_extract/aliases
index 7978f4a6ce..6eae8bd8dd 100644
--- a/test/integration/targets/iso_extract/aliases
+++ b/test/integration/targets/iso_extract/aliases
@@ -1,2 +1,2 @@
-posix/ci/group1
+shippable/posix/group1
destructive
diff --git a/test/integration/targets/iterators/aliases b/test/integration/targets/iterators/aliases
index 7af8b7f05b..765b70da79 100644
--- a/test/integration/targets/iterators/aliases
+++ b/test/integration/targets/iterators/aliases
@@ -1 +1 @@
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/jinja2_native_types/aliases b/test/integration/targets/jinja2_native_types/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/jinja2_native_types/aliases
+++ b/test/integration/targets/jinja2_native_types/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/k8s/aliases b/test/integration/targets/k8s/aliases
index cf8f365318..326e691050 100644
--- a/test/integration/targets/k8s/aliases
+++ b/test/integration/targets/k8s/aliases
@@ -1,2 +1,2 @@
cloud/openshift
-posix/ci/cloud/group4/openshift
+shippable/cloud/group1
diff --git a/test/integration/targets/known_hosts/aliases b/test/integration/targets/known_hosts/aliases
index 7af8b7f05b..765b70da79 100644
--- a/test/integration/targets/known_hosts/aliases
+++ b/test/integration/targets/known_hosts/aliases
@@ -1 +1 @@
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/lambda_policy/aliases b/test/integration/targets/lambda_policy/aliases
index d6ae2f116b..a112c3d1bb 100644
--- a/test/integration/targets/lambda_policy/aliases
+++ b/test/integration/targets/lambda_policy/aliases
@@ -1,2 +1,2 @@
cloud/aws
-posix/ci/cloud/group4/aws
+shippable/aws/group1
diff --git a/test/integration/targets/lineinfile/aliases b/test/integration/targets/lineinfile/aliases
index 7af8b7f05b..765b70da79 100644
--- a/test/integration/targets/lineinfile/aliases
+++ b/test/integration/targets/lineinfile/aliases
@@ -1 +1 @@
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/locale_gen/aliases b/test/integration/targets/locale_gen/aliases
index 5eee2325ce..111d7086ca 100644
--- a/test/integration/targets/locale_gen/aliases
+++ b/test/integration/targets/locale_gen/aliases
@@ -1,3 +1,3 @@
destructive
needs/root
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/lookup_passwordstore/aliases b/test/integration/targets/lookup_passwordstore/aliases
index 6056de5257..ca7c912851 100644
--- a/test/integration/targets/lookup_passwordstore/aliases
+++ b/test/integration/targets/lookup_passwordstore/aliases
@@ -1,2 +1,2 @@
-posix/ci/group2
+shippable/posix/group2
destructive
diff --git a/test/integration/targets/lookup_paths/aliases b/test/integration/targets/lookup_paths/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/lookup_paths/aliases
+++ b/test/integration/targets/lookup_paths/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/lookup_properties/aliases b/test/integration/targets/lookup_properties/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/lookup_properties/aliases
+++ b/test/integration/targets/lookup_properties/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/lookups/aliases b/test/integration/targets/lookups/aliases
index 42b33e2305..3c4491b0e0 100644
--- a/test/integration/targets/lookups/aliases
+++ b/test/integration/targets/lookups/aliases
@@ -1,2 +1,2 @@
-posix/ci/group1
+shippable/posix/group1
needs/httptester
diff --git a/test/integration/targets/loops/aliases b/test/integration/targets/loops/aliases
index 7af8b7f05b..765b70da79 100644
--- a/test/integration/targets/loops/aliases
+++ b/test/integration/targets/loops/aliases
@@ -1 +1 @@
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/module_defaults/aliases b/test/integration/targets/module_defaults/aliases
index 4485d76162..a6dafcf8cd 100644
--- a/test/integration/targets/module_defaults/aliases
+++ b/test/integration/targets/module_defaults/aliases
@@ -1 +1 @@
-posix/ci/group1
+shippable/posix/group1
diff --git a/test/integration/targets/module_precedence/aliases b/test/integration/targets/module_precedence/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/module_precedence/aliases
+++ b/test/integration/targets/module_precedence/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/module_utils/aliases b/test/integration/targets/module_utils/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/module_utils/aliases
+++ b/test/integration/targets/module_utils/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/mount/aliases b/test/integration/targets/mount/aliases
index 83710ef50c..42139c5887 100644
--- a/test/integration/targets/mount/aliases
+++ b/test/integration/targets/mount/aliases
@@ -1,3 +1,3 @@
needs/privileged
needs/root
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/mysql_db/aliases b/test/integration/targets/mysql_db/aliases
index b31f76595c..5eb727b09b 100644
--- a/test/integration/targets/mysql_db/aliases
+++ b/test/integration/targets/mysql_db/aliases
@@ -1,4 +1,4 @@
destructive
-posix/ci/group1
+shippable/posix/group1
skip/osx
skip/freebsd
diff --git a/test/integration/targets/mysql_user/aliases b/test/integration/targets/mysql_user/aliases
index b31f76595c..5eb727b09b 100644
--- a/test/integration/targets/mysql_user/aliases
+++ b/test/integration/targets/mysql_user/aliases
@@ -1,4 +1,4 @@
destructive
-posix/ci/group1
+shippable/posix/group1
skip/osx
skip/freebsd
diff --git a/test/integration/targets/mysql_variables/aliases b/test/integration/targets/mysql_variables/aliases
index b31f76595c..5eb727b09b 100644
--- a/test/integration/targets/mysql_variables/aliases
+++ b/test/integration/targets/mysql_variables/aliases
@@ -1,4 +1,4 @@
destructive
-posix/ci/group1
+shippable/posix/group1
skip/osx
skip/freebsd
diff --git a/test/integration/targets/nios_dns_view/aliases b/test/integration/targets/nios_dns_view/aliases
index a52e8b266f..b3138dc764 100644
--- a/test/integration/targets/nios_dns_view/aliases
+++ b/test/integration/targets/nios_dns_view/aliases
@@ -1,3 +1,3 @@
-posix/ci/cloud/group4/nios
+shippable/cloud/group1
cloud/nios
destructive
diff --git a/test/integration/targets/nios_host_record/aliases b/test/integration/targets/nios_host_record/aliases
index a52e8b266f..b3138dc764 100644
--- a/test/integration/targets/nios_host_record/aliases
+++ b/test/integration/targets/nios_host_record/aliases
@@ -1,3 +1,3 @@
-posix/ci/cloud/group4/nios
+shippable/cloud/group1
cloud/nios
destructive
diff --git a/test/integration/targets/nios_network/aliases b/test/integration/targets/nios_network/aliases
index a52e8b266f..b3138dc764 100644
--- a/test/integration/targets/nios_network/aliases
+++ b/test/integration/targets/nios_network/aliases
@@ -1,3 +1,3 @@
-posix/ci/cloud/group4/nios
+shippable/cloud/group1
cloud/nios
destructive
diff --git a/test/integration/targets/nios_network_view/aliases b/test/integration/targets/nios_network_view/aliases
index a52e8b266f..b3138dc764 100644
--- a/test/integration/targets/nios_network_view/aliases
+++ b/test/integration/targets/nios_network_view/aliases
@@ -1,3 +1,3 @@
-posix/ci/cloud/group4/nios
+shippable/cloud/group1
cloud/nios
destructive
diff --git a/test/integration/targets/nios_ptr_record/aliases b/test/integration/targets/nios_ptr_record/aliases
index a52e8b266f..b3138dc764 100644
--- a/test/integration/targets/nios_ptr_record/aliases
+++ b/test/integration/targets/nios_ptr_record/aliases
@@ -1,3 +1,3 @@
-posix/ci/cloud/group4/nios
+shippable/cloud/group1
cloud/nios
destructive
diff --git a/test/integration/targets/nios_zone/aliases b/test/integration/targets/nios_zone/aliases
index a52e8b266f..b3138dc764 100644
--- a/test/integration/targets/nios_zone/aliases
+++ b/test/integration/targets/nios_zone/aliases
@@ -1,3 +1,3 @@
-posix/ci/cloud/group4/nios
+shippable/cloud/group1
cloud/nios
destructive
diff --git a/test/integration/targets/no_log/aliases b/test/integration/targets/no_log/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/no_log/aliases
+++ b/test/integration/targets/no_log/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/npm/aliases b/test/integration/targets/npm/aliases
index d893e18e8a..9c47a6e4ef 100644
--- a/test/integration/targets/npm/aliases
+++ b/test/integration/targets/npm/aliases
@@ -1,3 +1,3 @@
-posix/ci/group2
+shippable/posix/group2
destructive
skip/freebsd
diff --git a/test/integration/targets/nuage_vspk/aliases b/test/integration/targets/nuage_vspk/aliases
index b7aa777f1f..32dd2930c5 100644
--- a/test/integration/targets/nuage_vspk/aliases
+++ b/test/integration/targets/nuage_vspk/aliases
@@ -1,2 +1,2 @@
-posix/ci/group1
+shippable/posix/group1
skip/python3
diff --git a/test/integration/targets/one_host/aliases b/test/integration/targets/one_host/aliases
index 812297ef86..1ff4e0b13e 100644
--- a/test/integration/targets/one_host/aliases
+++ b/test/integration/targets/one_host/aliases
@@ -1,2 +1,2 @@
cloud/opennebula
-posix/ci/cloud/group4/opennebula
+shippable/cloud/group1
diff --git a/test/integration/targets/openssl_certificate/aliases b/test/integration/targets/openssl_certificate/aliases
index 7978f4a6ce..6eae8bd8dd 100644
--- a/test/integration/targets/openssl_certificate/aliases
+++ b/test/integration/targets/openssl_certificate/aliases
@@ -1,2 +1,2 @@
-posix/ci/group1
+shippable/posix/group1
destructive
diff --git a/test/integration/targets/openssl_csr/aliases b/test/integration/targets/openssl_csr/aliases
index 7978f4a6ce..6eae8bd8dd 100644
--- a/test/integration/targets/openssl_csr/aliases
+++ b/test/integration/targets/openssl_csr/aliases
@@ -1,2 +1,2 @@
-posix/ci/group1
+shippable/posix/group1
destructive
diff --git a/test/integration/targets/openssl_dhparam/aliases b/test/integration/targets/openssl_dhparam/aliases
index 7978f4a6ce..6eae8bd8dd 100644
--- a/test/integration/targets/openssl_dhparam/aliases
+++ b/test/integration/targets/openssl_dhparam/aliases
@@ -1,2 +1,2 @@
-posix/ci/group1
+shippable/posix/group1
destructive
diff --git a/test/integration/targets/openssl_privatekey/aliases b/test/integration/targets/openssl_privatekey/aliases
index 7978f4a6ce..6eae8bd8dd 100644
--- a/test/integration/targets/openssl_privatekey/aliases
+++ b/test/integration/targets/openssl_privatekey/aliases
@@ -1,2 +1,2 @@
-posix/ci/group1
+shippable/posix/group1
destructive
diff --git a/test/integration/targets/openssl_publickey/aliases b/test/integration/targets/openssl_publickey/aliases
index 7978f4a6ce..6eae8bd8dd 100644
--- a/test/integration/targets/openssl_publickey/aliases
+++ b/test/integration/targets/openssl_publickey/aliases
@@ -1,2 +1,2 @@
-posix/ci/group1
+shippable/posix/group1
destructive
diff --git a/test/integration/targets/package/aliases b/test/integration/targets/package/aliases
index 7978f4a6ce..6eae8bd8dd 100644
--- a/test/integration/targets/package/aliases
+++ b/test/integration/targets/package/aliases
@@ -1,2 +1,2 @@
-posix/ci/group1
+shippable/posix/group1
destructive
diff --git a/test/integration/targets/package_facts/aliases b/test/integration/targets/package_facts/aliases
index a553e79913..4662751b43 100644
--- a/test/integration/targets/package_facts/aliases
+++ b/test/integration/targets/package_facts/aliases
@@ -1,3 +1,3 @@
-posix/ci/group3
+shippable/posix/group3
skip/freebsd
skip/osx
diff --git a/test/integration/targets/parsing/aliases b/test/integration/targets/parsing/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/parsing/aliases
+++ b/test/integration/targets/parsing/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/patch/aliases b/test/integration/targets/patch/aliases
index 1d5cf63fba..aa159d93ae 100644
--- a/test/integration/targets/patch/aliases
+++ b/test/integration/targets/patch/aliases
@@ -1,2 +1,2 @@
destructive
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/pause/aliases b/test/integration/targets/pause/aliases
index 7af8b7f05b..765b70da79 100644
--- a/test/integration/targets/pause/aliases
+++ b/test/integration/targets/pause/aliases
@@ -1 +1 @@
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/ping/aliases b/test/integration/targets/ping/aliases
index 7af8b7f05b..765b70da79 100644
--- a/test/integration/targets/ping/aliases
+++ b/test/integration/targets/ping/aliases
@@ -1 +1 @@
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/pip/aliases b/test/integration/targets/pip/aliases
index 8e7d715f9c..a4c92ef853 100644
--- a/test/integration/targets/pip/aliases
+++ b/test/integration/targets/pip/aliases
@@ -1,2 +1,2 @@
destructive
-posix/ci/group1
+shippable/posix/group1
diff --git a/test/integration/targets/plugin_filtering/aliases b/test/integration/targets/plugin_filtering/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/plugin_filtering/aliases
+++ b/test/integration/targets/plugin_filtering/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/plugin_loader/aliases b/test/integration/targets/plugin_loader/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/plugin_loader/aliases
+++ b/test/integration/targets/plugin_loader/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/postgresql/aliases b/test/integration/targets/postgresql/aliases
index 0f2ef45058..710a9fb29e 100644
--- a/test/integration/targets/postgresql/aliases
+++ b/test/integration/targets/postgresql/aliases
@@ -1,5 +1,5 @@
destructive
-posix/ci/group1
+shippable/posix/group1
postgresql_db
postgresql_privs
postgresql_user
diff --git a/test/integration/targets/psexec/aliases b/test/integration/targets/psexec/aliases
index ab8829535c..8642fd8fd4 100644
--- a/test/integration/targets/psexec/aliases
+++ b/test/integration/targets/psexec/aliases
@@ -1,2 +1,3 @@
-windows/ci/group1
+windows
+shippable/windows/group1
diff --git a/test/integration/targets/pull/aliases b/test/integration/targets/pull/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/pull/aliases
+++ b/test/integration/targets/pull/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/rabbitmq_plugin/aliases b/test/integration/targets/rabbitmq_plugin/aliases
index c9a649c10c..3d0091e7a9 100644
--- a/test/integration/targets/rabbitmq_plugin/aliases
+++ b/test/integration/targets/rabbitmq_plugin/aliases
@@ -1,5 +1,5 @@
destructive
-posix/ci/group1
+shippable/posix/group1
skip/osx
skip/freebsd
skip/rhel
diff --git a/test/integration/targets/rabbitmq_user/aliases b/test/integration/targets/rabbitmq_user/aliases
index c9a649c10c..3d0091e7a9 100644
--- a/test/integration/targets/rabbitmq_user/aliases
+++ b/test/integration/targets/rabbitmq_user/aliases
@@ -1,5 +1,5 @@
destructive
-posix/ci/group1
+shippable/posix/group1
skip/osx
skip/freebsd
skip/rhel
diff --git a/test/integration/targets/rabbitmq_vhost/aliases b/test/integration/targets/rabbitmq_vhost/aliases
index c9a649c10c..3d0091e7a9 100644
--- a/test/integration/targets/rabbitmq_vhost/aliases
+++ b/test/integration/targets/rabbitmq_vhost/aliases
@@ -1,5 +1,5 @@
destructive
-posix/ci/group1
+shippable/posix/group1
skip/osx
skip/freebsd
skip/rhel
diff --git a/test/integration/targets/raw/aliases b/test/integration/targets/raw/aliases
index 4485d76162..a6dafcf8cd 100644
--- a/test/integration/targets/raw/aliases
+++ b/test/integration/targets/raw/aliases
@@ -1 +1 @@
-posix/ci/group1
+shippable/posix/group1
diff --git a/test/integration/targets/rds_param_group/aliases b/test/integration/targets/rds_param_group/aliases
index d6ae2f116b..a112c3d1bb 100644
--- a/test/integration/targets/rds_param_group/aliases
+++ b/test/integration/targets/rds_param_group/aliases
@@ -1,2 +1,2 @@
cloud/aws
-posix/ci/cloud/group4/aws
+shippable/aws/group1
diff --git a/test/integration/targets/remote_tmp/aliases b/test/integration/targets/remote_tmp/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/remote_tmp/aliases
+++ b/test/integration/targets/remote_tmp/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/route53_zone/aliases b/test/integration/targets/route53_zone/aliases
index d6ae2f116b..a112c3d1bb 100644
--- a/test/integration/targets/route53_zone/aliases
+++ b/test/integration/targets/route53_zone/aliases
@@ -1,2 +1,2 @@
cloud/aws
-posix/ci/cloud/group4/aws
+shippable/aws/group1
diff --git a/test/integration/targets/rpm_key/aliases b/test/integration/targets/rpm_key/aliases
index 8e7d715f9c..a4c92ef853 100644
--- a/test/integration/targets/rpm_key/aliases
+++ b/test/integration/targets/rpm_key/aliases
@@ -1,2 +1,2 @@
destructive
-posix/ci/group1
+shippable/posix/group1
diff --git a/test/integration/targets/s3_bucket/aliases b/test/integration/targets/s3_bucket/aliases
index d6ae2f116b..a112c3d1bb 100644
--- a/test/integration/targets/s3_bucket/aliases
+++ b/test/integration/targets/s3_bucket/aliases
@@ -1,2 +1,2 @@
cloud/aws
-posix/ci/cloud/group4/aws
+shippable/aws/group1
diff --git a/test/integration/targets/s3_lifecycle/aliases b/test/integration/targets/s3_lifecycle/aliases
index d6ae2f116b..a112c3d1bb 100644
--- a/test/integration/targets/s3_lifecycle/aliases
+++ b/test/integration/targets/s3_lifecycle/aliases
@@ -1,2 +1,2 @@
cloud/aws
-posix/ci/cloud/group4/aws
+shippable/aws/group1
diff --git a/test/integration/targets/script/aliases b/test/integration/targets/script/aliases
index 7af8b7f05b..765b70da79 100644
--- a/test/integration/targets/script/aliases
+++ b/test/integration/targets/script/aliases
@@ -1 +1 @@
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/seboolean/aliases b/test/integration/targets/seboolean/aliases
index 53b32510a0..9af2d79042 100644
--- a/test/integration/targets/seboolean/aliases
+++ b/test/integration/targets/seboolean/aliases
@@ -1,2 +1,2 @@
needs/root
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/sefcontext/aliases b/test/integration/targets/sefcontext/aliases
index 53b32510a0..9af2d79042 100644
--- a/test/integration/targets/sefcontext/aliases
+++ b/test/integration/targets/sefcontext/aliases
@@ -1,2 +1,2 @@
needs/root
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/selinux/aliases b/test/integration/targets/selinux/aliases
index 53b32510a0..9af2d79042 100644
--- a/test/integration/targets/selinux/aliases
+++ b/test/integration/targets/selinux/aliases
@@ -1,2 +1,2 @@
needs/root
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/sensu_client/aliases b/test/integration/targets/sensu_client/aliases
index fcb0d0ec82..a6dafcf8cd 100644
--- a/test/integration/targets/sensu_client/aliases
+++ b/test/integration/targets/sensu_client/aliases
@@ -1 +1 @@
-posix/ci/group1 \ No newline at end of file
+shippable/posix/group1
diff --git a/test/integration/targets/sensu_handler/aliases b/test/integration/targets/sensu_handler/aliases
index fcb0d0ec82..a6dafcf8cd 100644
--- a/test/integration/targets/sensu_handler/aliases
+++ b/test/integration/targets/sensu_handler/aliases
@@ -1 +1 @@
-posix/ci/group1 \ No newline at end of file
+shippable/posix/group1
diff --git a/test/integration/targets/service/aliases b/test/integration/targets/service/aliases
index 36d169fe9b..83a79adac3 100644
--- a/test/integration/targets/service/aliases
+++ b/test/integration/targets/service/aliases
@@ -1,5 +1,5 @@
destructive
-posix/ci/group1
+shippable/posix/group1
skip/freebsd
skip/osx
systemd
diff --git a/test/integration/targets/service_facts/aliases b/test/integration/targets/service_facts/aliases
index a553e79913..4662751b43 100644
--- a/test/integration/targets/service_facts/aliases
+++ b/test/integration/targets/service_facts/aliases
@@ -1,3 +1,3 @@
-posix/ci/group3
+shippable/posix/group3
skip/freebsd
skip/osx
diff --git a/test/integration/targets/set_fact/aliases b/test/integration/targets/set_fact/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/set_fact/aliases
+++ b/test/integration/targets/set_fact/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/setup_zabbix/aliases b/test/integration/targets/setup_zabbix/aliases
index c9a649c10c..3d0091e7a9 100644
--- a/test/integration/targets/setup_zabbix/aliases
+++ b/test/integration/targets/setup_zabbix/aliases
@@ -1,5 +1,5 @@
destructive
-posix/ci/group1
+shippable/posix/group1
skip/osx
skip/freebsd
skip/rhel
diff --git a/test/integration/targets/shadowed_module/aliases b/test/integration/targets/shadowed_module/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/shadowed_module/aliases
+++ b/test/integration/targets/shadowed_module/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/slurp/aliases b/test/integration/targets/slurp/aliases
index 4485d76162..a6dafcf8cd 100644
--- a/test/integration/targets/slurp/aliases
+++ b/test/integration/targets/slurp/aliases
@@ -1 +1 @@
-posix/ci/group1
+shippable/posix/group1
diff --git a/test/integration/targets/special_vars/aliases b/test/integration/targets/special_vars/aliases
index 7af8b7f05b..765b70da79 100644
--- a/test/integration/targets/special_vars/aliases
+++ b/test/integration/targets/special_vars/aliases
@@ -1 +1 @@
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/sqs_queue/aliases b/test/integration/targets/sqs_queue/aliases
index d6ae2f116b..a112c3d1bb 100644
--- a/test/integration/targets/sqs_queue/aliases
+++ b/test/integration/targets/sqs_queue/aliases
@@ -1,2 +1,2 @@
cloud/aws
-posix/ci/cloud/group4/aws
+shippable/aws/group1
diff --git a/test/integration/targets/stat/aliases b/test/integration/targets/stat/aliases
index 7af8b7f05b..765b70da79 100644
--- a/test/integration/targets/stat/aliases
+++ b/test/integration/targets/stat/aliases
@@ -1 +1 @@
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/strategy_linear/aliases b/test/integration/targets/strategy_linear/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/strategy_linear/aliases
+++ b/test/integration/targets/strategy_linear/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/sts_assume_role/aliases b/test/integration/targets/sts_assume_role/aliases
index f0ca18e615..b06de40a04 100644
--- a/test/integration/targets/sts_assume_role/aliases
+++ b/test/integration/targets/sts_assume_role/aliases
@@ -1,3 +1,3 @@
cloud/aws
-posix/ci/cloud/group4/aws
+shippable/aws/group1
iam_role
diff --git a/test/integration/targets/subversion/aliases b/test/integration/targets/subversion/aliases
index c364b48f38..bb18aafa9c 100644
--- a/test/integration/targets/subversion/aliases
+++ b/test/integration/targets/subversion/aliases
@@ -1,2 +1,2 @@
-posix/ci/group2
+shippable/posix/group2
skip/osx
diff --git a/test/integration/targets/supervisorctl/aliases b/test/integration/targets/supervisorctl/aliases
index 4a181a1ef2..eebe566fa6 100644
--- a/test/integration/targets/supervisorctl/aliases
+++ b/test/integration/targets/supervisorctl/aliases
@@ -1,3 +1,3 @@
destructive
-posix/ci/group2
+shippable/posix/group2
skip/python3
diff --git a/test/integration/targets/synchronize/aliases b/test/integration/targets/synchronize/aliases
index 7af8b7f05b..765b70da79 100644
--- a/test/integration/targets/synchronize/aliases
+++ b/test/integration/targets/synchronize/aliases
@@ -1 +1 @@
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/sysctl/aliases b/test/integration/targets/sysctl/aliases
index bfb1da9622..9fb0d7f235 100644
--- a/test/integration/targets/sysctl/aliases
+++ b/test/integration/targets/sysctl/aliases
@@ -1,3 +1,3 @@
-posix/ci/group1
+shippable/posix/group1
skip/freebsd
skip/osx
diff --git a/test/integration/targets/systemd/aliases b/test/integration/targets/systemd/aliases
index 4485d76162..a6dafcf8cd 100644
--- a/test/integration/targets/systemd/aliases
+++ b/test/integration/targets/systemd/aliases
@@ -1 +1 @@
-posix/ci/group1
+shippable/posix/group1
diff --git a/test/integration/targets/tags/aliases b/test/integration/targets/tags/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/tags/aliases
+++ b/test/integration/targets/tags/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/task_ordering/aliases b/test/integration/targets/task_ordering/aliases
index 7af8b7f05b..765b70da79 100644
--- a/test/integration/targets/task_ordering/aliases
+++ b/test/integration/targets/task_ordering/aliases
@@ -1 +1 @@
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/template/aliases b/test/integration/targets/template/aliases
index 53b32510a0..9af2d79042 100644
--- a/test/integration/targets/template/aliases
+++ b/test/integration/targets/template/aliases
@@ -1,2 +1,2 @@
needs/root
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/templating_settings/aliases b/test/integration/targets/templating_settings/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/templating_settings/aliases
+++ b/test/integration/targets/templating_settings/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/test_infra/aliases b/test/integration/targets/test_infra/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/test_infra/aliases
+++ b/test/integration/targets/test_infra/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/timezone/aliases b/test/integration/targets/timezone/aliases
index c34804aced..63927da86c 100644
--- a/test/integration/targets/timezone/aliases
+++ b/test/integration/targets/timezone/aliases
@@ -1,4 +1,4 @@
destructive
-posix/ci/group1
+shippable/posix/group1
skip/osx
systemd
diff --git a/test/integration/targets/tower_credential/aliases b/test/integration/targets/tower_credential/aliases
index 42b2b7300b..229eebe6c9 100644
--- a/test/integration/targets/tower_credential/aliases
+++ b/test/integration/targets/tower_credential/aliases
@@ -1,2 +1,2 @@
cloud/tower
-posix/ci/cloud/group4/tower
+shippable/tower/group1
diff --git a/test/integration/targets/tower_group/aliases b/test/integration/targets/tower_group/aliases
index 42b2b7300b..229eebe6c9 100644
--- a/test/integration/targets/tower_group/aliases
+++ b/test/integration/targets/tower_group/aliases
@@ -1,2 +1,2 @@
cloud/tower
-posix/ci/cloud/group4/tower
+shippable/tower/group1
diff --git a/test/integration/targets/tower_host/aliases b/test/integration/targets/tower_host/aliases
index 42b2b7300b..229eebe6c9 100644
--- a/test/integration/targets/tower_host/aliases
+++ b/test/integration/targets/tower_host/aliases
@@ -1,2 +1,2 @@
cloud/tower
-posix/ci/cloud/group4/tower
+shippable/tower/group1
diff --git a/test/integration/targets/tower_inventory/aliases b/test/integration/targets/tower_inventory/aliases
index 42b2b7300b..229eebe6c9 100644
--- a/test/integration/targets/tower_inventory/aliases
+++ b/test/integration/targets/tower_inventory/aliases
@@ -1,2 +1,2 @@
cloud/tower
-posix/ci/cloud/group4/tower
+shippable/tower/group1
diff --git a/test/integration/targets/tower_inventory_source/aliases b/test/integration/targets/tower_inventory_source/aliases
index 42b2b7300b..229eebe6c9 100644
--- a/test/integration/targets/tower_inventory_source/aliases
+++ b/test/integration/targets/tower_inventory_source/aliases
@@ -1,2 +1,2 @@
cloud/tower
-posix/ci/cloud/group4/tower
+shippable/tower/group1
diff --git a/test/integration/targets/tower_job_cancel/aliases b/test/integration/targets/tower_job_cancel/aliases
index 42b2b7300b..229eebe6c9 100644
--- a/test/integration/targets/tower_job_cancel/aliases
+++ b/test/integration/targets/tower_job_cancel/aliases
@@ -1,2 +1,2 @@
cloud/tower
-posix/ci/cloud/group4/tower
+shippable/tower/group1
diff --git a/test/integration/targets/tower_job_launch/aliases b/test/integration/targets/tower_job_launch/aliases
index 42b2b7300b..229eebe6c9 100644
--- a/test/integration/targets/tower_job_launch/aliases
+++ b/test/integration/targets/tower_job_launch/aliases
@@ -1,2 +1,2 @@
cloud/tower
-posix/ci/cloud/group4/tower
+shippable/tower/group1
diff --git a/test/integration/targets/tower_job_list/aliases b/test/integration/targets/tower_job_list/aliases
index 42b2b7300b..229eebe6c9 100644
--- a/test/integration/targets/tower_job_list/aliases
+++ b/test/integration/targets/tower_job_list/aliases
@@ -1,2 +1,2 @@
cloud/tower
-posix/ci/cloud/group4/tower
+shippable/tower/group1
diff --git a/test/integration/targets/tower_job_template/aliases b/test/integration/targets/tower_job_template/aliases
index 42b2b7300b..229eebe6c9 100644
--- a/test/integration/targets/tower_job_template/aliases
+++ b/test/integration/targets/tower_job_template/aliases
@@ -1,2 +1,2 @@
cloud/tower
-posix/ci/cloud/group4/tower
+shippable/tower/group1
diff --git a/test/integration/targets/tower_job_wait/aliases b/test/integration/targets/tower_job_wait/aliases
index 42b2b7300b..229eebe6c9 100644
--- a/test/integration/targets/tower_job_wait/aliases
+++ b/test/integration/targets/tower_job_wait/aliases
@@ -1,2 +1,2 @@
cloud/tower
-posix/ci/cloud/group4/tower
+shippable/tower/group1
diff --git a/test/integration/targets/tower_label/aliases b/test/integration/targets/tower_label/aliases
index 42b2b7300b..229eebe6c9 100644
--- a/test/integration/targets/tower_label/aliases
+++ b/test/integration/targets/tower_label/aliases
@@ -1,2 +1,2 @@
cloud/tower
-posix/ci/cloud/group4/tower
+shippable/tower/group1
diff --git a/test/integration/targets/tower_organization/aliases b/test/integration/targets/tower_organization/aliases
index 42b2b7300b..229eebe6c9 100644
--- a/test/integration/targets/tower_organization/aliases
+++ b/test/integration/targets/tower_organization/aliases
@@ -1,2 +1,2 @@
cloud/tower
-posix/ci/cloud/group4/tower
+shippable/tower/group1
diff --git a/test/integration/targets/tower_project/aliases b/test/integration/targets/tower_project/aliases
index 42b2b7300b..229eebe6c9 100644
--- a/test/integration/targets/tower_project/aliases
+++ b/test/integration/targets/tower_project/aliases
@@ -1,2 +1,2 @@
cloud/tower
-posix/ci/cloud/group4/tower
+shippable/tower/group1
diff --git a/test/integration/targets/tower_role/aliases b/test/integration/targets/tower_role/aliases
index 42b2b7300b..229eebe6c9 100644
--- a/test/integration/targets/tower_role/aliases
+++ b/test/integration/targets/tower_role/aliases
@@ -1,2 +1,2 @@
cloud/tower
-posix/ci/cloud/group4/tower
+shippable/tower/group1
diff --git a/test/integration/targets/tower_team/aliases b/test/integration/targets/tower_team/aliases
index 42b2b7300b..229eebe6c9 100644
--- a/test/integration/targets/tower_team/aliases
+++ b/test/integration/targets/tower_team/aliases
@@ -1,2 +1,2 @@
cloud/tower
-posix/ci/cloud/group4/tower
+shippable/tower/group1
diff --git a/test/integration/targets/tower_user/aliases b/test/integration/targets/tower_user/aliases
index 42b2b7300b..229eebe6c9 100644
--- a/test/integration/targets/tower_user/aliases
+++ b/test/integration/targets/tower_user/aliases
@@ -1,2 +1,2 @@
cloud/tower
-posix/ci/cloud/group4/tower
+shippable/tower/group1
diff --git a/test/integration/targets/unarchive/aliases b/test/integration/targets/unarchive/aliases
index c7e2dbad67..961b20518e 100644
--- a/test/integration/targets/unarchive/aliases
+++ b/test/integration/targets/unarchive/aliases
@@ -1,3 +1,3 @@
needs/root
-posix/ci/group2
+shippable/posix/group2
destructive
diff --git a/test/integration/targets/unicode/aliases b/test/integration/targets/unicode/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/unicode/aliases
+++ b/test/integration/targets/unicode/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/until/aliases b/test/integration/targets/until/aliases
index 7af8b7f05b..765b70da79 100644
--- a/test/integration/targets/until/aliases
+++ b/test/integration/targets/until/aliases
@@ -1 +1 @@
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/uri/aliases b/test/integration/targets/uri/aliases
index 632a671d27..90ef161f59 100644
--- a/test/integration/targets/uri/aliases
+++ b/test/integration/targets/uri/aliases
@@ -1,3 +1,3 @@
destructive
-posix/ci/group1
+shippable/posix/group1
needs/httptester
diff --git a/test/integration/targets/user/aliases b/test/integration/targets/user/aliases
index 8e7d715f9c..a4c92ef853 100644
--- a/test/integration/targets/user/aliases
+++ b/test/integration/targets/user/aliases
@@ -1,2 +1,2 @@
destructive
-posix/ci/group1
+shippable/posix/group1
diff --git a/test/integration/targets/var_blending/aliases b/test/integration/targets/var_blending/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/var_blending/aliases
+++ b/test/integration/targets/var_blending/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/var_precedence/aliases b/test/integration/targets/var_precedence/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/var_precedence/aliases
+++ b/test/integration/targets/var_precedence/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/vault/aliases b/test/integration/targets/vault/aliases
index 79d8b9285e..b59832142f 100644
--- a/test/integration/targets/vault/aliases
+++ b/test/integration/targets/vault/aliases
@@ -1 +1 @@
-posix/ci/group3
+shippable/posix/group3
diff --git a/test/integration/targets/vcenter_folder/aliases b/test/integration/targets/vcenter_folder/aliases
index e2ef6c6176..32dd9d5345 100644
--- a/test/integration/targets/vcenter_folder/aliases
+++ b/test/integration/targets/vcenter_folder/aliases
@@ -1,2 +1,2 @@
-posix/ci/cloud/group4/vcenter
+shippable/vcenter/group1
cloud/vcenter
diff --git a/test/integration/targets/vcenter_license/aliases b/test/integration/targets/vcenter_license/aliases
index e2ef6c6176..32dd9d5345 100644
--- a/test/integration/targets/vcenter_license/aliases
+++ b/test/integration/targets/vcenter_license/aliases
@@ -1,2 +1,2 @@
-posix/ci/cloud/group4/vcenter
+shippable/vcenter/group1
cloud/vcenter
diff --git a/test/integration/targets/vmware_cluster/aliases b/test/integration/targets/vmware_cluster/aliases
index e2ef6c6176..32dd9d5345 100644
--- a/test/integration/targets/vmware_cluster/aliases
+++ b/test/integration/targets/vmware_cluster/aliases
@@ -1,2 +1,2 @@
-posix/ci/cloud/group4/vcenter
+shippable/vcenter/group1
cloud/vcenter
diff --git a/test/integration/targets/vmware_cluster_facts/aliases b/test/integration/targets/vmware_cluster_facts/aliases
index 6ee4e3d4f9..10a8536623 100644
--- a/test/integration/targets/vmware_cluster_facts/aliases
+++ b/test/integration/targets/vmware_cluster_facts/aliases
@@ -1,3 +1,3 @@
-posix/ci/cloud/group4/vcenter
+shippable/vcenter/group1
cloud/vcenter
diff --git a/test/integration/targets/vmware_datacenter/aliases b/test/integration/targets/vmware_datacenter/aliases
index e2ef6c6176..32dd9d5345 100644
--- a/test/integration/targets/vmware_datacenter/aliases
+++ b/test/integration/targets/vmware_datacenter/aliases
@@ -1,2 +1,2 @@
-posix/ci/cloud/group4/vcenter
+shippable/vcenter/group1
cloud/vcenter
diff --git a/test/integration/targets/vmware_datastore_cluster/aliases b/test/integration/targets/vmware_datastore_cluster/aliases
index e2ef6c6176..32dd9d5345 100644
--- a/test/integration/targets/vmware_datastore_cluster/aliases
+++ b/test/integration/targets/vmware_datastore_cluster/aliases
@@ -1,2 +1,2 @@
-posix/ci/cloud/group4/vcenter
+shippable/vcenter/group1
cloud/vcenter
diff --git a/test/integration/targets/vmware_datastore_facts/aliases b/test/integration/targets/vmware_datastore_facts/aliases
index 480784b211..32dd9d5345 100644
--- a/test/integration/targets/vmware_datastore_facts/aliases
+++ b/test/integration/targets/vmware_datastore_facts/aliases
@@ -1,2 +1,2 @@
-posix/ci/cloud/group1/vcenter
+shippable/vcenter/group1
cloud/vcenter
diff --git a/test/integration/targets/vmware_drs_rule_facts/aliases b/test/integration/targets/vmware_drs_rule_facts/aliases
index 480784b211..32dd9d5345 100644
--- a/test/integration/targets/vmware_drs_rule_facts/aliases
+++ b/test/integration/targets/vmware_drs_rule_facts/aliases
@@ -1,2 +1,2 @@
-posix/ci/cloud/group1/vcenter
+shippable/vcenter/group1
cloud/vcenter
diff --git a/test/integration/targets/vmware_dvs_portgroup/aliases b/test/integration/targets/vmware_dvs_portgroup/aliases
index e2ef6c6176..32dd9d5345 100644
--- a/test/integration/targets/vmware_dvs_portgroup/aliases
+++ b/test/integration/targets/vmware_dvs_portgroup/aliases
@@ -1,2 +1,2 @@
-posix/ci/cloud/group4/vcenter
+shippable/vcenter/group1
cloud/vcenter
diff --git a/test/integration/targets/vmware_dvswitch/aliases b/test/integration/targets/vmware_dvswitch/aliases
index e2ef6c6176..32dd9d5345 100644
--- a/test/integration/targets/vmware_dvswitch/aliases
+++ b/test/integration/targets/vmware_dvswitch/aliases
@@ -1,2 +1,2 @@
-posix/ci/cloud/group4/vcenter
+shippable/vcenter/group1
cloud/vcenter
diff --git a/test/integration/targets/vmware_guest/aliases b/test/integration/targets/vmware_guest/aliases
index e2ef6c6176..32dd9d5345 100644
--- a/test/integration/targets/vmware_guest/aliases
+++ b/test/integration/targets/vmware_guest/aliases
@@ -1,2 +1,2 @@
-posix/ci/cloud/group4/vcenter
+shippable/vcenter/group1
cloud/vcenter
diff --git a/test/integration/targets/vmware_guest_facts/aliases b/test/integration/targets/vmware_guest_facts/aliases
index e2ef6c6176..32dd9d5345 100644
--- a/test/integration/targets/vmware_guest_facts/aliases
+++ b/test/integration/targets/vmware_guest_facts/aliases
@@ -1,2 +1,2 @@
-posix/ci/cloud/group4/vcenter
+shippable/vcenter/group1
cloud/vcenter
diff --git a/test/integration/targets/vmware_guest_find/aliases b/test/integration/targets/vmware_guest_find/aliases
index e2ef6c6176..32dd9d5345 100644
--- a/test/integration/targets/vmware_guest_find/aliases
+++ b/test/integration/targets/vmware_guest_find/aliases
@@ -1,2 +1,2 @@
-posix/ci/cloud/group4/vcenter
+shippable/vcenter/group1
cloud/vcenter
diff --git a/test/integration/targets/vmware_guest_powerstate/aliases b/test/integration/targets/vmware_guest_powerstate/aliases
index e2ef6c6176..32dd9d5345 100644
--- a/test/integration/targets/vmware_guest_powerstate/aliases
+++ b/test/integration/targets/vmware_guest_powerstate/aliases
@@ -1,2 +1,2 @@
-posix/ci/cloud/group4/vcenter
+shippable/vcenter/group1
cloud/vcenter
diff --git a/test/integration/targets/vmware_guest_tools_wait/aliases b/test/integration/targets/vmware_guest_tools_wait/aliases
index e2ef6c6176..32dd9d5345 100644
--- a/test/integration/targets/vmware_guest_tools_wait/aliases
+++ b/test/integration/targets/vmware_guest_tools_wait/aliases
@@ -1,2 +1,2 @@
-posix/ci/cloud/group4/vcenter
+shippable/vcenter/group1
cloud/vcenter
diff --git a/test/integration/targets/vmware_host/aliases b/test/integration/targets/vmware_host/aliases
index e2ef6c6176..32dd9d5345 100644
--- a/test/integration/targets/vmware_host/aliases
+++ b/test/integration/targets/vmware_host/aliases
@@ -1,2 +1,2 @@
-posix/ci/cloud/group4/vcenter
+shippable/vcenter/group1
cloud/vcenter
diff --git a/test/integration/targets/vmware_host_config_facts/aliases b/test/integration/targets/vmware_host_config_facts/aliases
index e2ef6c6176..32dd9d5345 100644
--- a/test/integration/targets/vmware_host_config_facts/aliases
+++ b/test/integration/targets/vmware_host_config_facts/aliases
@@ -1,2 +1,2 @@
-posix/ci/cloud/group4/vcenter
+shippable/vcenter/group1
cloud/vcenter
diff --git a/test/integration/targets/vmware_host_dns_facts/aliases b/test/integration/targets/vmware_host_dns_facts/aliases
index 6ee4e3d4f9..10a8536623 100644
--- a/test/integration/targets/vmware_host_dns_facts/aliases
+++ b/test/integration/targets/vmware_host_dns_facts/aliases
@@ -1,3 +1,3 @@
-posix/ci/cloud/group4/vcenter
+shippable/vcenter/group1
cloud/vcenter
diff --git a/test/integration/targets/vmware_host_facts/aliases b/test/integration/targets/vmware_host_facts/aliases
index 6ee4e3d4f9..10a8536623 100644
--- a/test/integration/targets/vmware_host_facts/aliases
+++ b/test/integration/targets/vmware_host_facts/aliases
@@ -1,3 +1,3 @@
-posix/ci/cloud/group4/vcenter
+shippable/vcenter/group1
cloud/vcenter
diff --git a/test/integration/targets/vmware_host_firewall_facts/aliases b/test/integration/targets/vmware_host_firewall_facts/aliases
index 6ee4e3d4f9..10a8536623 100644
--- a/test/integration/targets/vmware_host_firewall_facts/aliases
+++ b/test/integration/targets/vmware_host_firewall_facts/aliases
@@ -1,3 +1,3 @@
-posix/ci/cloud/group4/vcenter
+shippable/vcenter/group1
cloud/vcenter
diff --git a/test/integration/targets/vmware_host_firewall_manager/aliases b/test/integration/targets/vmware_host_firewall_manager/aliases
index e2ef6c6176..32dd9d5345 100644
--- a/test/integration/targets/vmware_host_firewall_manager/aliases
+++ b/test/integration/targets/vmware_host_firewall_manager/aliases
@@ -1,2 +1,2 @@
-posix/ci/cloud/group4/vcenter
+shippable/vcenter/group1
cloud/vcenter
diff --git a/test/integration/targets/vmware_local_role_manager/aliases b/test/integration/targets/vmware_local_role_manager/aliases
index 480784b211..32dd9d5345 100644
--- a/test/integration/targets/vmware_local_role_manager/aliases
+++ b/test/integration/targets/vmware_local_role_manager/aliases
@@ -1,2 +1,2 @@
-posix/ci/cloud/group1/vcenter
+shippable/vcenter/group1
cloud/vcenter
diff --git a/test/integration/targets/vmware_maintenancemode/aliases b/test/integration/targets/vmware_maintenancemode/aliases
index 480784b211..32dd9d5345 100644
--- a/test/integration/targets/vmware_maintenancemode/aliases
+++ b/test/integration/targets/vmware_maintenancemode/aliases
@@ -1,2 +1,2 @@
-posix/ci/cloud/group1/vcenter
+shippable/vcenter/group1
cloud/vcenter
diff --git a/test/integration/targets/vmware_portgroup_facts/aliases b/test/integration/targets/vmware_portgroup_facts/aliases
index 6ee4e3d4f9..10a8536623 100644
--- a/test/integration/targets/vmware_portgroup_facts/aliases
+++ b/test/integration/targets/vmware_portgroup_facts/aliases
@@ -1,3 +1,3 @@
-posix/ci/cloud/group4/vcenter
+shippable/vcenter/group1
cloud/vcenter
diff --git a/test/integration/targets/vmware_resource_pool/aliases b/test/integration/targets/vmware_resource_pool/aliases
index e2ef6c6176..32dd9d5345 100644
--- a/test/integration/targets/vmware_resource_pool/aliases
+++ b/test/integration/targets/vmware_resource_pool/aliases
@@ -1,2 +1,2 @@
-posix/ci/cloud/group4/vcenter
+shippable/vcenter/group1
cloud/vcenter
diff --git a/test/integration/targets/vmware_resource_pool_facts/aliases b/test/integration/targets/vmware_resource_pool_facts/aliases
index e2ef6c6176..32dd9d5345 100644
--- a/test/integration/targets/vmware_resource_pool_facts/aliases
+++ b/test/integration/targets/vmware_resource_pool_facts/aliases
@@ -1,2 +1,2 @@
-posix/ci/cloud/group4/vcenter
+shippable/vcenter/group1
cloud/vcenter
diff --git a/test/integration/targets/vmware_vm_facts/aliases b/test/integration/targets/vmware_vm_facts/aliases
index dd6753d3ee..9d99d2722a 100644
--- a/test/integration/targets/vmware_vm_facts/aliases
+++ b/test/integration/targets/vmware_vm_facts/aliases
@@ -1,3 +1,3 @@
-posix/ci/cloud/group1/vcenter
-posix/ci/cloud/group1/smoketest
+shippable/vcenter/group1
+shippable/vcenter/smoketest
cloud/vcenter
diff --git a/test/integration/targets/vyos_banner/aliases b/test/integration/targets/vyos_banner/aliases
index 93151a8d9d..539d9574ad 100644
--- a/test/integration/targets/vyos_banner/aliases
+++ b/test/integration/targets/vyos_banner/aliases
@@ -1 +1 @@
-network/ci
+shippable/network
diff --git a/test/integration/targets/vyos_command/aliases b/test/integration/targets/vyos_command/aliases
index 93151a8d9d..539d9574ad 100644
--- a/test/integration/targets/vyos_command/aliases
+++ b/test/integration/targets/vyos_command/aliases
@@ -1 +1 @@
-network/ci
+shippable/network
diff --git a/test/integration/targets/vyos_config/aliases b/test/integration/targets/vyos_config/aliases
index 93151a8d9d..539d9574ad 100644
--- a/test/integration/targets/vyos_config/aliases
+++ b/test/integration/targets/vyos_config/aliases
@@ -1 +1 @@
-network/ci
+shippable/network
diff --git a/test/integration/targets/vyos_facts/aliases b/test/integration/targets/vyos_facts/aliases
index 93151a8d9d..539d9574ad 100644
--- a/test/integration/targets/vyos_facts/aliases
+++ b/test/integration/targets/vyos_facts/aliases
@@ -1 +1 @@
-network/ci
+shippable/network
diff --git a/test/integration/targets/vyos_lldp/aliases b/test/integration/targets/vyos_lldp/aliases
index 93151a8d9d..539d9574ad 100644
--- a/test/integration/targets/vyos_lldp/aliases
+++ b/test/integration/targets/vyos_lldp/aliases
@@ -1 +1 @@
-network/ci
+shippable/network
diff --git a/test/integration/targets/vyos_static_route/aliases b/test/integration/targets/vyos_static_route/aliases
index 93151a8d9d..539d9574ad 100644
--- a/test/integration/targets/vyos_static_route/aliases
+++ b/test/integration/targets/vyos_static_route/aliases
@@ -1 +1 @@
-network/ci
+shippable/network
diff --git a/test/integration/targets/wait_for/aliases b/test/integration/targets/wait_for/aliases
index 8e7d715f9c..a4c92ef853 100644
--- a/test/integration/targets/wait_for/aliases
+++ b/test/integration/targets/wait_for/aliases
@@ -1,2 +1,2 @@
destructive
-posix/ci/group1
+shippable/posix/group1
diff --git a/test/integration/targets/wait_for_connection/aliases b/test/integration/targets/wait_for_connection/aliases
index e4b76175b1..7ab3bd0a30 100644
--- a/test/integration/targets/wait_for_connection/aliases
+++ b/test/integration/targets/wait_for_connection/aliases
@@ -1,2 +1,2 @@
-posix/ci/group1
-windows/ci/group1
+shippable/posix/group1
+shippable/windows/group1
diff --git a/test/integration/targets/wakeonlan/aliases b/test/integration/targets/wakeonlan/aliases
index 7af8b7f05b..765b70da79 100644
--- a/test/integration/targets/wakeonlan/aliases
+++ b/test/integration/targets/wakeonlan/aliases
@@ -1 +1 @@
-posix/ci/group2
+shippable/posix/group2
diff --git a/test/integration/targets/win_acl/aliases b/test/integration/targets/win_acl/aliases
index c6d6198167..3cf5b97e80 100644
--- a/test/integration/targets/win_acl/aliases
+++ b/test/integration/targets/win_acl/aliases
@@ -1 +1 @@
-windows/ci/group3
+shippable/windows/group3
diff --git a/test/integration/targets/win_acl_inheritance/aliases b/test/integration/targets/win_acl_inheritance/aliases
index c6d6198167..3cf5b97e80 100644
--- a/test/integration/targets/win_acl_inheritance/aliases
+++ b/test/integration/targets/win_acl_inheritance/aliases
@@ -1 +1 @@
-windows/ci/group3
+shippable/windows/group3
diff --git a/test/integration/targets/win_async_wrapper/aliases b/test/integration/targets/win_async_wrapper/aliases
index 33acd5ebc9..59dda5e658 100644
--- a/test/integration/targets/win_async_wrapper/aliases
+++ b/test/integration/targets/win_async_wrapper/aliases
@@ -1,3 +1,3 @@
async_status
-windows/ci/group1
-windows/ci/smoketest
+shippable/windows/group1
+shippable/windows/smoketest
diff --git a/test/integration/targets/win_audit_policy_system/aliases b/test/integration/targets/win_audit_policy_system/aliases
index ee0ed5974e..423ce39108 100644
--- a/test/integration/targets/win_audit_policy_system/aliases
+++ b/test/integration/targets/win_audit_policy_system/aliases
@@ -1 +1 @@
-windows/ci/group2
+shippable/windows/group2
diff --git a/test/integration/targets/win_audit_rule/aliases b/test/integration/targets/win_audit_rule/aliases
index c6d6198167..3cf5b97e80 100644
--- a/test/integration/targets/win_audit_rule/aliases
+++ b/test/integration/targets/win_audit_rule/aliases
@@ -1 +1 @@
-windows/ci/group3
+shippable/windows/group3
diff --git a/test/integration/targets/win_become/aliases b/test/integration/targets/win_become/aliases
index 0589efba85..f687b0e0ef 100644
--- a/test/integration/targets/win_become/aliases
+++ b/test/integration/targets/win_become/aliases
@@ -1,2 +1,2 @@
-windows/ci/group1
-windows/ci/smoketest
+shippable/windows/group4
+shippable/windows/smoketest
diff --git a/test/integration/targets/win_certificate_store/aliases b/test/integration/targets/win_certificate_store/aliases
index ee0ed5974e..423ce39108 100644
--- a/test/integration/targets/win_certificate_store/aliases
+++ b/test/integration/targets/win_certificate_store/aliases
@@ -1 +1 @@
-windows/ci/group2
+shippable/windows/group2
diff --git a/test/integration/targets/win_chocolatey/aliases b/test/integration/targets/win_chocolatey/aliases
index 10e03fc2bf..4cd27b3cb2 100644
--- a/test/integration/targets/win_chocolatey/aliases
+++ b/test/integration/targets/win_chocolatey/aliases
@@ -1 +1 @@
-windows/ci/group1
+shippable/windows/group1
diff --git a/test/integration/targets/win_chocolatey_config/aliases b/test/integration/targets/win_chocolatey_config/aliases
index 10e03fc2bf..4cd27b3cb2 100644
--- a/test/integration/targets/win_chocolatey_config/aliases
+++ b/test/integration/targets/win_chocolatey_config/aliases
@@ -1 +1 @@
-windows/ci/group1
+shippable/windows/group1
diff --git a/test/integration/targets/win_chocolatey_feature/aliases b/test/integration/targets/win_chocolatey_feature/aliases
index 10e03fc2bf..4cd27b3cb2 100644
--- a/test/integration/targets/win_chocolatey_feature/aliases
+++ b/test/integration/targets/win_chocolatey_feature/aliases
@@ -1 +1 @@
-windows/ci/group1
+shippable/windows/group1
diff --git a/test/integration/targets/win_chocolatey_source/aliases b/test/integration/targets/win_chocolatey_source/aliases
index 10e03fc2bf..4cd27b3cb2 100644
--- a/test/integration/targets/win_chocolatey_source/aliases
+++ b/test/integration/targets/win_chocolatey_source/aliases
@@ -1 +1 @@
-windows/ci/group1
+shippable/windows/group1
diff --git a/test/integration/targets/win_command/aliases b/test/integration/targets/win_command/aliases
index 10e03fc2bf..4cd27b3cb2 100644
--- a/test/integration/targets/win_command/aliases
+++ b/test/integration/targets/win_command/aliases
@@ -1 +1 @@
-windows/ci/group1
+shippable/windows/group1
diff --git a/test/integration/targets/win_copy/aliases b/test/integration/targets/win_copy/aliases
index c6d6198167..3cf5b97e80 100644
--- a/test/integration/targets/win_copy/aliases
+++ b/test/integration/targets/win_copy/aliases
@@ -1 +1 @@
-windows/ci/group3
+shippable/windows/group3
diff --git a/test/integration/targets/win_disk_facts/aliases b/test/integration/targets/win_disk_facts/aliases
index ee0ed5974e..423ce39108 100644
--- a/test/integration/targets/win_disk_facts/aliases
+++ b/test/integration/targets/win_disk_facts/aliases
@@ -1 +1 @@
-windows/ci/group2
+shippable/windows/group2
diff --git a/test/integration/targets/win_domain_membership/aliases b/test/integration/targets/win_domain_membership/aliases
index ee0ed5974e..423ce39108 100644
--- a/test/integration/targets/win_domain_membership/aliases
+++ b/test/integration/targets/win_domain_membership/aliases
@@ -1 +1 @@
-windows/ci/group2
+shippable/windows/group2
diff --git a/test/integration/targets/win_dotnet_ngen/aliases b/test/integration/targets/win_dotnet_ngen/aliases
index ee0ed5974e..423ce39108 100644
--- a/test/integration/targets/win_dotnet_ngen/aliases
+++ b/test/integration/targets/win_dotnet_ngen/aliases
@@ -1 +1 @@
-windows/ci/group2
+shippable/windows/group2
diff --git a/test/integration/targets/win_dsc/aliases b/test/integration/targets/win_dsc/aliases
index 10e03fc2bf..215e0b0692 100644
--- a/test/integration/targets/win_dsc/aliases
+++ b/test/integration/targets/win_dsc/aliases
@@ -1 +1 @@
-windows/ci/group1
+shippable/windows/group4
diff --git a/test/integration/targets/win_environment/aliases b/test/integration/targets/win_environment/aliases
index c6d6198167..3cf5b97e80 100644
--- a/test/integration/targets/win_environment/aliases
+++ b/test/integration/targets/win_environment/aliases
@@ -1 +1 @@
-windows/ci/group3
+shippable/windows/group3
diff --git a/test/integration/targets/win_eventlog/aliases b/test/integration/targets/win_eventlog/aliases
index ee0ed5974e..423ce39108 100644
--- a/test/integration/targets/win_eventlog/aliases
+++ b/test/integration/targets/win_eventlog/aliases
@@ -1 +1 @@
-windows/ci/group2
+shippable/windows/group2
diff --git a/test/integration/targets/win_eventlog_entry/aliases b/test/integration/targets/win_eventlog_entry/aliases
index 10e03fc2bf..4cd27b3cb2 100644
--- a/test/integration/targets/win_eventlog_entry/aliases
+++ b/test/integration/targets/win_eventlog_entry/aliases
@@ -1 +1 @@
-windows/ci/group1
+shippable/windows/group1
diff --git a/test/integration/targets/win_exec_wrapper/aliases b/test/integration/targets/win_exec_wrapper/aliases
index 0589efba85..1eed2ecfaf 100644
--- a/test/integration/targets/win_exec_wrapper/aliases
+++ b/test/integration/targets/win_exec_wrapper/aliases
@@ -1,2 +1,2 @@
-windows/ci/group1
-windows/ci/smoketest
+shippable/windows/group1
+shippable/windows/smoketest
diff --git a/test/integration/targets/win_feature/aliases b/test/integration/targets/win_feature/aliases
index c6d6198167..3cf5b97e80 100644
--- a/test/integration/targets/win_feature/aliases
+++ b/test/integration/targets/win_feature/aliases
@@ -1 +1 @@
-windows/ci/group3
+shippable/windows/group3
diff --git a/test/integration/targets/win_fetch/aliases b/test/integration/targets/win_fetch/aliases
index ee0ed5974e..423ce39108 100644
--- a/test/integration/targets/win_fetch/aliases
+++ b/test/integration/targets/win_fetch/aliases
@@ -1 +1 @@
-windows/ci/group2
+shippable/windows/group2
diff --git a/test/integration/targets/win_file/aliases b/test/integration/targets/win_file/aliases
index 0589efba85..1eed2ecfaf 100644
--- a/test/integration/targets/win_file/aliases
+++ b/test/integration/targets/win_file/aliases
@@ -1,2 +1,2 @@
-windows/ci/group1
-windows/ci/smoketest
+shippable/windows/group1
+shippable/windows/smoketest
diff --git a/test/integration/targets/win_find/aliases b/test/integration/targets/win_find/aliases
index 10e03fc2bf..4cd27b3cb2 100644
--- a/test/integration/targets/win_find/aliases
+++ b/test/integration/targets/win_find/aliases
@@ -1 +1 @@
-windows/ci/group1
+shippable/windows/group1
diff --git a/test/integration/targets/win_firewall/aliases b/test/integration/targets/win_firewall/aliases
index ee0ed5974e..423ce39108 100644
--- a/test/integration/targets/win_firewall/aliases
+++ b/test/integration/targets/win_firewall/aliases
@@ -1 +1 @@
-windows/ci/group2
+shippable/windows/group2
diff --git a/test/integration/targets/win_firewall_rule/aliases b/test/integration/targets/win_firewall_rule/aliases
index 10e03fc2bf..4cd27b3cb2 100644
--- a/test/integration/targets/win_firewall_rule/aliases
+++ b/test/integration/targets/win_firewall_rule/aliases
@@ -1 +1 @@
-windows/ci/group1
+shippable/windows/group1
diff --git a/test/integration/targets/win_get_url/aliases b/test/integration/targets/win_get_url/aliases
index 10e03fc2bf..4cd27b3cb2 100644
--- a/test/integration/targets/win_get_url/aliases
+++ b/test/integration/targets/win_get_url/aliases
@@ -1 +1 @@
-windows/ci/group1
+shippable/windows/group1
diff --git a/test/integration/targets/win_group/aliases b/test/integration/targets/win_group/aliases
index 0589efba85..1eed2ecfaf 100644
--- a/test/integration/targets/win_group/aliases
+++ b/test/integration/targets/win_group/aliases
@@ -1,2 +1,2 @@
-windows/ci/group1
-windows/ci/smoketest
+shippable/windows/group1
+shippable/windows/smoketest
diff --git a/test/integration/targets/win_group_membership/aliases b/test/integration/targets/win_group_membership/aliases
index 10e03fc2bf..215e0b0692 100644
--- a/test/integration/targets/win_group_membership/aliases
+++ b/test/integration/targets/win_group_membership/aliases
@@ -1 +1 @@
-windows/ci/group1
+shippable/windows/group4
diff --git a/test/integration/targets/win_hostname/aliases b/test/integration/targets/win_hostname/aliases
index c6d6198167..3cf5b97e80 100644
--- a/test/integration/targets/win_hostname/aliases
+++ b/test/integration/targets/win_hostname/aliases
@@ -1 +1 @@
-windows/ci/group3
+shippable/windows/group3
diff --git a/test/integration/targets/win_hotfix/aliases b/test/integration/targets/win_hotfix/aliases
index ee0ed5974e..423ce39108 100644
--- a/test/integration/targets/win_hotfix/aliases
+++ b/test/integration/targets/win_hotfix/aliases
@@ -1 +1 @@
-windows/ci/group2
+shippable/windows/group2
diff --git a/test/integration/targets/win_iis_webapppool/aliases b/test/integration/targets/win_iis_webapppool/aliases
index c6d6198167..3cf5b97e80 100644
--- a/test/integration/targets/win_iis_webapppool/aliases
+++ b/test/integration/targets/win_iis_webapppool/aliases
@@ -1 +1 @@
-windows/ci/group3
+shippable/windows/group3
diff --git a/test/integration/targets/win_iis_webbinding/aliases b/test/integration/targets/win_iis_webbinding/aliases
index c6d6198167..3cf5b97e80 100644
--- a/test/integration/targets/win_iis_webbinding/aliases
+++ b/test/integration/targets/win_iis_webbinding/aliases
@@ -1 +1 @@
-windows/ci/group3
+shippable/windows/group3
diff --git a/test/integration/targets/win_lineinfile/aliases b/test/integration/targets/win_lineinfile/aliases
index ee0ed5974e..423ce39108 100644
--- a/test/integration/targets/win_lineinfile/aliases
+++ b/test/integration/targets/win_lineinfile/aliases
@@ -1 +1 @@
-windows/ci/group2
+shippable/windows/group2
diff --git a/test/integration/targets/win_mapped_drive/aliases b/test/integration/targets/win_mapped_drive/aliases
index 10e03fc2bf..4cd27b3cb2 100644
--- a/test/integration/targets/win_mapped_drive/aliases
+++ b/test/integration/targets/win_mapped_drive/aliases
@@ -1 +1 @@
-windows/ci/group1
+shippable/windows/group1
diff --git a/test/integration/targets/win_module_utils/aliases b/test/integration/targets/win_module_utils/aliases
index 0589efba85..1eed2ecfaf 100644
--- a/test/integration/targets/win_module_utils/aliases
+++ b/test/integration/targets/win_module_utils/aliases
@@ -1,2 +1,2 @@
-windows/ci/group1
-windows/ci/smoketest
+shippable/windows/group1
+shippable/windows/smoketest
diff --git a/test/integration/targets/win_module_utils_legacy/aliases b/test/integration/targets/win_module_utils_legacy/aliases
index 0589efba85..1eed2ecfaf 100644
--- a/test/integration/targets/win_module_utils_legacy/aliases
+++ b/test/integration/targets/win_module_utils_legacy/aliases
@@ -1,2 +1,2 @@
-windows/ci/group1
-windows/ci/smoketest
+shippable/windows/group1
+shippable/windows/smoketest
diff --git a/test/integration/targets/win_msg/aliases b/test/integration/targets/win_msg/aliases
index 2ad273c515..98b74ac987 100644
--- a/test/integration/targets/win_msg/aliases
+++ b/test/integration/targets/win_msg/aliases
@@ -1,2 +1,2 @@
-windows/ci/group2
+shippable/windows/group2
unstable
diff --git a/test/integration/targets/win_msi/aliases b/test/integration/targets/win_msi/aliases
index 10e03fc2bf..4cd27b3cb2 100644
--- a/test/integration/targets/win_msi/aliases
+++ b/test/integration/targets/win_msi/aliases
@@ -1 +1 @@
-windows/ci/group1
+shippable/windows/group1
diff --git a/test/integration/targets/win_owner/aliases b/test/integration/targets/win_owner/aliases
index 0589efba85..f687b0e0ef 100644
--- a/test/integration/targets/win_owner/aliases
+++ b/test/integration/targets/win_owner/aliases
@@ -1,2 +1,2 @@
-windows/ci/group1
-windows/ci/smoketest
+shippable/windows/group4
+shippable/windows/smoketest
diff --git a/test/integration/targets/win_package/aliases b/test/integration/targets/win_package/aliases
index c6d6198167..3cf5b97e80 100644
--- a/test/integration/targets/win_package/aliases
+++ b/test/integration/targets/win_package/aliases
@@ -1 +1 @@
-windows/ci/group3
+shippable/windows/group3
diff --git a/test/integration/targets/win_pagefile/aliases b/test/integration/targets/win_pagefile/aliases
index c6d6198167..3cf5b97e80 100644
--- a/test/integration/targets/win_pagefile/aliases
+++ b/test/integration/targets/win_pagefile/aliases
@@ -1 +1 @@
-windows/ci/group3
+shippable/windows/group3
diff --git a/test/integration/targets/win_path/aliases b/test/integration/targets/win_path/aliases
index 0589efba85..1eed2ecfaf 100644
--- a/test/integration/targets/win_path/aliases
+++ b/test/integration/targets/win_path/aliases
@@ -1,2 +1,2 @@
-windows/ci/group1
-windows/ci/smoketest
+shippable/windows/group1
+shippable/windows/smoketest
diff --git a/test/integration/targets/win_pester/aliases b/test/integration/targets/win_pester/aliases
index ee0ed5974e..423ce39108 100644
--- a/test/integration/targets/win_pester/aliases
+++ b/test/integration/targets/win_pester/aliases
@@ -1 +1 @@
-windows/ci/group2
+shippable/windows/group2
diff --git a/test/integration/targets/win_ping/aliases b/test/integration/targets/win_ping/aliases
index b06de91284..7dacaf4101 100644
--- a/test/integration/targets/win_ping/aliases
+++ b/test/integration/targets/win_ping/aliases
@@ -1,3 +1,3 @@
-windows/ci/group1
-windows/ci/minimal
-windows/ci/smoketest
+shippable/windows/group1
+shippable/windows/minimal
+shippable/windows/smoketest
diff --git a/test/integration/targets/win_power_plan/aliases b/test/integration/targets/win_power_plan/aliases
index ee0ed5974e..423ce39108 100644
--- a/test/integration/targets/win_power_plan/aliases
+++ b/test/integration/targets/win_power_plan/aliases
@@ -1 +1 @@
-windows/ci/group2
+shippable/windows/group2
diff --git a/test/integration/targets/win_product_facts/aliases b/test/integration/targets/win_product_facts/aliases
index c6d6198167..3cf5b97e80 100644
--- a/test/integration/targets/win_product_facts/aliases
+++ b/test/integration/targets/win_product_facts/aliases
@@ -1 +1 @@
-windows/ci/group3
+shippable/windows/group3
diff --git a/test/integration/targets/win_psexec/aliases b/test/integration/targets/win_psexec/aliases
index fe015d5d00..a4da730eaa 100644
--- a/test/integration/targets/win_psexec/aliases
+++ b/test/integration/targets/win_psexec/aliases
@@ -1,2 +1,2 @@
-windows/ci/group3
+shippable/windows/group3
unstable
diff --git a/test/integration/targets/win_psmodule/aliases b/test/integration/targets/win_psmodule/aliases
index ee0ed5974e..423ce39108 100644
--- a/test/integration/targets/win_psmodule/aliases
+++ b/test/integration/targets/win_psmodule/aliases
@@ -1 +1 @@
-windows/ci/group2
+shippable/windows/group2
diff --git a/test/integration/targets/win_rabbitmq_plugin/aliases b/test/integration/targets/win_rabbitmq_plugin/aliases
index 2197c5bb63..aefcbeb1b9 100644
--- a/test/integration/targets/win_rabbitmq_plugin/aliases
+++ b/test/integration/targets/win_rabbitmq_plugin/aliases
@@ -1,2 +1,2 @@
-windows/ci/group3
+shippable/windows/group3
disabled
diff --git a/test/integration/targets/win_raw/aliases b/test/integration/targets/win_raw/aliases
index 0589efba85..1eed2ecfaf 100644
--- a/test/integration/targets/win_raw/aliases
+++ b/test/integration/targets/win_raw/aliases
@@ -1,2 +1,2 @@
-windows/ci/group1
-windows/ci/smoketest
+shippable/windows/group1
+shippable/windows/smoketest
diff --git a/test/integration/targets/win_reboot/aliases b/test/integration/targets/win_reboot/aliases
index 0589efba85..f687b0e0ef 100644
--- a/test/integration/targets/win_reboot/aliases
+++ b/test/integration/targets/win_reboot/aliases
@@ -1,2 +1,2 @@
-windows/ci/group1
-windows/ci/smoketest
+shippable/windows/group4
+shippable/windows/smoketest
diff --git a/test/integration/targets/win_reg_stat/aliases b/test/integration/targets/win_reg_stat/aliases
index 10e03fc2bf..4cd27b3cb2 100644
--- a/test/integration/targets/win_reg_stat/aliases
+++ b/test/integration/targets/win_reg_stat/aliases
@@ -1 +1 @@
-windows/ci/group1
+shippable/windows/group1
diff --git a/test/integration/targets/win_regedit/aliases b/test/integration/targets/win_regedit/aliases
index ee0ed5974e..423ce39108 100644
--- a/test/integration/targets/win_regedit/aliases
+++ b/test/integration/targets/win_regedit/aliases
@@ -1 +1 @@
-windows/ci/group2
+shippable/windows/group2
diff --git a/test/integration/targets/win_region/aliases b/test/integration/targets/win_region/aliases
index 10e03fc2bf..215e0b0692 100644
--- a/test/integration/targets/win_region/aliases
+++ b/test/integration/targets/win_region/aliases
@@ -1 +1 @@
-windows/ci/group1
+shippable/windows/group4
diff --git a/test/integration/targets/win_regmerge/aliases b/test/integration/targets/win_regmerge/aliases
index 10e03fc2bf..4cd27b3cb2 100644
--- a/test/integration/targets/win_regmerge/aliases
+++ b/test/integration/targets/win_regmerge/aliases
@@ -1 +1 @@
-windows/ci/group1
+shippable/windows/group1
diff --git a/test/integration/targets/win_route/aliases b/test/integration/targets/win_route/aliases
index c6d6198167..3cf5b97e80 100644
--- a/test/integration/targets/win_route/aliases
+++ b/test/integration/targets/win_route/aliases
@@ -1 +1 @@
-windows/ci/group3
+shippable/windows/group3
diff --git a/test/integration/targets/win_say/aliases b/test/integration/targets/win_say/aliases
index 10e03fc2bf..4cd27b3cb2 100644
--- a/test/integration/targets/win_say/aliases
+++ b/test/integration/targets/win_say/aliases
@@ -1 +1 @@
-windows/ci/group1
+shippable/windows/group1
diff --git a/test/integration/targets/win_scheduled_task/aliases b/test/integration/targets/win_scheduled_task/aliases
index c6d6198167..3cf5b97e80 100644
--- a/test/integration/targets/win_scheduled_task/aliases
+++ b/test/integration/targets/win_scheduled_task/aliases
@@ -1 +1 @@
-windows/ci/group3
+shippable/windows/group3
diff --git a/test/integration/targets/win_scheduled_task_stat/aliases b/test/integration/targets/win_scheduled_task_stat/aliases
index 10e03fc2bf..4cd27b3cb2 100644
--- a/test/integration/targets/win_scheduled_task_stat/aliases
+++ b/test/integration/targets/win_scheduled_task_stat/aliases
@@ -1 +1 @@
-windows/ci/group1
+shippable/windows/group1
diff --git a/test/integration/targets/win_script/aliases b/test/integration/targets/win_script/aliases
index 0589efba85..1eed2ecfaf 100644
--- a/test/integration/targets/win_script/aliases
+++ b/test/integration/targets/win_script/aliases
@@ -1,2 +1,2 @@
-windows/ci/group1
-windows/ci/smoketest
+shippable/windows/group1
+shippable/windows/smoketest
diff --git a/test/integration/targets/win_security_policy/aliases b/test/integration/targets/win_security_policy/aliases
index ee0ed5974e..423ce39108 100644
--- a/test/integration/targets/win_security_policy/aliases
+++ b/test/integration/targets/win_security_policy/aliases
@@ -1 +1 @@
-windows/ci/group2
+shippable/windows/group2
diff --git a/test/integration/targets/win_service/aliases b/test/integration/targets/win_service/aliases
index 0589efba85..f687b0e0ef 100644
--- a/test/integration/targets/win_service/aliases
+++ b/test/integration/targets/win_service/aliases
@@ -1,2 +1,2 @@
-windows/ci/group1
-windows/ci/smoketest
+shippable/windows/group4
+shippable/windows/smoketest
diff --git a/test/integration/targets/win_setup/aliases b/test/integration/targets/win_setup/aliases
index c6d6198167..3cf5b97e80 100644
--- a/test/integration/targets/win_setup/aliases
+++ b/test/integration/targets/win_setup/aliases
@@ -1 +1 @@
-windows/ci/group3
+shippable/windows/group3
diff --git a/test/integration/targets/win_share/aliases b/test/integration/targets/win_share/aliases
index c6d6198167..3cf5b97e80 100644
--- a/test/integration/targets/win_share/aliases
+++ b/test/integration/targets/win_share/aliases
@@ -1 +1 @@
-windows/ci/group3
+shippable/windows/group3
diff --git a/test/integration/targets/win_shell/aliases b/test/integration/targets/win_shell/aliases
index 0589efba85..1eed2ecfaf 100644
--- a/test/integration/targets/win_shell/aliases
+++ b/test/integration/targets/win_shell/aliases
@@ -1,2 +1,2 @@
-windows/ci/group1
-windows/ci/smoketest
+shippable/windows/group1
+shippable/windows/smoketest
diff --git a/test/integration/targets/win_shortcut/aliases b/test/integration/targets/win_shortcut/aliases
index ee0ed5974e..423ce39108 100644
--- a/test/integration/targets/win_shortcut/aliases
+++ b/test/integration/targets/win_shortcut/aliases
@@ -1 +1 @@
-windows/ci/group2
+shippable/windows/group2
diff --git a/test/integration/targets/win_slurp/aliases b/test/integration/targets/win_slurp/aliases
index ee0ed5974e..423ce39108 100644
--- a/test/integration/targets/win_slurp/aliases
+++ b/test/integration/targets/win_slurp/aliases
@@ -1 +1 @@
-windows/ci/group2
+shippable/windows/group2
diff --git a/test/integration/targets/win_stat/aliases b/test/integration/targets/win_stat/aliases
index 10e03fc2bf..4cd27b3cb2 100644
--- a/test/integration/targets/win_stat/aliases
+++ b/test/integration/targets/win_stat/aliases
@@ -1 +1 @@
-windows/ci/group1
+shippable/windows/group1
diff --git a/test/integration/targets/win_tempfile/aliases b/test/integration/targets/win_tempfile/aliases
index ee0ed5974e..423ce39108 100644
--- a/test/integration/targets/win_tempfile/aliases
+++ b/test/integration/targets/win_tempfile/aliases
@@ -1 +1 @@
-windows/ci/group2
+shippable/windows/group2
diff --git a/test/integration/targets/win_template/aliases b/test/integration/targets/win_template/aliases
index 0589efba85..1eed2ecfaf 100644
--- a/test/integration/targets/win_template/aliases
+++ b/test/integration/targets/win_template/aliases
@@ -1,2 +1,2 @@
-windows/ci/group1
-windows/ci/smoketest
+shippable/windows/group1
+shippable/windows/smoketest
diff --git a/test/integration/targets/win_timezone/aliases b/test/integration/targets/win_timezone/aliases
index c6d6198167..3cf5b97e80 100644
--- a/test/integration/targets/win_timezone/aliases
+++ b/test/integration/targets/win_timezone/aliases
@@ -1 +1 @@
-windows/ci/group3
+shippable/windows/group3
diff --git a/test/integration/targets/win_toast/aliases b/test/integration/targets/win_toast/aliases
index 7d700be541..ebd7be7463 100644
--- a/test/integration/targets/win_toast/aliases
+++ b/test/integration/targets/win_toast/aliases
@@ -1,2 +1,2 @@
-windows/ci/group1
+shippable/windows/group1
disabled
diff --git a/test/integration/targets/win_unzip/aliases b/test/integration/targets/win_unzip/aliases
index ee0ed5974e..423ce39108 100644
--- a/test/integration/targets/win_unzip/aliases
+++ b/test/integration/targets/win_unzip/aliases
@@ -1 +1 @@
-windows/ci/group2
+shippable/windows/group2
diff --git a/test/integration/targets/win_updates/aliases b/test/integration/targets/win_updates/aliases
index 2ad273c515..98b74ac987 100644
--- a/test/integration/targets/win_updates/aliases
+++ b/test/integration/targets/win_updates/aliases
@@ -1,2 +1,2 @@
-windows/ci/group2
+shippable/windows/group2
unstable
diff --git a/test/integration/targets/win_uri/aliases b/test/integration/targets/win_uri/aliases
index fe015d5d00..a4da730eaa 100644
--- a/test/integration/targets/win_uri/aliases
+++ b/test/integration/targets/win_uri/aliases
@@ -1,2 +1,2 @@
-windows/ci/group3
+shippable/windows/group3
unstable
diff --git a/test/integration/targets/win_user/aliases b/test/integration/targets/win_user/aliases
index c6d6198167..3cf5b97e80 100644
--- a/test/integration/targets/win_user/aliases
+++ b/test/integration/targets/win_user/aliases
@@ -1 +1 @@
-windows/ci/group3
+shippable/windows/group3
diff --git a/test/integration/targets/win_user_right/aliases b/test/integration/targets/win_user_right/aliases
index c6d6198167..3cf5b97e80 100644
--- a/test/integration/targets/win_user_right/aliases
+++ b/test/integration/targets/win_user_right/aliases
@@ -1 +1 @@
-windows/ci/group3
+shippable/windows/group3
diff --git a/test/integration/targets/win_wait_for/aliases b/test/integration/targets/win_wait_for/aliases
index 4a73d924fa..11addc63ba 100644
--- a/test/integration/targets/win_wait_for/aliases
+++ b/test/integration/targets/win_wait_for/aliases
@@ -1,2 +1,2 @@
-windows/ci/group1
+shippable/windows/group4
unstable
diff --git a/test/integration/targets/win_wakeonlan/aliases b/test/integration/targets/win_wakeonlan/aliases
index c6d6198167..3cf5b97e80 100644
--- a/test/integration/targets/win_wakeonlan/aliases
+++ b/test/integration/targets/win_wakeonlan/aliases
@@ -1 +1 @@
-windows/ci/group3
+shippable/windows/group3
diff --git a/test/integration/targets/win_whoami/aliases b/test/integration/targets/win_whoami/aliases
index c6d6198167..3cf5b97e80 100644
--- a/test/integration/targets/win_whoami/aliases
+++ b/test/integration/targets/win_whoami/aliases
@@ -1 +1 @@
-windows/ci/group3
+shippable/windows/group3
diff --git a/test/integration/targets/windows-paths/aliases b/test/integration/targets/windows-paths/aliases
index 0589efba85..cf714783f5 100644
--- a/test/integration/targets/windows-paths/aliases
+++ b/test/integration/targets/windows-paths/aliases
@@ -1,2 +1,3 @@
-windows/ci/group1
-windows/ci/smoketest
+windows
+shippable/windows/group1
+shippable/windows/smoketest
diff --git a/test/integration/targets/xattr/aliases b/test/integration/targets/xattr/aliases
index 69a0b923e9..74008ce7c5 100644
--- a/test/integration/targets/xattr/aliases
+++ b/test/integration/targets/xattr/aliases
@@ -1,4 +1,4 @@
-posix/ci/group2
+shippable/posix/group2
skip/freebsd
skip/osx
destructive
diff --git a/test/integration/targets/xml/aliases b/test/integration/targets/xml/aliases
index 8e7d715f9c..a4c92ef853 100644
--- a/test/integration/targets/xml/aliases
+++ b/test/integration/targets/xml/aliases
@@ -1,2 +1,2 @@
destructive
-posix/ci/group1
+shippable/posix/group1
diff --git a/test/integration/targets/yarn/aliases b/test/integration/targets/yarn/aliases
index 426f4c8853..51dccf7697 100644
--- a/test/integration/targets/yarn/aliases
+++ b/test/integration/targets/yarn/aliases
@@ -1,3 +1,3 @@
-posix/ci/group1
+shippable/posix/group1
destructive
-skip/freebsd \ No newline at end of file
+skip/freebsd
diff --git a/test/integration/targets/yum/aliases b/test/integration/targets/yum/aliases
index 5d97a9be5e..c8c53ee688 100644
--- a/test/integration/targets/yum/aliases
+++ b/test/integration/targets/yum/aliases
@@ -1,4 +1,4 @@
destructive
-posix/ci/group1
+shippable/posix/group1
skip/freebsd
skip/osx
diff --git a/test/integration/targets/yum_repository/aliases b/test/integration/targets/yum_repository/aliases
index 7978f4a6ce..6eae8bd8dd 100644
--- a/test/integration/targets/yum_repository/aliases
+++ b/test/integration/targets/yum_repository/aliases
@@ -1,2 +1,2 @@
-posix/ci/group1
+shippable/posix/group1
destructive
diff --git a/test/integration/targets/zabbix_host/aliases b/test/integration/targets/zabbix_host/aliases
index c9a649c10c..3d0091e7a9 100644
--- a/test/integration/targets/zabbix_host/aliases
+++ b/test/integration/targets/zabbix_host/aliases
@@ -1,5 +1,5 @@
destructive
-posix/ci/group1
+shippable/posix/group1
skip/osx
skip/freebsd
skip/rhel
diff --git a/test/integration/targets/zypper/aliases b/test/integration/targets/zypper/aliases
index 71a97e873d..2a1a850235 100644
--- a/test/integration/targets/zypper/aliases
+++ b/test/integration/targets/zypper/aliases
@@ -1,5 +1,5 @@
destructive
-posix/ci/group1
+shippable/posix/group1
skip/freebsd
skip/osx
skip/rhel
diff --git a/test/integration/targets/zypper_repository/aliases b/test/integration/targets/zypper_repository/aliases
index 71a97e873d..2a1a850235 100644
--- a/test/integration/targets/zypper_repository/aliases
+++ b/test/integration/targets/zypper_repository/aliases
@@ -1,5 +1,5 @@
destructive
-posix/ci/group1
+shippable/posix/group1
skip/freebsd
skip/osx
skip/rhel