Skip to content

The Unified and Autonomous Development Platform

Fix issue #282 - Last log without new line gets eaten on Windows node of Kubernetes executor Fix issue #281 - Add support for windows 10 2004 and 20H2 in Kubernetes executor

Robin Shen64d2cc1db5b5
diff --git a/pom.xml b/pom.xml
index 7e1244699b..86b110e261 100644
--- a/pom.xml
+++ b/pom.xml
@@ -573,8 +573,8 @@
</repository>
</repositories>
<properties>
- <commons.version>2.0.7</commons.version>
- <k8shelper.version>2.1.0</k8shelper.version>
+ <commons.version>2.0.8</commons.version>
+ <k8shelper.version>2.1.1</k8shelper.version>
<slf4j.version>1.7.5</slf4j.version>
<logback.version>1.0.11</logback.version>
<antlr.version>4.7.2</antlr.version>
diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
index fcaa58a1a2..2dda33641a 100644
--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
@@ -1376,8 +1376,10 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
logger.debug(line);
} else if (logEndMessage != null && line.contains(logEndMessage)) {
endOfLogSeenRef.set(true);
+ String lastLogMessage = StringUtils.substringBefore(line, logEndMessage);
+ if (StringUtils.substringAfter(lastLogMessage, " ").length() != 0)
+ consume(lastLogMessage);
} else if (line.startsWith("Error from server") || line.startsWith("error:")) {
- System.out.println(line);
jobLogger.log(line);
if (!abortError.get()) {
abortError.set(true);
@@ -1484,26 +1486,28 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
private static class OsInfo {
- private static final Map<String, Integer> WINDOWS_VERSIONS = new LinkedHashMap<>();
+ private static final Map<Integer, String> WINDOWS_VERSIONS = new LinkedHashMap<>();
static {
// update this according to
// https://docs.microsoft.com/en-us/virtualization/windowscontainers/deploy-containers/version-compatibility
- WINDOWS_VERSIONS.put(".18363.", 1909);
- WINDOWS_VERSIONS.put(".18362.", 1903);
- WINDOWS_VERSIONS.put(".17763.", 1809);
- WINDOWS_VERSIONS.put(".17134.", 1803);
- WINDOWS_VERSIONS.put(".16299.", 1709);
- WINDOWS_VERSIONS.put(".14393.", 1607);
+ WINDOWS_VERSIONS.put(14393, "1607");
+ WINDOWS_VERSIONS.put(16299, "1709");
+ WINDOWS_VERSIONS.put(17134, "1803");
+ WINDOWS_VERSIONS.put(17763, "1809");
+ WINDOWS_VERSIONS.put(18362, "1903");
+ WINDOWS_VERSIONS.put(18363, "1909");
+ WINDOWS_VERSIONS.put(19041, "2004");
+ WINDOWS_VERSIONS.put(19042, "20H2");
}
private final String osName;
- private final String kernelVersion;
+ private final String osVersion;
- public OsInfo(String osName, String kernelVersion) {
+ public OsInfo(String osName, String osVersion) {
this.osName = osName;
- this.kernelVersion = kernelVersion;
+ this.osVersion = osVersion;
}
public boolean isLinux() {
@@ -1514,6 +1518,12 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
return osName.equalsIgnoreCase("windows");
}
+ public int getWindowsBuildNumber() {
+ Preconditions.checkState(isWindows());
+ List<String> fields = Splitter.on(".").splitToList(osVersion);
+ return Integer.parseInt(fields.get(fields.size()-2));
+ }
+
public String getCacheHome() {
if (osName.equalsIgnoreCase("linux"))
return "/var/cache/onedev-build";
@@ -1533,7 +1543,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
for (OsInfo osInfo: osInfos) {
if (!osInfo.isWindows())
throw new ExplicitException("Windows and non-windows nodes should not be included in same executor");
- if (baseline == null || baseline.getWindowsVersion() > osInfo.getWindowsVersion())
+ if (baseline == null || baseline.getWindowsBuildNumber() > osInfo.getWindowsBuildNumber())
baseline = osInfo;
}
return baseline;
@@ -1542,20 +1552,20 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
}
- public int getWindowsVersion() {
- Preconditions.checkState(isWindows());
- for (Map.Entry<String, Integer> entry: WINDOWS_VERSIONS.entrySet()) {
- if (kernelVersion.contains(entry.getKey()))
- return entry.getValue();
- }
- throw new ExplicitException("Unsupported windows kernel version: " + kernelVersion);
+ public String getWindowsVersion() {
+ int buildNumber = getWindowsBuildNumber();
+ String windowsVersion = WINDOWS_VERSIONS.get(buildNumber);
+ if (windowsVersion != null)
+ return windowsVersion;
+ else
+ throw new ExplicitException("Unsupported windows build number: " + buildNumber);
}
public String getHelperImageSuffix() {
if (isLinux())
return "linux";
else
- return "windows-" + getWindowsVersion();
+ return "windows-" + getWindowsVersion().toLowerCase();
}
}