From 602d9e4b2c2ea17552f63e24caa3ddfa7d78d3b0 Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Mon, 5 Mar 2018 16:39:40 +0100
Subject: [PATCH] [TASK] bamboo: Hard kill php web server processes
bamboo acceptance test shut down sometimes fails to stop
the 'php -S' web server process for unknown reasons.
A next job on the same agent then fails to bind to the
port, leading to broken builds.
Switch from SIGTERM to SIGKILL during test shut down
to see if that improves the situation.
Resolves: #84143
Releases: master, 8.7
Change-Id: I838a2341f1f8e25fa461b8747337406391b52241
Reviewed-on: https://review.typo3.org/56013
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
---
Build/bamboo/src/main/java/core/AbstractCoreSpec.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Build/bamboo/src/main/java/core/AbstractCoreSpec.java b/Build/bamboo/src/main/java/core/AbstractCoreSpec.java
index b53a205c476a..47bcb15f820f 100644
--- a/Build/bamboo/src/main/java/core/AbstractCoreSpec.java
+++ b/Build/bamboo/src/main/java/core/AbstractCoreSpec.java
@@ -883,7 +883,7 @@ abstract public class AbstractCoreSpec {
.interpreter(ScriptTaskProperties.Interpreter.BINSH_OR_CMDEXE)
.inlineBody(
this.getScriptTaskBashInlineBody() +
- "kill `cat phpserver.pid`\n" +
+ "kill -9 `cat phpserver.pid`\n" +
"kill `cat chromedriver.pid`\n"
);
}
--
GitLab