Skip to content

Commit

Permalink
8309138: Fix container tests for jdks with symlinked conf dir
Browse files Browse the repository at this point in the history 
Reviewed-by: sgehwolf
  • Loading branch information
@zzambers @jerboaa
zzambers authored and jerboaa committed Jun 1, 2023
1 parent e827164 commit ec55539
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java
View file
Expand Up @@ -26,6 +26,7 @@
import java.io.FileWriter;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.FileVisitOption;
import java.nio.file.FileVisitResult;
import java.nio.file.Path;
import java.nio.file.Paths;
Expand All @@ -35,6 +36,7 @@
import java.util.Arrays;
import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumSet;
import java.util.List;
import jdk.test.lib.Container;
import jdk.test.lib.Utils;
Expand Down Expand Up @@ -163,7 +165,7 @@ public static void buildJdkContainerImage(String imageName, String dockerfileCon
Path jdkSrcDir = Paths.get(JDK_UNDER_TEST);
Path jdkDstDir = buildDir.resolve("jdk");
Files.createDirectories(jdkDstDir);
Files.walkFileTree(jdkSrcDir, new CopyFileVisitor(jdkSrcDir, jdkDstDir));
Files.walkFileTree(jdkSrcDir, EnumSet.of(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE, new CopyFileVisitor(jdkSrcDir, jdkDstDir));

buildImage(imageName, buildDir);
}
Expand Down

5 comments on commit ec55539

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Issues

@zzambers
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on ec55539 Jun 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zzambers the backport was successfully created on the branch zzambers-backport-ec555395 in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit ec555395 from the openjdk/jdk repository.

The commit being backported was authored by Zdenek Zambersky on 1 Jun 2023 and was reviewed by Severin Gehwolf.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev.git zzambers-backport-ec555395:zzambers-backport-ec555395
$ git checkout zzambers-backport-ec555395
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev.git zzambers-backport-ec555395

@zzambers
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on ec55539 Jun 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zzambers the backport was successfully created on the branch zzambers-backport-ec555395 in my personal fork of openjdk/jdk11u-dev. To create a pull request with this backport targeting openjdk/jdk11u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit ec555395 from the openjdk/jdk repository.

The commit being backported was authored by Zdenek Zambersky on 1 Jun 2023 and was reviewed by Severin Gehwolf.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk11u-dev:

$ git fetch https://github.com/openjdk-bots/jdk11u-dev.git zzambers-backport-ec555395:zzambers-backport-ec555395
$ git checkout zzambers-backport-ec555395
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk11u-dev.git zzambers-backport-ec555395

Please sign in to comment.