Improve robustness of DeploymentIntegrationTests

wilkinsona · wilkinsona · commit b9ee545c7895 · 2020-09-07T16:15:12.000+01:00
Closes gh-23207
diff --git a/spring-boot-tests/spring-boot-deployment-tests/src/intTest/java/sample/DeploymentIntegrationTests.java b/spring-boot-tests/spring-boot-deployment-tests/src/intTest/java/sample/DeploymentIntegrationTests.java
@@ -138,7 +138,7 @@ private WarDeploymentContainer(String baseImage, String deploymentLocation, int
 			super(new ImageFromDockerfile().withFileFromFile("spring-boot.war", findWarToDeploy())
 					.withDockerfileFromBuilder((builder) -> builder.from(baseImage)
 							.add("spring-boot.war", deploymentLocation + "/spring-boot.war").build()));
-			withExposedPorts(port).withStartupTimeout(Duration.ofMinutes(10));
+			withExposedPorts(port).withStartupTimeout(Duration.ofMinutes(5)).withStartupAttempts(3);
 		}
 
 		private static File findWarToDeploy() {

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ private WarDeploymentContainer(String baseImage, String deploymentLocation, int`
`138`	`138`	`super(new ImageFromDockerfile().withFileFromFile("spring-boot.war", findWarToDeploy())`
`139`	`139`	`.withDockerfileFromBuilder((builder) -> builder.from(baseImage)`
`140`	`140`	`.add("spring-boot.war", deploymentLocation + "/spring-boot.war").build()));`
`141`		`- withExposedPorts(port).withStartupTimeout(Duration.ofMinutes(10));`
	`141`	`+ withExposedPorts(port).withStartupTimeout(Duration.ofMinutes(5)).withStartupAttempts(3);`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`private static File findWarToDeploy() {`