From dab52d790aa6d3ed572b6b68b4d4eec3471c4765 Mon Sep 17 00:00:00 2001 From: Alpar Torok Date: Thu, 17 May 2018 13:43:31 +0300 Subject: [PATCH 1/2] Remove fedora 26, add 28 Closes #30579 --- Vagrantfile | 8 ++++---- .../elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 6761fec07dab2..72c9adccc7dd6 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -97,15 +97,15 @@ Vagrant.configure(2) do |config| rpm_common config, box end end - 'fedora-26'.tap do |box| + 'fedora-27'.tap do |box| config.vm.define box, define_opts do |config| - config.vm.box = 'elastic/fedora-26-x86_64' + config.vm.box = 'elastic/fedora-27-x86_64' dnf_common config, box end end - 'fedora-27'.tap do |box| + 'fedora-28'.tap do |box| config.vm.define box, define_opts do |config| - config.vm.box = 'elastic/fedora-27-x86_64' + config.vm.box = 'elastic/fedora-28-x86_64' dnf_common config, box end end diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy index bb85359ae3f07..523c4cb420e8d 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy @@ -21,8 +21,8 @@ class VagrantTestPlugin implements Plugin { 'centos-7', 'debian-8', 'debian-9', - 'fedora-26', 'fedora-27', + 'fedora-28', 'oel-6', 'oel-7', 'opensuse-42', From 695dfbb3929bb2dfce340b51318877e56b9f068e Mon Sep 17 00:00:00 2001 From: Alpar Torok Date: Fri, 18 May 2018 08:30:58 +0300 Subject: [PATCH 2/2] Update testing docs with new fedora 28 image --- TESTING.asciidoc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/TESTING.asciidoc b/TESTING.asciidoc index 2e4a6ede754ad..b379d4c32d876 100644 --- a/TESTING.asciidoc +++ b/TESTING.asciidoc @@ -352,8 +352,8 @@ These are the linux flavors the Vagrantfile currently supports: * debian-9 aka stretch, the current debian stable distribution * centos-6 * centos-7 -* fedora-26 * fedora-27 +* fedora-28 * oel-6 aka Oracle Enterprise Linux 6 * oel-7 aka Oracle Enterprise Linux 7 * sles-12 @@ -429,23 +429,23 @@ sudo -E bats $BATS_TESTS/*.bats You can also use Gradle to prepare the test environment and then starts a single VM: ------------------------------------------------- -./gradlew vagrantFedora27#up +./gradlew vagrantFedora28#up ------------------------------------------------- Or any of vagrantCentos6#up, vagrantCentos7#up, vagrantDebian8#up, -vagrantDebian9#up, vagrantFedora26#up, vagrantFedora27#up, vagrantOel6#up, vagrantOel7#up, +vagrantDebian9#up, vagrantFedora27#up, vagrantFedora28#up, vagrantOel6#up, vagrantOel7#up, vagrantOpensuse42#up,vagrantSles12#up, vagrantUbuntu1404#up, vagrantUbuntu1604#up. Once up, you can then connect to the VM using SSH from the elasticsearch directory: ------------------------------------------------- -vagrant ssh fedora-27 +vagrant ssh fedora-28 ------------------------------------------------- Or from another directory: ------------------------------------------------- -VAGRANT_CWD=/path/to/elasticsearch vagrant ssh fedora-27 +VAGRANT_CWD=/path/to/elasticsearch vagrant ssh fedora-28 ------------------------------------------------- Note: Starting vagrant VM outside of the elasticsearch folder requires to