Use JENKINS_UC_DOWNLOAD_URL if provided

Fixes jenkinsci#415
nhojpatrick · Mar 11, 2022 · 43fe1a4 · 43fe1a4
1 parent d16aaed
commit 43fe1a4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...n-management-library/src/main/java/io/jenkins/tools/pluginmanager/impl/PluginManager.java b/...n-management-library/src/main/java/io/jenkins/tools/pluginmanager/impl/PluginManager.java
@@ -1173,7 +1173,9 @@ public String getPluginDownloadUrl(Plugin plugin) {
 
         String jenkinsUcDownload =  System.getenv("JENKINS_UC_DOWNLOAD");
         String jenkinsUcDownloadUrl = System.getenv("JENKINS_UC_DOWNLOAD_URL");
-        if (StringUtils.isNotEmpty(pluginUrl)) {
+        if (StringUtils.isNotEmpty(jenkinsUcDownloadUrl)) {
+            urlString = appendPathOntoUrl(jenkinsUcDownloadUrl, pluginName, pluginVersion, pluginName + ".hpi");
+        } else if (StringUtils.isNotEmpty(pluginUrl)) {
             urlString = pluginUrl;
         } else if (pluginVersion.equals(Plugin.LATEST) && !StringUtils.isEmpty(jenkinsUcLatest)) {
             urlString = appendPathOntoUrl(dirName(jenkinsUcLatest), "/latest", pluginName + ".hpi");
@@ -1184,8 +1186,6 @@ public String getPluginDownloadUrl(Plugin plugin) {
             groupId = groupId.replace(".", "/");
             String incrementalsVersionPath = String.format("%s/%s/%s-%s.hpi", pluginName, pluginVersion, pluginName, pluginVersion);
             urlString = appendPathOntoUrl(cfg.getJenkinsIncrementalsRepoMirror(), groupId, incrementalsVersionPath);
-        } else if (StringUtils.isNotEmpty(jenkinsUcDownloadUrl)) {
-            urlString = appendPathOntoUrl(jenkinsUcDownloadUrl, pluginName, pluginVersion, pluginName + ".hpi");
         } else if (StringUtils.isNotEmpty(jenkinsUcDownload)) {
             urlString = appendPathOntoUrl(jenkinsUcDownload, "/plugins", pluginName, pluginVersion, pluginName + ".hpi");
         } else {