Merge pull request #1152 from microsoft/trask/use-azul-openjdk-distribution

trask · web-flow · commit 40a7d3686339 · 2019-11-10T21:48:19.000-08:00
Use Azul Zulu OpenJDK distribution for smoke tests
diff --git a/test/smoke/appServers/JBossEAP.6/jre.excludes.txt b/test/smoke/appServers/JBossEAP.6/jre.excludes.txt
@@ -1,6 +1,3 @@
-openjdk:9-jre
 azul/zulu-openjdk:9
-openjdk:10-jre
 azul/zulu-openjdk:10
-openjdk:11-jre
-azul/zulu-openjdk:11
+azul/zulu-openjdk:11
diff --git a/test/smoke/appServers/JBossEAP.7/jre.excludes.txt b/test/smoke/appServers/JBossEAP.7/jre.excludes.txt
@@ -1,2 +1 @@
-openjdk:7-jre
-azul/zulu-openjdk:7
+azul/zulu-openjdk:7
diff --git a/test/smoke/appServers/Jetty.9/jre.excludes.txt b/test/smoke/appServers/Jetty.9/jre.excludes.txt
@@ -1,2 +1 @@
-openjdk:7-jre
-azul/zulu-openjdk:7
+azul/zulu-openjdk:7
diff --git a/test/smoke/appServers/build.gradle b/test/smoke/appServers/build.gradle
@@ -116,7 +116,7 @@ subprojects {
                 exec {
                     workingDir df.getParentFile().absolutePath
                     executable dockerExe
-                    args 'build', '-f', df.name, '-t', tag, '.'
+                    args 'build', '--pull', '-f', df.name, '-t', tag, '.'
                 }
             }
         }
diff --git a/test/smoke/appServers/jre.master.txt b/test/smoke/appServers/jre.master.txt
@@ -1,3 +1,3 @@
-openjdk:7-jre
-openjdk:8-jre
+azul/zulu-openjdk:7
+azul/zulu-openjdk:8
 azul/zulu-openjdk:11
diff --git a/test/smoke/testApps/SpringBootAuto/src/smokeTest/resources/jre.excludes.txt b/test/smoke/testApps/SpringBootAuto/src/smokeTest/resources/jre.excludes.txt
@@ -1 +1 @@
-openjdk:7-jre
+azul/zulu-openjdk:7
diff --git a/test/smoke/testApps/SpringBootTest/src/smokeTest/resources/jre.excludes.txt b/test/smoke/testApps/SpringBootTest/src/smokeTest/resources/jre.excludes.txt
@@ -1 +1 @@
-openjdk:7-jre
+azul/zulu-openjdk:7
diff --git a/test/smoke/testApps/TraceLog4j1_2/src/main/resources/log4j.xml b/test/smoke/testApps/TraceLog4j1_2/src/main/resources/log4j.xml
@@ -23,6 +23,11 @@
         <level value="off" />
     </logger>
 
+    <!-- Java 8u232 introduces some SSL java.util.logging, and JBoss 6 sends java.util.logging to Log4j 1.2 -->
+    <logger name="jdk.event.security">
+        <level value="off" />
+    </logger>
+
     <root>
         <priority value ="trace" />
         <appender-ref ref="test" />
diff --git a/test/smoke/testApps/TraceLog4j1_2UsingAgent/src/main/resources/log4j.xml b/test/smoke/testApps/TraceLog4j1_2UsingAgent/src/main/resources/log4j.xml
@@ -17,6 +17,11 @@
         <level value="off" />
     </logger>
 
+    <!-- Java 8u232 introduces some SSL java.util.logging, and JBoss 6 sends java.util.logging to Log4j 1.2 -->
+    <logger name="jdk.event.security">
+        <level value="off" />
+    </logger>
+
     <root>
         <priority value ="trace" />
         <appender-ref ref="console" />
diff --git a/test/smoke/testApps/VerifyJava7/src/smokeTest/resources/jre.excludes.txt b/test/smoke/testApps/VerifyJava7/src/smokeTest/resources/jre.excludes.txt
@@ -1 +1 @@
-openjdk:7-jre
+azul/zulu-openjdk:7

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-openjdk:7-jre`
`2`		`-azul/zulu-openjdk:7`
	`1`	`+azul/zulu-openjdk:7`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ subprojects {`
`116`	`116`	`exec {`
`117`	`117`	`workingDir df.getParentFile().absolutePath`
`118`	`118`	`executable dockerExe`
`119`		`- args 'build', '-f', df.name, '-t', tag, '.'`
	`119`	`+ args 'build', '--pull', '-f', df.name, '-t', tag, '.'`
`120`	`120`	`}`
`121`	`121`	`}`
`122`	`122`	`}`