Cleanup jvm.config selection for compatibility tests

trinodb · Oct 4, 2024 · 3c70981 · 3c70981
1 parent 25b3c46
commit 3c70981
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/...main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeCompatibility.java b/...main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeCompatibility.java
@@ -68,8 +68,8 @@ public void extendEnvironment(Environment.Builder builder, Map<String, String> e
 
     private void configureCompatibilityTestContainer(Environment.Builder builder, Config config)
     {
-        boolean java22 = config.getCompatibilityTestVersion() >= 447;
-        String jvmConfig = "conf/trino/etc/" + (java22 ? "jvm.config" : "jvm-pre-jdk22.config");
+        boolean initialJdk22 = config.getCompatibilityTestVersion() >= 447 && config.getCompatibilityTestVersion() <= 452;
+        String jvmConfig = initialJdk22 ? "conf/trino/etc/jvm.config-initial-jdk-22" : "conf/trino/etc/jvm.config";
         String dockerImage = config.getCompatibilityTestDockerImage();
         String containerConfigDir = getConfigurationDirectory(dockerImage);
         DockerContainer container = new DockerContainer(dockerImage, COMPATIBILTY_TEST_CONTAINER_NAME)

diff --git a/...ct-tests-launcher/src/main/resources/docker/trino-product-tests/conf/trino/etc/jvm.config b/...ct-tests-launcher/src/main/resources/docker/trino-product-tests/conf/trino/etc/jvm.config
@@ -17,7 +17,3 @@
 # Allow loading dynamic agent used by JOL
 -XX:+EnableDynamicAgentLoading
 -XX:+UnlockDiagnosticVMOptions
-# https://bugs.openjdk.org/browse/JDK-8329528
--XX:G1NumCollectionsKeepPinned=10000000
-# https://bugs.openjdk.org/browse/JDK-8327134
--Djava.security.manager=allow
diff --git a/...tests/conf/trino/etc/jvm-pre-jdk22.config → .../conf/trino/etc/jvm.config-initial-jdk-22 b/...tests/conf/trino/etc/jvm-pre-jdk22.config → .../conf/trino/etc/jvm.config-initial-jdk-22
@@ -17,3 +17,7 @@
 # Allow loading dynamic agent used by JOL
 -XX:+EnableDynamicAgentLoading
 -XX:+UnlockDiagnosticVMOptions
+# https://bugs.openjdk.org/browse/JDK-8329528
+-XX:G1NumCollectionsKeepPinned=10000000
+# https://bugs.openjdk.org/browse/JDK-8327134
+-Djava.security.manager=allow