From e81bbc288aa7eaf9abb210cf57a866d66c1116ff Mon Sep 17 00:00:00 2001 From: Tanguy Leroux Date: Wed, 19 Apr 2017 09:39:42 +0200 Subject: [PATCH] Remove Ubuntu 12.04 (#24161) Ubuntu 12.04 will be EOL on April 28, 2017. --- TESTING.asciidoc | 3 +-- Vagrantfile | 4 ---- .../org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy | 1 - docs/plugins/discovery-azure-classic.asciidoc | 2 +- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/TESTING.asciidoc b/TESTING.asciidoc index 43b53fd360f39..216100c07da39 100644 --- a/TESTING.asciidoc +++ b/TESTING.asciidoc @@ -345,7 +345,6 @@ VM running trusty by running These are the linux flavors the Vagrantfile currently supports: -* ubuntu-1204 aka precise * ubuntu-1404 aka trusty * ubuntu-1604 aka xenial * debian-8 aka jessie, the current debian stable distribution @@ -431,7 +430,7 @@ gradle vagrantFedora24#up ------------------------------------------------- Or any of vagrantCentos6#up, vagrantDebian8#up, vagrantFedora24#up, vagrantOel6#up, -vagrantOel7#up, vagrantOpensuse13#up, vagrantSles12#up, vagrantUbuntu1204#up, +vagrantOel7#up, vagrantOpensuse13#up, vagrantSles12#up, vagrantUbuntu1404#up, vagrantUbuntu1604#up. Once up, you can then connect to the VM using SSH from the elasticsearch directory: diff --git a/Vagrantfile b/Vagrantfile index 044394424047c..f008b339c3fa4 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -22,10 +22,6 @@ # under the License. Vagrant.configure(2) do |config| - config.vm.define "ubuntu-1204" do |config| - config.vm.box = "elastic/ubuntu-12.04-x86_64" - ubuntu_common config - end config.vm.define "ubuntu-1404" do |config| config.vm.box = "elastic/ubuntu-14.04-x86_64" ubuntu_common config 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 336ee207abfb9..2fb047e93051d 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy @@ -22,7 +22,6 @@ class VagrantTestPlugin implements Plugin { 'oel-7', 'opensuse-13', 'sles-12', - 'ubuntu-1204', 'ubuntu-1404', 'ubuntu-1604' ] diff --git a/docs/plugins/discovery-azure-classic.asciidoc b/docs/plugins/discovery-azure-classic.asciidoc index f69df7f51713f..0362f2a6fe3a3 100644 --- a/docs/plugins/discovery-azure-classic.asciidoc +++ b/docs/plugins/discovery-azure-classic.asciidoc @@ -169,7 +169,7 @@ Before starting, you need to have: * A http://www.windowsazure.com/[Windows Azure account] * OpenSSL that isn't from MacPorts, specifically `OpenSSL 1.0.1f 6 Jan 2014` doesn't seem to create a valid keypair for ssh. FWIW, - `OpenSSL 1.0.1c 10 May 2012` on Ubuntu 12.04 LTS is known to work. + `OpenSSL 1.0.1c 10 May 2012` on Ubuntu 14.04 LTS is known to work. * SSH keys and certificate + --