Remove -testJavaArgs (#438)

jenkinsci · Feb 6, 2023 · 117c93a · 117c93a
1 parent 78e92af
commit 117c93a
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 42 deletions.
diff --git a/README.md b/README.md
@@ -132,8 +132,6 @@ For example, such mode can be used to run tests with JDK11 starting from Jenkins
 Two options can be passed to PCT CLI for such purpose:
 
 * `testJDKHome` - A path to JDK HOME to be used for running tests in plugins
-* `testJavaArgs` - Java test arguments to be used for test runs.
-                   This option may be used to pass custom classpath and, in Java 11, additional modules
 
 You can run the example by running the following command:
 

diff --git a/src/main/docker/run-pct.sh b/src/main/docker/run-pct.sh
@@ -163,7 +163,6 @@ if [[ "${TEST_JDK_HOME}" == "/opt/java/openjdk" ]] && [[ -n "${JDK_VERSION}" ]]
   export JAVA_HOME="${TEST_JDK_HOME}"
   export PATH="${JAVA_HOME}/bin:${PATH}"
 fi
-TEST_JAVA_ARGS="'${TEST_JAVA_ARGS:-} -Xmx768M -Djava.awt.headless=true -Djdk.net.URLClassPath.disableClassPathURLCheck=true'"
 
 pctExitCode=0
 echo java ${JAVA_OPTS} ${extra_java_opts[@]} \
@@ -175,7 +174,6 @@ echo java ${JAVA_OPTS} ${extra_java_opts[@]} \
   -includePlugins "${ARTIFACT_ID}" \
   -m2SettingsFile "${MVN_SETTINGS_FILE}" \
   -testJDKHome "${TEST_JDK_HOME}" \
-  -testJavaArgs ${TEST_JAVA_ARGS:-} \
   "$@" \
   "|| echo \$? > /pct/tmp/pct_exit_code" > /pct/tmp/pct_command
 chmod +x /pct/tmp/pct_command

diff --git a/src/main/java/org/jenkins/tools/test/CliOptions.java b/src/main/java/org/jenkins/tools/test/CliOptions.java
@@ -56,12 +56,6 @@ public class CliOptions {
             description = "A path to JDK HOME to be used for running tests in plugins.")
     private File testJDKHome;
 
-    @CheckForNull
-    @Parameter(
-            names = "-testJavaArgs",
-            description = "Java test arguments to be used for test runs.")
-    private String testJavaArgs;
-
     @Parameter(
             names = "-workDirectory",
             required = true,
@@ -251,11 +245,6 @@ public File getTestJDKHome() {
         return testJDKHome;
     }
 
-    @CheckForNull
-    public String getTestJavaArgs() {
-        return testJavaArgs;
-    }
-
     public boolean isFailOnError() {
         return failOnError;
     }

diff --git a/src/main/java/org/jenkins/tools/test/PluginCompatTesterCli.java b/src/main/java/org/jenkins/tools/test/PluginCompatTesterCli.java
@@ -121,9 +121,6 @@ public static void main(String[] args) throws IOException {
         if (options.getTestJDKHome() != null) {
             config.setTestJDKHome(options.getTestJDKHome());
         }
-        if (options.getTestJavaArgs() != null && !options.getTestJavaArgs().isEmpty()) {
-            config.setTestJavaArgs(options.getTestJavaArgs());
-        }
         if (options.getFallbackGitHubOrganization() != null) {
             config.setFallbackGitHubOrganization(options.getFallbackGitHubOrganization());
         }

diff --git a/src/main/java/org/jenkins/tools/test/model/PluginCompatTesterConfig.java b/src/main/java/org/jenkins/tools/test/model/PluginCompatTesterConfig.java
@@ -68,8 +68,6 @@ public class PluginCompatTesterConfig {
     /** A Java HOME to be used for running tests in plugins. */
     @CheckForNull private File testJDKHome;
 
-    @CheckForNull private String testJavaArgs;
-
     @CheckForNull private File externalMaven;
 
     // List of plugin artifact ids on which tests will be performed
@@ -176,11 +174,6 @@ public File getTestJDKHome() {
         return testJDKHome;
     }
 
-    @CheckForNull
-    public String getTestJavaArgs() {
-        return testJavaArgs;
-    }
-
     public List<String> getExcludePlugins() {
         return excludePlugins;
     }
@@ -286,19 +279,6 @@ public Map<String, String> retrieveMavenProperties() throws IOException {
             res.put("jvm", javaCmdAbsolutePath);
         }
 
-        // Merge test Java args if needed
-        if (testJavaArgs != null && !testJavaArgs.isBlank()) {
-            if (res.containsKey("argLine")) {
-                LOGGER.log(
-                        Level.WARNING,
-                        "Maven properties already contain the 'argLine' argument; "
-                                + "merging value from properties and from the command line");
-                res.put("argLine", res.get("argLine") + " " + testJavaArgs);
-            } else {
-                res.put("argLine", testJavaArgs);
-            }
-        }
-
         return res;
     }
 
@@ -421,10 +401,6 @@ public void setTestJDKHome(@CheckForNull File testJDKHome) {
         this.testJDKHome = testJDKHome;
     }
 
-    public void setTestJavaArgs(@CheckForNull String testJavaArgs) {
-        this.testJavaArgs = testJavaArgs;
-    }
-
     public File getLocalCheckoutDir() {
         return localCheckoutDir;
     }