stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8227642: [TESTBUG] Make docker tests podman compatible

Browse Source 
Reviewed-by: mseledtsov, iignatyev
This commit is contained in:
Severin Gehwolf 2019-07-12 19:37:25 +02:00
parent d5ceec68b4
commit 422e04e98f
4 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/jtreg-ext/requires/VMProps.java
View File

@ -455,7 +455,7 @@ public class VMProps implements Callable<Map<String, String>> {
}
private boolean checkDockerSupport() throws IOException, InterruptedException {
ProcessBuilder pb = new ProcessBuilder("docker", "ps");
ProcessBuilder pb = new ProcessBuilder(Platform.DOCKER_COMMAND, "ps");
Process p = pb.start();
p.waitFor(10, TimeUnit.SECONDS);

6
test/lib/jdk/test/lib/Platform.java
View File

@ -33,6 +33,12 @@ import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
public class Platform {
// Use this property to specify docker location on your system.
// E.g.: "/usr/local/bin/docker". We define this constant here so
// that it can be used in VMProps as well which checks docker support
// via this command
public static final String DOCKER_COMMAND =
System.getProperty("jdk.test.docker.command", "docker");
public static final String vmName = privilegedGetProperty("java.vm.name");
public static final String vmInfo = privilegedGetProperty("java.vm.info");
private static final String osVersion = privilegedGetProperty("os.version");

10
test/lib/jdk/test/lib/containers/cgroup/MetricsTester.java
View File

@ -550,16 +550,20 @@ public class MetricsTester {
long newUsage = metrics.getCpuUsage();
long[] newPerCpu = metrics.getPerCpuUsage();
if (newSysVal <= startSysVal) {
// system/user CPU usage counters may be slowly increasing.
// allow for equal values for a pass
if (newSysVal < startSysVal) {
fail(SubSystem.CPU, "getCpuSystemUsage", newSysVal, startSysVal);
}
if (newUserVal <= startUserVal) {
// system/user CPU usage counters may be slowly increasing.
// allow for equal values for a pass
if (newUserVal < startUserVal) {
fail(SubSystem.CPU, "getCpuUserUsage", newUserVal, startUserVal);
}
if (newUsage <= startUsage) {
fail(SubSystem.CPU, "getCpuUserUsage", newUsage, startUsage);
fail(SubSystem.CPU, "getCpuUsage", newUsage, startUsage);
}
boolean success = false;

17
test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java
View File

@ -37,6 +37,7 @@ import java.util.Arrays;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import jdk.test.lib.Platform;
import jdk.test.lib.Utils;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
@ -54,11 +55,6 @@ public class DockerTestUtils {
// diagnostic information.
private static final int MAX_LINES_TO_COPY_FOR_CHILD_STDOUT = 100;
// Use this property to specify docker location on your system.
// E.g.: "/usr/local/bin/docker".
private static final String DOCKER_COMMAND =
System.getProperty("jdk.test.docker.command", "docker");
// Set this property to true to retain image after test. By default
// images are removed after test execution completes.
// Retaining the image can be useful for diagnostics and image inspection.
@ -116,7 +112,7 @@ public class DockerTestUtils {
*/
private static boolean isDockerEngineAvailableCheck() throws Exception {
try {
execute(DOCKER_COMMAND, "ps")
execute(Platform.DOCKER_COMMAND, "ps")
.shouldHaveExitValue(0)
.shouldContain("CONTAINER")
.shouldContain("IMAGE");
@ -179,9 +175,8 @@ public class DockerTestUtils {
DockerfileConfig.getBaseImageVersion());
try {
// Build the docker
execute(DOCKER_COMMAND, "build", "--no-cache", "--tag", imageName, buildDir.toString())
.shouldHaveExitValue(0)
.shouldContain("Successfully built");
execute(Platform.DOCKER_COMMAND, "build", "--no-cache", "--tag", imageName, buildDir.toString())
.shouldHaveExitValue(0);
} catch (Exception e) {
// If docker image building fails there is a good chance it happens due to environment and/or
// configuration other than product failure. Throw jtreg skipped exception in such case
@ -202,7 +197,7 @@ public class DockerTestUtils {
public static List<String> buildJavaCommand(DockerRunOptions opts) throws Exception {
List<String> cmd = new ArrayList<>();
cmd.add(DOCKER_COMMAND);
cmd.add(Platform.DOCKER_COMMAND);
cmd.add("run");
if (opts.tty)
cmd.add("--tty=true");
@ -244,7 +239,7 @@ public class DockerTestUtils {
* @throws Exception
*/
public static void removeDockerImage(String imageNameAndTag) throws Exception {
execute(DOCKER_COMMAND, "rmi", "--force", imageNameAndTag);
execute(Platform.DOCKER_COMMAND, "rmi", "--force", imageNameAndTag);
}