From be13c699d0ab4706ec25626375b0965e3cdfa138 Mon Sep 17 00:00:00 2001
From: Ryan Ernst <ryan@elastic.co>
Date: Thu, 15 Oct 2020 13:05:21 -0700
Subject: [PATCH] Remove opensuse 42 from vagrant tests (#63759)

Opensuse 42 has not worked in a while. The test image is unmaintained,
and cannot be launched. It was removed from CI packaging test runs, but
still remained in vagrant tests. This commit removes it from vagrant
tests.
---
 TESTING.asciidoc                                            | 1 -
 Vagrantfile                                                 | 6 ------
 .../elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy   | 5 ++---
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/TESTING.asciidoc b/TESTING.asciidoc
index f4b05d0c6fe93..16a3ac84d3115 100644
--- a/TESTING.asciidoc
+++ b/TESTING.asciidoc
@@ -380,7 +380,6 @@ These are the linux flavors supported, all of which we provide images for
 * oel-6 aka Oracle Enterprise Linux 6
 * oel-7 aka Oracle Enterprise Linux 7
 * sles-12
-* opensuse-42 aka Leap
 
 We're missing the following from the support matrix because there aren't high
 quality boxes available in vagrant atlas:
diff --git a/Vagrantfile b/Vagrantfile
index 527307a988344..e0106f28d7537 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -121,12 +121,6 @@ Vagrant.configure(2) do |config|
       dnf_common config, box
     end
   end
-  'opensuse-42'.tap do |box|
-    config.vm.define box, define_opts do |config|
-      config.vm.box = 'elastic/opensuse-42-x86_64'
-      suse_common config, box
-    end
-  end
   'sles-12'.tap do |box|
     config.vm.define box, define_opts do |config|
       config.vm.box = 'elastic/sles-12-x86_64'
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 9249d3405811a..aa05fdaf464ec 100644
--- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy
@@ -28,7 +28,6 @@ class VagrantTestPlugin implements Plugin<Project> {
             'fedora-27',
             'oel-6',
             'oel-7',
-            'opensuse-42',
             'sles-12',
             'ubuntu-1404',
             'ubuntu-1604',
@@ -529,7 +528,7 @@ class VagrantTestPlugin implements Plugin<Project> {
                 if (project.extensions.esvagrant.boxes.contains(box)) {
                     // these tests are temporarily disabled for suse boxes while we debug an issue
                     // https://github.com/elastic/elasticsearch/issues/30295
-                    if (box.equals("opensuse-42") == false && box.equals("sles-12") == false) {
+                    if (box.equals("sles-12") == false) {
                         packagingTest.dependsOn(batsPackagingTest)
                     }
                 }
@@ -572,7 +571,7 @@ class VagrantTestPlugin implements Plugin<Project> {
             if (project.extensions.esvagrant.boxes.contains(box)) {
                 // these tests are temporarily disabled for suse boxes while we debug an issue
                 // https://github.com/elastic/elasticsearch/issues/30295
-                if (box.equals("opensuse-42") == false && box.equals("sles-12") == false) {
+                if (box.equals("sles-12") == false) {
                     packagingTest.dependsOn(javaPackagingTest)
                 }
             }