Merge branch '2.2.x' into 2.3.x

Closes gh-24347
spring-projects · Dec 7, 2020 · 07e32bf · 07e32bf
2 parents c7fe372 + f64b7f8
commit 07e32bf
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/...Test/java/org/springframework/boot/launchscript/AbstractLaunchScriptIntegrationTests.java b/...Test/java/org/springframework/boot/launchscript/AbstractLaunchScriptIntegrationTests.java
@@ -20,6 +20,7 @@
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Predicate;
 
 import org.assertj.core.api.Condition;
 import org.testcontainers.containers.GenericContainer;
@@ -50,11 +51,13 @@ protected AbstractLaunchScriptIntegrationTests(String scriptsDir) {
 		this.scriptsDir = scriptsDir;
 	}
 
-	static List<Object[]> parameters() {
+	static List<Object[]> parameters(Predicate<File> osFilter) {
 		List<Object[]> parameters = new ArrayList<>();
 		for (File os : new File("src/intTest/resources/conf").listFiles()) {
-			for (File version : os.listFiles()) {
-				parameters.add(new Object[] { os.getName(), version.getName() });
+			if (osFilter.test(os)) {
+				for (File version : os.listFiles()) {
+					parameters.add(new Object[] { os.getName(), version.getName() });
+				}
 			}
 		}
 		return parameters;

diff --git a/...c/intTest/java/org/springframework/boot/launchscript/JarLaunchScriptIntegrationTests.java b/...c/intTest/java/org/springframework/boot/launchscript/JarLaunchScriptIntegrationTests.java
@@ -16,6 +16,8 @@
 
 package org.springframework.boot.launchscript;
 
+import java.util.List;
+
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
@@ -36,6 +38,10 @@ class JarLaunchScriptIntegrationTests extends AbstractLaunchScriptIntegrationTes
 		super("jar/");
 	}
 
+	static List<Object[]> parameters() {
+		return parameters((file) -> true);
+	}
+
 	@ParameterizedTest(name = "{0} {1}")
 	@MethodSource("parameters")
 	void basicLaunch(String os, String version) throws Exception {

diff --git a/...Test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIntegrationTests.java b/...Test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIntegrationTests.java
@@ -16,6 +16,7 @@
 
 package org.springframework.boot.launchscript;
 
+import java.util.List;
 import java.util.regex.Pattern;
 
 import org.junit.jupiter.api.Assumptions;
@@ -41,6 +42,10 @@ class SysVinitLaunchScriptIntegrationTests extends AbstractLaunchScriptIntegrati
 		super("init.d/");
 	}
 
+	static List<Object[]> parameters() {
+		return parameters((file) -> !file.getName().contains("CentOS"));
+	}
+
 	@ParameterizedTest(name = "{0} {1}")
 	@MethodSource("parameters")
 	void statusWhenStopped(String os, String version) throws Exception {

diff --git a/...urces/conf/CentOS/6.9-a23bced6/Dockerfile → ...urces/conf/CentOS/7.9-e4ca2ed0/Dockerfile b/...urces/conf/CentOS/6.9-a23bced6/Dockerfile → ...urces/conf/CentOS/7.9-e4ca2ed0/Dockerfile
@@ -1,7 +1,6 @@
-# CentOS 6.9 from 02/06/2017
-FROM centos@sha256:a23bced61701af9a0a758e94229676d9f09996a3ff0f3d26955b06bac8c282e0
+# CentOS 7.9 from 18/11/2020
+FROM centos@sha256:e4ca2ed0202e76be184e75fb26d14bf974193579039d5573fb2348664deef76e
 RUN yum install -y wget && \
-    yum install -y system-config-services && \
     yum install -y curl && \
     wget --output-document jdk.rpm \
         https://cdn.azul.com/zulu/bin/zulu8.21.0.1-jdk8.0.131-linux.x86_64.rpm && \