Browse Source

Fix openjdk use for package test (#41277)

The gc log filename on linux is different with openjdk vs the oracle
openjdk. This commit fixes the filename checked, which has changed
because we now use oracle's openjdk 11.

Additionally, windows packaging tests are fixed to download openjdk 11, and use it.
Ryan Ernst 6 years ago
parent
commit
b89491e30d

+ 7 - 5
Vagrantfile

@@ -64,9 +64,6 @@ Vagrant.configure(2) do |config|
       SHELL
       SHELL
     end
     end
   end
   end
-  # Wheezy's backports don't contain Openjdk 8 and the backflips
-  # required to get the sun jdk on there just aren't worth it. We have
-  # jessie and stretch for testing debian and it works fine.
   'debian-8'.tap do |box|
   'debian-8'.tap do |box|
     config.vm.define box, define_opts do |config|
     config.vm.define box, define_opts do |config|
       config.vm.box = 'elastic/debian-8-x86_64'
       config.vm.box = 'elastic/debian-8-x86_64'
@@ -406,11 +403,16 @@ def windows_common(config, name)
     $ps_prompt | Out-File $PsHome/Microsoft.PowerShell_profile.ps1
     $ps_prompt | Out-File $PsHome/Microsoft.PowerShell_profile.ps1
   SHELL
   SHELL
 
 
+  config.vm.provision 'windows-jdk-11', type: 'shell', inline: <<-SHELL
+    New-Item -ItemType Directory -Force -Path "C:/java"
+    Invoke-WebRequest "https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_windows-x64_bin.zip" -OutFile "C:/java/jdk-11.zip"
+    Expand-Archive -Path "C:/java/jdk-11.zip" -DestinationPath "C:/java/"
+  SHELL
+
   config.vm.provision 'set env variables', type: 'shell', inline: <<-SHELL
   config.vm.provision 'set env variables', type: 'shell', inline: <<-SHELL
     $ErrorActionPreference = "Stop"
     $ErrorActionPreference = "Stop"
     [Environment]::SetEnvironmentVariable("PACKAGING_ARCHIVES", "C:/project/build/packaging/archives", "Machine")
     [Environment]::SetEnvironmentVariable("PACKAGING_ARCHIVES", "C:/project/build/packaging/archives", "Machine")
-    $javaHome = [Environment]::GetEnvironmentVariable("JAVA_HOME", "Machine")
-    [Environment]::SetEnvironmentVariable("SYSTEM_JAVA_HOME", $javaHome, "Machine")
+    [Environment]::SetEnvironmentVariable("SYSTEM_JAVA_HOME", "C:\java\jdk-11.0.2", "Machine")
     [Environment]::SetEnvironmentVariable("PACKAGING_TESTS", "C:/project/build/packaging/tests", "Machine")
     [Environment]::SetEnvironmentVariable("PACKAGING_TESTS", "C:/project/build/packaging/tests", "Machine")
     [Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "Machine")
     [Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "Machine")
   SHELL
   SHELL

+ 1 - 1
buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy

@@ -300,7 +300,7 @@ class VagrantTestPlugin implements Plugin<Project> {
                      } else {
                      } else {
                        \$testArgs = \$args
                        \$testArgs = \$args
                      }
                      }
-                     "\$Env:SYSTEM_JAVA_HOME"/bin/java -cp "\$Env:PACKAGING_TESTS/*" org.elasticsearch.packaging.VMTestRunner @testArgs
+                     & "\$Env:SYSTEM_JAVA_HOME"/bin/java -cp "\$Env:PACKAGING_TESTS/*" org.elasticsearch.packaging.VMTestRunner @testArgs
                      exit \$LASTEXITCODE
                      exit \$LASTEXITCODE
                      """
                      """
         }
         }

+ 1 - 1
qa/vagrant/src/test/resources/packaging/tests/70_sysv_initd.bats

@@ -160,7 +160,7 @@ setup() {
 
 
 @test "[INIT.D] GC logs exist" {
 @test "[INIT.D] GC logs exist" {
     start_elasticsearch_service
     start_elasticsearch_service
-    assert_file_exist /var/log/elasticsearch/gc.log.0.current
+    assert_file_exist /var/log/elasticsearch/gc.log
     stop_elasticsearch_service
     stop_elasticsearch_service
 }
 }