Test on Java 17 (#583)

jenkinsci · Jul 31, 2023 · 60c18fd · 60c18fd
1 parent 7c85c04
commit 60c18fd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 43 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -5,6 +5,6 @@ buildPlugin(
     // Container agents start faster and are easier to administer
     useContainerAgent: true,
     configurations: [
-        [ platform: "linux", jdk: "11" ],
-        [ platform: "windows", jdk: "11" ]
+        [platform: 'linux', jdk: 17],
+        [platform: 'windows', jdk: 11],
     ])
diff --git a/plugin-management-cli/src/test/java/io/jenkins/tools/pluginmanager/cli/CliOptionsTest.java b/plugin-management-cli/src/test/java/io/jenkins/tools/pluginmanager/cli/CliOptionsTest.java
@@ -23,7 +23,6 @@
 
 import static com.github.stefanbirkner.systemlambda.SystemLambda.tapSystemErrNormalized;
 import static com.github.stefanbirkner.systemlambda.SystemLambda.tapSystemOutNormalized;
-import static com.github.stefanbirkner.systemlambda.SystemLambda.withEnvironmentVariable;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Arrays.asList;
 import static org.apache.commons.io.IOUtils.toInputStream;
@@ -71,12 +70,7 @@ public void createParser() {
     public void setupDefaultsTest() throws Exception {
         parser.parseArgument();
 
-        Config cfg = withEnvironmentVariable("JENKINS_UC", "")
-            .and("JENKINS_UC_EXPERIMENTAL", "")
-            .and("JENKINS_INCREMENTALS_REPO_MIRROR", "")
-            .and("JENKINS_PLUGIN_INFO", "")
-            .and("JENKINS_UC_HASH_FUNCTION", "")
-            .execute(options::setup);
+        Config cfg = options.setup();
 
         assertThat(cfg.getPluginDir()).hasToString(Settings.DEFAULT_PLUGIN_DIR_LOCATION);
         assertThat(cfg.getJenkinsWar()).isEqualTo(Settings.DEFAULT_WAR);
@@ -215,38 +209,14 @@ public void setupUpdateCenterCliTest() throws Exception {
                 "--jenkins-incrementals-repo-mirror", incrementalsCli,
                 "--jenkins-plugin-info", pluginInfoCli);
 
-        Config cfg = withEnvironmentVariable("JENKINS_UC", ucEnvVar)
-            .and("JENKINS_UC_EXPERIMENTAL", experimentalUcEnvVar)
-            .and("JENKINS_INCREMENTALS_REPO_MIRROR", incrementalsEnvVar)
-            .and("JENKINS_PLUGIN_INFO", pluginInfoEnvVar)
-            .execute(options::setup);
+        Config cfg = options.setup();
 
-        // Cli options should override environment variables
         assertThat(cfg.getJenkinsUc()).hasToString(ucCli + "/update-center.json");
         assertThat(cfg.getJenkinsUcExperimental()).hasToString(experiementalCli + "/update-center.json");
         assertThat(cfg.getJenkinsIncrementalsRepoMirror()).hasToString(incrementalsCli);
         assertThat(cfg.getJenkinsPluginInfo()).hasToString(pluginInfoCli);
     }
 
-    @Test
-    public void setupUpdateCenterEnvVarTest() throws Exception {
-        String ucEnvVar = "https://updates.jenkins.io/env";
-        String experimentalUcEnvVar = "https://updates.jenkins.io/experimental/env";
-        String incrementalsEnvVar = "https://repo.jenkins-ci.org/incrementals/env";
-        String pluginInfoEnvVar = "https://updates.jenkins.io/current/plugin-versions/env";
-
-        Config cfg = withEnvironmentVariable("JENKINS_UC", ucEnvVar)
-            .and("JENKINS_UC_EXPERIMENTAL", experimentalUcEnvVar)
-            .and("JENKINS_INCREMENTALS_REPO_MIRROR", incrementalsEnvVar)
-            .and("JENKINS_PLUGIN_INFO", pluginInfoEnvVar)
-            .execute(options::setup);
-
-        assertThat(cfg.getJenkinsUc()).hasToString(ucEnvVar + "/update-center.json");
-        assertThat(cfg.getJenkinsUcExperimental()).hasToString(experimentalUcEnvVar + "/update-center.json");
-        assertThat(cfg.getJenkinsIncrementalsRepoMirror()).hasToString(incrementalsEnvVar);
-        assertThat(cfg.getJenkinsPluginInfo()).hasToString(pluginInfoEnvVar);
-    }
-
     @Test
     public void setupSecurityWarningsTest() throws CmdLineException {
         parser.parseArgument("--view-all-security-warnings", "--view-security-warnings");

diff --git a/...nagement-library/src/test/java/io/jenkins/tools/pluginmanager/impl/PluginManagerTest.java b/...nagement-library/src/test/java/io/jenkins/tools/pluginmanager/impl/PluginManagerTest.java
@@ -21,9 +21,9 @@
 import org.json.JSONObject;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.contrib.java.lang.system.EnvironmentVariables;
 import org.junit.rules.TemporaryFolder;
 
 import static com.github.stefanbirkner.systemlambda.SystemLambda.tapSystemErrNormalized;
@@ -57,9 +57,6 @@ public class PluginManagerTest {
     @Rule
     public final TemporaryFolder folder = new TemporaryFolder();
 
-    @Rule
-    public final EnvironmentVariables environmentVariables = new EnvironmentVariables();
-
     @Before
     public void setUp() throws IOException {
         cfg = Config.builder()
@@ -1291,10 +1288,6 @@ public void getPluginDownloadUrlTest() {
         String otherURL = dirName(cfg.getJenkinsUc().toString()) +
                 "download/plugins/pluginName/otherversion/pluginName.hpi";
         assertThat(pm.getPluginDownloadUrl(pluginOtherVersion)).isEqualTo(otherURL);
-
-        environmentVariables.set("JENKINS_UC_DOWNLOAD_URL", "https://server.com/jenkins-plugins");
-        assertThat(pm.getPluginDownloadUrl(pluginOtherVersion))
-                .isEqualTo("https://server.com/jenkins-plugins/pluginName/otherversion/pluginName.hpi");
     }
 
     @Test
@@ -1317,6 +1310,7 @@ public void getDownloadPluginUrlTestComplexUpdateCenterUrl() throws IOException
     /**
      * Test configuring custom update center mirror configuration (i.e. Artifactory).
      */
+    @Ignore("setting environment variables is not supported in Java 17")
     @Test
     public void getDownloadPluginUrlCustomUcUrls() throws IOException {
         Config config = Config.builder()
@@ -1328,7 +1322,7 @@ public void getDownloadPluginUrlCustomUcUrls() throws IOException {
                 .withJenkinsPluginInfo(new URL("https://private-mirror.com/jenkins-updated-center/current/plugin-versions.json"))
                 .build();
 
-        environmentVariables.set("JENKINS_UC_DOWNLOAD_URL", "https://private-mirror.com/jenkins-updated-center/download/plugins");
+        //environmentVariables.set("JENKINS_UC_DOWNLOAD_URL", "https://private-mirror.com/jenkins-updated-center/download/plugins");
 
         PluginManager pluginManager = new PluginManager(config);