From 4af6d86c019ffae4d02be3ecea92b8d7d03c40f6 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Wed, 14 Aug 2019 10:30:41 -0700 Subject: [PATCH] Rename vagrant project to os (#45509) (#45530) The system level tests for our distributions have historically be run in vagrant, and thus the name of the gradle project has been "vagrant". However, as we move to running these tests in other environments (eg GCP) the name vagrant no longer makes sense. This commit renames the project to "os" (short for operating system), since these tests ensure all of our distributions run correctly on our supported operating systems. --- qa/{vagrant => os}/README.md | 0 qa/{vagrant => os}/bats/default/10_basic.bats | 0 qa/{vagrant => os}/bats/default/20_tar_bootstrap_password.bats | 0 .../bats/default/25_package_bootstrap_password.bats | 0 qa/{vagrant => os}/bats/default/30_tar_setup_passwords.bats | 0 qa/{vagrant => os}/bats/default/35_package_setup_passwords.bats | 0 qa/{vagrant => os}/bats/default/40_tar_certgen.bats | 0 qa/{vagrant => os}/bats/default/45_package_certgen.bats | 0 qa/{vagrant => os}/bats/default/bootstrap_password.bash | 0 qa/{vagrant => os}/bats/default/certgen.bash | 0 qa/{vagrant => os}/bats/default/setup_passwords.bash | 0 qa/{vagrant => os}/bats/oss/70_sysv_initd.bats | 0 qa/{vagrant => os}/bats/plugins/25_tar_plugins.bats | 0 qa/{vagrant => os}/bats/plugins/50_modules_and_plugins.bats | 0 qa/{vagrant => os}/bats/plugins/module_and_plugin_test_cases.bash | 0 qa/{vagrant => os}/bats/upgrade/80_upgrade.bats | 0 qa/{vagrant => os}/bats/utils/modules.bash | 0 qa/{vagrant => os}/bats/utils/packages.bash | 0 qa/{vagrant => os}/bats/utils/plugins.bash | 0 qa/{vagrant => os}/bats/utils/tar.bash | 0 qa/{vagrant => os}/bats/utils/utils.bash | 0 qa/{vagrant => os}/bats/utils/xpack.bash | 0 qa/{vagrant => os}/build.gradle | 0 qa/{vagrant => os}/centos-6/build.gradle | 0 qa/{vagrant => os}/centos-7/build.gradle | 0 qa/{vagrant => os}/debian-8/build.gradle | 0 qa/{vagrant => os}/debian-9/build.gradle | 0 qa/{vagrant => os}/fedora-28/build.gradle | 0 qa/{vagrant => os}/fedora-29/build.gradle | 0 qa/{vagrant => os}/oel-6/build.gradle | 0 qa/{vagrant => os}/oel-7/build.gradle | 0 qa/{vagrant => os}/opensuse-42/build.gradle | 0 qa/{vagrant => os}/sles-12/build.gradle | 0 .../src/test/java/org/elasticsearch/packaging/VMTestRunner.java | 0 .../java/org/elasticsearch/packaging/test/ArchiveTestCase.java | 0 .../org/elasticsearch/packaging/test/DebPreservationTestCase.java | 0 .../org/elasticsearch/packaging/test/DefaultDebBasicTests.java | 0 .../elasticsearch/packaging/test/DefaultDebPreservationTests.java | 0 .../org/elasticsearch/packaging/test/DefaultLinuxTarTests.java | 0 .../elasticsearch/packaging/test/DefaultNoJdkDebBasicTests.java | 0 .../elasticsearch/packaging/test/DefaultNoJdkLinuxTarTests.java | 0 .../elasticsearch/packaging/test/DefaultNoJdkRpmBasicTests.java | 0 .../elasticsearch/packaging/test/DefaultNoJdkWindowsZipTests.java | 0 .../org/elasticsearch/packaging/test/DefaultRpmBasicTests.java | 0 .../elasticsearch/packaging/test/DefaultRpmPreservationTests.java | 0 .../elasticsearch/packaging/test/DefaultWindowsServiceTests.java | 0 .../org/elasticsearch/packaging/test/DefaultWindowsZipTests.java | 0 .../java/org/elasticsearch/packaging/test/OssDebBasicTests.java | 0 .../org/elasticsearch/packaging/test/OssDebPreservationTests.java | 0 .../java/org/elasticsearch/packaging/test/OssLinuxTarTests.java | 0 .../org/elasticsearch/packaging/test/OssNoJdkDebBasicTests.java | 0 .../org/elasticsearch/packaging/test/OssNoJdkLinuxTarTests.java | 0 .../org/elasticsearch/packaging/test/OssNoJdkRpmBasicTests.java | 0 .../org/elasticsearch/packaging/test/OssNoJdkWindowsZipTests.java | 0 .../java/org/elasticsearch/packaging/test/OssRpmBasicTests.java | 0 .../org/elasticsearch/packaging/test/OssRpmPreservationTests.java | 0 .../org/elasticsearch/packaging/test/OssWindowsServiceTests.java | 0 .../java/org/elasticsearch/packaging/test/OssWindowsZipTests.java | 0 .../java/org/elasticsearch/packaging/test/PackageTestCase.java | 0 .../java/org/elasticsearch/packaging/test/PackagingTestCase.java | 0 .../org/elasticsearch/packaging/test/RpmPreservationTestCase.java | 0 .../org/elasticsearch/packaging/test/WindowsServiceTestCase.java | 0 .../src/test/java/org/elasticsearch/packaging/util/Archives.java | 0 .../src/test/java/org/elasticsearch/packaging/util/Cleanup.java | 0 .../test/java/org/elasticsearch/packaging/util/Distribution.java | 0 .../test/java/org/elasticsearch/packaging/util/FileMatcher.java | 0 .../src/test/java/org/elasticsearch/packaging/util/FileUtils.java | 0 .../test/java/org/elasticsearch/packaging/util/Installation.java | 0 .../src/test/java/org/elasticsearch/packaging/util/Packages.java | 0 .../src/test/java/org/elasticsearch/packaging/util/Platforms.java | 0 .../test/java/org/elasticsearch/packaging/util/ServerUtils.java | 0 .../src/test/java/org/elasticsearch/packaging/util/Shell.java | 0 qa/{vagrant => os}/ubuntu-1604/build.gradle | 0 qa/{vagrant => os}/ubuntu-1804/build.gradle | 0 qa/{vagrant => os}/windows-2012r2/build.gradle | 0 qa/{vagrant => os}/windows-2016/build.gradle | 0 76 files changed, 0 insertions(+), 0 deletions(-) rename qa/{vagrant => os}/README.md (100%) rename qa/{vagrant => os}/bats/default/10_basic.bats (100%) rename qa/{vagrant => os}/bats/default/20_tar_bootstrap_password.bats (100%) rename qa/{vagrant => os}/bats/default/25_package_bootstrap_password.bats (100%) rename qa/{vagrant => os}/bats/default/30_tar_setup_passwords.bats (100%) rename qa/{vagrant => os}/bats/default/35_package_setup_passwords.bats (100%) rename qa/{vagrant => os}/bats/default/40_tar_certgen.bats (100%) rename qa/{vagrant => os}/bats/default/45_package_certgen.bats (100%) rename qa/{vagrant => os}/bats/default/bootstrap_password.bash (100%) rename qa/{vagrant => os}/bats/default/certgen.bash (100%) rename qa/{vagrant => os}/bats/default/setup_passwords.bash (100%) rename qa/{vagrant => os}/bats/oss/70_sysv_initd.bats (100%) rename qa/{vagrant => os}/bats/plugins/25_tar_plugins.bats (100%) rename qa/{vagrant => os}/bats/plugins/50_modules_and_plugins.bats (100%) rename qa/{vagrant => os}/bats/plugins/module_and_plugin_test_cases.bash (100%) rename qa/{vagrant => os}/bats/upgrade/80_upgrade.bats (100%) rename qa/{vagrant => os}/bats/utils/modules.bash (100%) rename qa/{vagrant => os}/bats/utils/packages.bash (100%) rename qa/{vagrant => os}/bats/utils/plugins.bash (100%) rename qa/{vagrant => os}/bats/utils/tar.bash (100%) rename qa/{vagrant => os}/bats/utils/utils.bash (100%) rename qa/{vagrant => os}/bats/utils/xpack.bash (100%) rename qa/{vagrant => os}/build.gradle (100%) rename qa/{vagrant => os}/centos-6/build.gradle (100%) rename qa/{vagrant => os}/centos-7/build.gradle (100%) rename qa/{vagrant => os}/debian-8/build.gradle (100%) rename qa/{vagrant => os}/debian-9/build.gradle (100%) rename qa/{vagrant => os}/fedora-28/build.gradle (100%) rename qa/{vagrant => os}/fedora-29/build.gradle (100%) rename qa/{vagrant => os}/oel-6/build.gradle (100%) rename qa/{vagrant => os}/oel-7/build.gradle (100%) rename qa/{vagrant => os}/opensuse-42/build.gradle (100%) rename qa/{vagrant => os}/sles-12/build.gradle (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/VMTestRunner.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/test/ArchiveTestCase.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/test/DebPreservationTestCase.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/test/DefaultDebBasicTests.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/test/DefaultDebPreservationTests.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/test/DefaultLinuxTarTests.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/test/DefaultNoJdkDebBasicTests.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/test/DefaultNoJdkLinuxTarTests.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/test/DefaultNoJdkRpmBasicTests.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/test/DefaultNoJdkWindowsZipTests.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/test/DefaultRpmBasicTests.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/test/DefaultRpmPreservationTests.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/test/DefaultWindowsServiceTests.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/test/DefaultWindowsZipTests.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/test/OssDebBasicTests.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/test/OssDebPreservationTests.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/test/OssLinuxTarTests.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/test/OssNoJdkDebBasicTests.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/test/OssNoJdkLinuxTarTests.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/test/OssNoJdkRpmBasicTests.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/test/OssNoJdkWindowsZipTests.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/test/OssRpmBasicTests.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/test/OssRpmPreservationTests.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/test/OssWindowsServiceTests.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/test/OssWindowsZipTests.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/test/PackageTestCase.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/test/PackagingTestCase.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/test/RpmPreservationTestCase.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/test/WindowsServiceTestCase.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/util/Archives.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/util/Cleanup.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/util/Distribution.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/util/FileMatcher.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/util/FileUtils.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/util/Installation.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/util/Packages.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/util/Platforms.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/util/ServerUtils.java (100%) rename qa/{vagrant => os}/src/test/java/org/elasticsearch/packaging/util/Shell.java (100%) rename qa/{vagrant => os}/ubuntu-1604/build.gradle (100%) rename qa/{vagrant => os}/ubuntu-1804/build.gradle (100%) rename qa/{vagrant => os}/windows-2012r2/build.gradle (100%) rename qa/{vagrant => os}/windows-2016/build.gradle (100%) diff --git a/qa/vagrant/README.md b/qa/os/README.md similarity index 100% rename from qa/vagrant/README.md rename to qa/os/README.md diff --git a/qa/vagrant/bats/default/10_basic.bats b/qa/os/bats/default/10_basic.bats similarity index 100% rename from qa/vagrant/bats/default/10_basic.bats rename to qa/os/bats/default/10_basic.bats diff --git a/qa/vagrant/bats/default/20_tar_bootstrap_password.bats b/qa/os/bats/default/20_tar_bootstrap_password.bats similarity index 100% rename from qa/vagrant/bats/default/20_tar_bootstrap_password.bats rename to qa/os/bats/default/20_tar_bootstrap_password.bats diff --git a/qa/vagrant/bats/default/25_package_bootstrap_password.bats b/qa/os/bats/default/25_package_bootstrap_password.bats similarity index 100% rename from qa/vagrant/bats/default/25_package_bootstrap_password.bats rename to qa/os/bats/default/25_package_bootstrap_password.bats diff --git a/qa/vagrant/bats/default/30_tar_setup_passwords.bats b/qa/os/bats/default/30_tar_setup_passwords.bats similarity index 100% rename from qa/vagrant/bats/default/30_tar_setup_passwords.bats rename to qa/os/bats/default/30_tar_setup_passwords.bats diff --git a/qa/vagrant/bats/default/35_package_setup_passwords.bats b/qa/os/bats/default/35_package_setup_passwords.bats similarity index 100% rename from qa/vagrant/bats/default/35_package_setup_passwords.bats rename to qa/os/bats/default/35_package_setup_passwords.bats diff --git a/qa/vagrant/bats/default/40_tar_certgen.bats b/qa/os/bats/default/40_tar_certgen.bats similarity index 100% rename from qa/vagrant/bats/default/40_tar_certgen.bats rename to qa/os/bats/default/40_tar_certgen.bats diff --git a/qa/vagrant/bats/default/45_package_certgen.bats b/qa/os/bats/default/45_package_certgen.bats similarity index 100% rename from qa/vagrant/bats/default/45_package_certgen.bats rename to qa/os/bats/default/45_package_certgen.bats diff --git a/qa/vagrant/bats/default/bootstrap_password.bash b/qa/os/bats/default/bootstrap_password.bash similarity index 100% rename from qa/vagrant/bats/default/bootstrap_password.bash rename to qa/os/bats/default/bootstrap_password.bash diff --git a/qa/vagrant/bats/default/certgen.bash b/qa/os/bats/default/certgen.bash similarity index 100% rename from qa/vagrant/bats/default/certgen.bash rename to qa/os/bats/default/certgen.bash diff --git a/qa/vagrant/bats/default/setup_passwords.bash b/qa/os/bats/default/setup_passwords.bash similarity index 100% rename from qa/vagrant/bats/default/setup_passwords.bash rename to qa/os/bats/default/setup_passwords.bash diff --git a/qa/vagrant/bats/oss/70_sysv_initd.bats b/qa/os/bats/oss/70_sysv_initd.bats similarity index 100% rename from qa/vagrant/bats/oss/70_sysv_initd.bats rename to qa/os/bats/oss/70_sysv_initd.bats diff --git a/qa/vagrant/bats/plugins/25_tar_plugins.bats b/qa/os/bats/plugins/25_tar_plugins.bats similarity index 100% rename from qa/vagrant/bats/plugins/25_tar_plugins.bats rename to qa/os/bats/plugins/25_tar_plugins.bats diff --git a/qa/vagrant/bats/plugins/50_modules_and_plugins.bats b/qa/os/bats/plugins/50_modules_and_plugins.bats similarity index 100% rename from qa/vagrant/bats/plugins/50_modules_and_plugins.bats rename to qa/os/bats/plugins/50_modules_and_plugins.bats diff --git a/qa/vagrant/bats/plugins/module_and_plugin_test_cases.bash b/qa/os/bats/plugins/module_and_plugin_test_cases.bash similarity index 100% rename from qa/vagrant/bats/plugins/module_and_plugin_test_cases.bash rename to qa/os/bats/plugins/module_and_plugin_test_cases.bash diff --git a/qa/vagrant/bats/upgrade/80_upgrade.bats b/qa/os/bats/upgrade/80_upgrade.bats similarity index 100% rename from qa/vagrant/bats/upgrade/80_upgrade.bats rename to qa/os/bats/upgrade/80_upgrade.bats diff --git a/qa/vagrant/bats/utils/modules.bash b/qa/os/bats/utils/modules.bash similarity index 100% rename from qa/vagrant/bats/utils/modules.bash rename to qa/os/bats/utils/modules.bash diff --git a/qa/vagrant/bats/utils/packages.bash b/qa/os/bats/utils/packages.bash similarity index 100% rename from qa/vagrant/bats/utils/packages.bash rename to qa/os/bats/utils/packages.bash diff --git a/qa/vagrant/bats/utils/plugins.bash b/qa/os/bats/utils/plugins.bash similarity index 100% rename from qa/vagrant/bats/utils/plugins.bash rename to qa/os/bats/utils/plugins.bash diff --git a/qa/vagrant/bats/utils/tar.bash b/qa/os/bats/utils/tar.bash similarity index 100% rename from qa/vagrant/bats/utils/tar.bash rename to qa/os/bats/utils/tar.bash diff --git a/qa/vagrant/bats/utils/utils.bash b/qa/os/bats/utils/utils.bash similarity index 100% rename from qa/vagrant/bats/utils/utils.bash rename to qa/os/bats/utils/utils.bash diff --git a/qa/vagrant/bats/utils/xpack.bash b/qa/os/bats/utils/xpack.bash similarity index 100% rename from qa/vagrant/bats/utils/xpack.bash rename to qa/os/bats/utils/xpack.bash diff --git a/qa/vagrant/build.gradle b/qa/os/build.gradle similarity index 100% rename from qa/vagrant/build.gradle rename to qa/os/build.gradle diff --git a/qa/vagrant/centos-6/build.gradle b/qa/os/centos-6/build.gradle similarity index 100% rename from qa/vagrant/centos-6/build.gradle rename to qa/os/centos-6/build.gradle diff --git a/qa/vagrant/centos-7/build.gradle b/qa/os/centos-7/build.gradle similarity index 100% rename from qa/vagrant/centos-7/build.gradle rename to qa/os/centos-7/build.gradle diff --git a/qa/vagrant/debian-8/build.gradle b/qa/os/debian-8/build.gradle similarity index 100% rename from qa/vagrant/debian-8/build.gradle rename to qa/os/debian-8/build.gradle diff --git a/qa/vagrant/debian-9/build.gradle b/qa/os/debian-9/build.gradle similarity index 100% rename from qa/vagrant/debian-9/build.gradle rename to qa/os/debian-9/build.gradle diff --git a/qa/vagrant/fedora-28/build.gradle b/qa/os/fedora-28/build.gradle similarity index 100% rename from qa/vagrant/fedora-28/build.gradle rename to qa/os/fedora-28/build.gradle diff --git a/qa/vagrant/fedora-29/build.gradle b/qa/os/fedora-29/build.gradle similarity index 100% rename from qa/vagrant/fedora-29/build.gradle rename to qa/os/fedora-29/build.gradle diff --git a/qa/vagrant/oel-6/build.gradle b/qa/os/oel-6/build.gradle similarity index 100% rename from qa/vagrant/oel-6/build.gradle rename to qa/os/oel-6/build.gradle diff --git a/qa/vagrant/oel-7/build.gradle b/qa/os/oel-7/build.gradle similarity index 100% rename from qa/vagrant/oel-7/build.gradle rename to qa/os/oel-7/build.gradle diff --git a/qa/vagrant/opensuse-42/build.gradle b/qa/os/opensuse-42/build.gradle similarity index 100% rename from qa/vagrant/opensuse-42/build.gradle rename to qa/os/opensuse-42/build.gradle diff --git a/qa/vagrant/sles-12/build.gradle b/qa/os/sles-12/build.gradle similarity index 100% rename from qa/vagrant/sles-12/build.gradle rename to qa/os/sles-12/build.gradle diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/VMTestRunner.java b/qa/os/src/test/java/org/elasticsearch/packaging/VMTestRunner.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/VMTestRunner.java rename to qa/os/src/test/java/org/elasticsearch/packaging/VMTestRunner.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/test/ArchiveTestCase.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/ArchiveTestCase.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/test/ArchiveTestCase.java rename to qa/os/src/test/java/org/elasticsearch/packaging/test/ArchiveTestCase.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/test/DebPreservationTestCase.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/DebPreservationTestCase.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/test/DebPreservationTestCase.java rename to qa/os/src/test/java/org/elasticsearch/packaging/test/DebPreservationTestCase.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/test/DefaultDebBasicTests.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/DefaultDebBasicTests.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/test/DefaultDebBasicTests.java rename to qa/os/src/test/java/org/elasticsearch/packaging/test/DefaultDebBasicTests.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/test/DefaultDebPreservationTests.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/DefaultDebPreservationTests.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/test/DefaultDebPreservationTests.java rename to qa/os/src/test/java/org/elasticsearch/packaging/test/DefaultDebPreservationTests.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/test/DefaultLinuxTarTests.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/DefaultLinuxTarTests.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/test/DefaultLinuxTarTests.java rename to qa/os/src/test/java/org/elasticsearch/packaging/test/DefaultLinuxTarTests.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/test/DefaultNoJdkDebBasicTests.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/DefaultNoJdkDebBasicTests.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/test/DefaultNoJdkDebBasicTests.java rename to qa/os/src/test/java/org/elasticsearch/packaging/test/DefaultNoJdkDebBasicTests.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/test/DefaultNoJdkLinuxTarTests.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/DefaultNoJdkLinuxTarTests.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/test/DefaultNoJdkLinuxTarTests.java rename to qa/os/src/test/java/org/elasticsearch/packaging/test/DefaultNoJdkLinuxTarTests.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/test/DefaultNoJdkRpmBasicTests.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/DefaultNoJdkRpmBasicTests.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/test/DefaultNoJdkRpmBasicTests.java rename to qa/os/src/test/java/org/elasticsearch/packaging/test/DefaultNoJdkRpmBasicTests.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/test/DefaultNoJdkWindowsZipTests.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/DefaultNoJdkWindowsZipTests.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/test/DefaultNoJdkWindowsZipTests.java rename to qa/os/src/test/java/org/elasticsearch/packaging/test/DefaultNoJdkWindowsZipTests.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/test/DefaultRpmBasicTests.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/DefaultRpmBasicTests.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/test/DefaultRpmBasicTests.java rename to qa/os/src/test/java/org/elasticsearch/packaging/test/DefaultRpmBasicTests.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/test/DefaultRpmPreservationTests.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/DefaultRpmPreservationTests.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/test/DefaultRpmPreservationTests.java rename to qa/os/src/test/java/org/elasticsearch/packaging/test/DefaultRpmPreservationTests.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/test/DefaultWindowsServiceTests.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/DefaultWindowsServiceTests.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/test/DefaultWindowsServiceTests.java rename to qa/os/src/test/java/org/elasticsearch/packaging/test/DefaultWindowsServiceTests.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/test/DefaultWindowsZipTests.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/DefaultWindowsZipTests.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/test/DefaultWindowsZipTests.java rename to qa/os/src/test/java/org/elasticsearch/packaging/test/DefaultWindowsZipTests.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/test/OssDebBasicTests.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/OssDebBasicTests.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/test/OssDebBasicTests.java rename to qa/os/src/test/java/org/elasticsearch/packaging/test/OssDebBasicTests.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/test/OssDebPreservationTests.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/OssDebPreservationTests.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/test/OssDebPreservationTests.java rename to qa/os/src/test/java/org/elasticsearch/packaging/test/OssDebPreservationTests.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/test/OssLinuxTarTests.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/OssLinuxTarTests.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/test/OssLinuxTarTests.java rename to qa/os/src/test/java/org/elasticsearch/packaging/test/OssLinuxTarTests.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/test/OssNoJdkDebBasicTests.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/OssNoJdkDebBasicTests.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/test/OssNoJdkDebBasicTests.java rename to qa/os/src/test/java/org/elasticsearch/packaging/test/OssNoJdkDebBasicTests.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/test/OssNoJdkLinuxTarTests.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/OssNoJdkLinuxTarTests.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/test/OssNoJdkLinuxTarTests.java rename to qa/os/src/test/java/org/elasticsearch/packaging/test/OssNoJdkLinuxTarTests.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/test/OssNoJdkRpmBasicTests.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/OssNoJdkRpmBasicTests.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/test/OssNoJdkRpmBasicTests.java rename to qa/os/src/test/java/org/elasticsearch/packaging/test/OssNoJdkRpmBasicTests.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/test/OssNoJdkWindowsZipTests.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/OssNoJdkWindowsZipTests.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/test/OssNoJdkWindowsZipTests.java rename to qa/os/src/test/java/org/elasticsearch/packaging/test/OssNoJdkWindowsZipTests.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/test/OssRpmBasicTests.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/OssRpmBasicTests.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/test/OssRpmBasicTests.java rename to qa/os/src/test/java/org/elasticsearch/packaging/test/OssRpmBasicTests.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/test/OssRpmPreservationTests.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/OssRpmPreservationTests.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/test/OssRpmPreservationTests.java rename to qa/os/src/test/java/org/elasticsearch/packaging/test/OssRpmPreservationTests.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/test/OssWindowsServiceTests.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/OssWindowsServiceTests.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/test/OssWindowsServiceTests.java rename to qa/os/src/test/java/org/elasticsearch/packaging/test/OssWindowsServiceTests.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/test/OssWindowsZipTests.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/OssWindowsZipTests.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/test/OssWindowsZipTests.java rename to qa/os/src/test/java/org/elasticsearch/packaging/test/OssWindowsZipTests.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/test/PackageTestCase.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/PackageTestCase.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/test/PackageTestCase.java rename to qa/os/src/test/java/org/elasticsearch/packaging/test/PackageTestCase.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/test/PackagingTestCase.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/PackagingTestCase.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/test/PackagingTestCase.java rename to qa/os/src/test/java/org/elasticsearch/packaging/test/PackagingTestCase.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/test/RpmPreservationTestCase.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/RpmPreservationTestCase.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/test/RpmPreservationTestCase.java rename to qa/os/src/test/java/org/elasticsearch/packaging/test/RpmPreservationTestCase.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/test/WindowsServiceTestCase.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/WindowsServiceTestCase.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/test/WindowsServiceTestCase.java rename to qa/os/src/test/java/org/elasticsearch/packaging/test/WindowsServiceTestCase.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/util/Archives.java b/qa/os/src/test/java/org/elasticsearch/packaging/util/Archives.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/util/Archives.java rename to qa/os/src/test/java/org/elasticsearch/packaging/util/Archives.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/util/Cleanup.java b/qa/os/src/test/java/org/elasticsearch/packaging/util/Cleanup.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/util/Cleanup.java rename to qa/os/src/test/java/org/elasticsearch/packaging/util/Cleanup.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/util/Distribution.java b/qa/os/src/test/java/org/elasticsearch/packaging/util/Distribution.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/util/Distribution.java rename to qa/os/src/test/java/org/elasticsearch/packaging/util/Distribution.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/util/FileMatcher.java b/qa/os/src/test/java/org/elasticsearch/packaging/util/FileMatcher.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/util/FileMatcher.java rename to qa/os/src/test/java/org/elasticsearch/packaging/util/FileMatcher.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/util/FileUtils.java b/qa/os/src/test/java/org/elasticsearch/packaging/util/FileUtils.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/util/FileUtils.java rename to qa/os/src/test/java/org/elasticsearch/packaging/util/FileUtils.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/util/Installation.java b/qa/os/src/test/java/org/elasticsearch/packaging/util/Installation.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/util/Installation.java rename to qa/os/src/test/java/org/elasticsearch/packaging/util/Installation.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/util/Packages.java b/qa/os/src/test/java/org/elasticsearch/packaging/util/Packages.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/util/Packages.java rename to qa/os/src/test/java/org/elasticsearch/packaging/util/Packages.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/util/Platforms.java b/qa/os/src/test/java/org/elasticsearch/packaging/util/Platforms.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/util/Platforms.java rename to qa/os/src/test/java/org/elasticsearch/packaging/util/Platforms.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/util/ServerUtils.java b/qa/os/src/test/java/org/elasticsearch/packaging/util/ServerUtils.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/util/ServerUtils.java rename to qa/os/src/test/java/org/elasticsearch/packaging/util/ServerUtils.java diff --git a/qa/vagrant/src/test/java/org/elasticsearch/packaging/util/Shell.java b/qa/os/src/test/java/org/elasticsearch/packaging/util/Shell.java similarity index 100% rename from qa/vagrant/src/test/java/org/elasticsearch/packaging/util/Shell.java rename to qa/os/src/test/java/org/elasticsearch/packaging/util/Shell.java diff --git a/qa/vagrant/ubuntu-1604/build.gradle b/qa/os/ubuntu-1604/build.gradle similarity index 100% rename from qa/vagrant/ubuntu-1604/build.gradle rename to qa/os/ubuntu-1604/build.gradle diff --git a/qa/vagrant/ubuntu-1804/build.gradle b/qa/os/ubuntu-1804/build.gradle similarity index 100% rename from qa/vagrant/ubuntu-1804/build.gradle rename to qa/os/ubuntu-1804/build.gradle diff --git a/qa/vagrant/windows-2012r2/build.gradle b/qa/os/windows-2012r2/build.gradle similarity index 100% rename from qa/vagrant/windows-2012r2/build.gradle rename to qa/os/windows-2012r2/build.gradle diff --git a/qa/vagrant/windows-2016/build.gradle b/qa/os/windows-2016/build.gradle similarity index 100% rename from qa/vagrant/windows-2016/build.gradle rename to qa/os/windows-2016/build.gradle