From f229e8f165523c8945f33af170dc69c8b4e11a25 Mon Sep 17 00:00:00 2001 From: Carlos Sanchez Date: Thu, 9 Aug 2018 10:25:23 +0200 Subject: [PATCH] Upgrade jenkins to 2.121.2 --- pom.xml | 2 +- .../csanchez/jenkins/plugins/kubernetes/KubernetesCloud.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 738bba845d..0632c91c49 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ minikube ip | sed -e 's/\([0-9]*\.[0-9]*\.[0-9]*\).*/\1.1/' --> 8 - 2.107.3 + 2.121.2 false diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud.java index 6fbb36c1ca..4e575cb098 100644 --- a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud.java +++ b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud.java @@ -290,12 +290,11 @@ public boolean isCapOnlyOnAlivePods() { @Nonnull public String getJenkinsUrlOrDie() { JenkinsLocationConfiguration locationConfiguration = JenkinsLocationConfiguration.get(); - String locationConfigurationUrl = locationConfiguration != null ? locationConfiguration.getUrl() : null; String url = StringUtils.defaultIfBlank( getJenkinsUrl(), StringUtils.defaultIfBlank( System.getProperty("KUBERNETES_JENKINS_URL",System.getenv("KUBERNETES_JENKINS_URL")), - locationConfigurationUrl + locationConfiguration.getUrl() ) ); if (url == null) {