From 8735d9e40fa7e01f94e580465fa8091dc2fec9fe Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Mon, 22 May 2023 09:24:02 -0700 Subject: [PATCH] Refresh plugin (#179) --- Jenkinsfile | 5 ++++- pom.xml | 10 +++++----- .../plugins/durabletask/FileMonitoringTask.java | 2 +- .../jenkinsci/plugins/durabletask/AlpineFixture.java | 5 +++-- .../plugins/durabletask/BourneShellScriptTest.java | 3 ++- .../plugins/durabletask/PowerShellCoreFixture.java | 2 +- .../org/jenkinsci/plugins/durabletask/SlimFixture.java | 2 +- .../plugins/durabletask/AlpineFixture/Dockerfile | 2 +- .../plugins/durabletask/CentOSFixture/Dockerfile | 4 ++-- .../durabletask/PowerShellCoreFixture/Dockerfile | 4 ++-- .../plugins/durabletask/SlimFixture/Dockerfile | 2 +- 11 files changed, 23 insertions(+), 18 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a229fa51..658e67bb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1 +1,4 @@ -buildPlugin() +buildPlugin(configurations: [ + [platform: 'linux', jdk: 17], + [platform: 'windows', jdk: 11], +]) diff --git a/pom.xml b/pom.xml index 82bd2af8..17cd8195 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.jenkins-ci.plugins plugin - 4.40 + 4.63 durable-task @@ -21,7 +21,7 @@ 999999-SNAPSHOT - 2.289.1 + 2.361.4 jenkinsci/${project.artifactId}-plugin @@ -53,7 +53,7 @@ org.jenkins-ci.test docker-fixtures - 1.11 + 166.v912b_95083ffe test @@ -66,8 +66,8 @@ io.jenkins.tools.bom - bom-2.289.x - 1289.v5c4b_1c43511b_ + bom-2.361.x + 2081.v85885a_d2e5c5 pom import diff --git a/src/main/java/org/jenkinsci/plugins/durabletask/FileMonitoringTask.java b/src/main/java/org/jenkinsci/plugins/durabletask/FileMonitoringTask.java index f8def72a..cf463ccf 100644 --- a/src/main/java/org/jenkinsci/plugins/durabletask/FileMonitoringTask.java +++ b/src/main/java/org/jenkinsci/plugins/durabletask/FileMonitoringTask.java @@ -218,7 +218,7 @@ protected static FilePath requestBinary(FilePath ws, FileMonitoringController c) * Returns path of binary on agent. Copies binary to agent if it does not exist */ @CheckForNull - @SuppressFBWarnings(value = "RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE", justification = "TODO needs triage") + @SuppressFBWarnings(value = {"NP_LOAD_OF_KNOWN_NULL_VALUE", "RCN_REDUNDANT_NULLCHECK_OF_NULL_VALUE"}, justification = "TODO needs triage") protected static FilePath requestBinary(FilePath nodeRoot, AgentInfo agentInfo, FilePath ws, FileMonitoringController c) throws IOException, InterruptedException { FilePath binary = null; if (agentInfo.isBinaryCompatible()) { diff --git a/src/test/java/org/jenkinsci/plugins/durabletask/AlpineFixture.java b/src/test/java/org/jenkinsci/plugins/durabletask/AlpineFixture.java index 76b2d496..51282771 100644 --- a/src/test/java/org/jenkinsci/plugins/durabletask/AlpineFixture.java +++ b/src/test/java/org/jenkinsci/plugins/durabletask/AlpineFixture.java @@ -29,5 +29,6 @@ /** Analog of {@link JavaContainer} but using Alpine rather than Ubuntu. */ @DockerFixture(id = "alpine", ports = 22) -public class AlpineFixture extends DockerContainer {} - +public class AlpineFixture extends DockerContainer { + public static final String ALPINE_JAVA_LOCATION = "/opt/java/openjdk/bin/java"; +} diff --git a/src/test/java/org/jenkinsci/plugins/durabletask/BourneShellScriptTest.java b/src/test/java/org/jenkinsci/plugins/durabletask/BourneShellScriptTest.java index 5af4b8a6..fd2d99a8 100644 --- a/src/test/java/org/jenkinsci/plugins/durabletask/BourneShellScriptTest.java +++ b/src/test/java/org/jenkinsci/plugins/durabletask/BourneShellScriptTest.java @@ -162,7 +162,7 @@ private Slave prepareAgentDocker() throws Exception { case NO_INIT: return new DumbSlave("docker", "/home/jenkins/agent", - new SimpleCommandLauncher("docker run -i --rm jenkins/slave:3.29-2 java -jar /usr/share/jenkins/slave.jar")); + new SimpleCommandLauncher("docker run -i --rm jenkins/agent:latest-jdk11 java -jar /usr/share/jenkins/agent.jar")); default: throw new AssertionError(platform); } @@ -178,6 +178,7 @@ private Slave prepareDockerPlatforms() throws Exception { break; case ALPINE: container = dockerAlpine.get(); + customJavaPath = AlpineFixture.ALPINE_JAVA_LOCATION; break; case CENTOS: container = dockerCentOS.get(); diff --git a/src/test/java/org/jenkinsci/plugins/durabletask/PowerShellCoreFixture.java b/src/test/java/org/jenkinsci/plugins/durabletask/PowerShellCoreFixture.java index 188f4782..d3a5506b 100644 --- a/src/test/java/org/jenkinsci/plugins/durabletask/PowerShellCoreFixture.java +++ b/src/test/java/org/jenkinsci/plugins/durabletask/PowerShellCoreFixture.java @@ -5,5 +5,5 @@ @DockerFixture(id = "pwsh", ports = 22) public class PowerShellCoreFixture extends DockerContainer { - public static final String PWSH_JAVA_LOCATION = "/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java"; + public static final String PWSH_JAVA_LOCATION = "/usr/lib/jvm/java-11-openjdk-amd64/bin/java"; } diff --git a/src/test/java/org/jenkinsci/plugins/durabletask/SlimFixture.java b/src/test/java/org/jenkinsci/plugins/durabletask/SlimFixture.java index 805078d5..64db564e 100644 --- a/src/test/java/org/jenkinsci/plugins/durabletask/SlimFixture.java +++ b/src/test/java/org/jenkinsci/plugins/durabletask/SlimFixture.java @@ -31,6 +31,6 @@ @DockerFixture(id = "slim", ports = 22) public class SlimFixture extends DockerContainer { - public static final String SLIM_JAVA_LOCATION = "/usr/local/openjdk-8/bin/java"; + public static final String SLIM_JAVA_LOCATION = "/usr/local/openjdk-11/bin/java"; } diff --git a/src/test/resources/org/jenkinsci/plugins/durabletask/AlpineFixture/Dockerfile b/src/test/resources/org/jenkinsci/plugins/durabletask/AlpineFixture/Dockerfile index 1304db3f..5e6d1630 100644 --- a/src/test/resources/org/jenkinsci/plugins/durabletask/AlpineFixture/Dockerfile +++ b/src/test/resources/org/jenkinsci/plugins/durabletask/AlpineFixture/Dockerfile @@ -1,4 +1,4 @@ -FROM jenkinsci/slave:3.19-1-alpine +FROM jenkins/agent:alpine-jdk11 USER root RUN apk add --update --no-cache openssh RUN ssh-keygen -A diff --git a/src/test/resources/org/jenkinsci/plugins/durabletask/CentOSFixture/Dockerfile b/src/test/resources/org/jenkinsci/plugins/durabletask/CentOSFixture/Dockerfile index d6fae56b..06bf2924 100644 --- a/src/test/resources/org/jenkinsci/plugins/durabletask/CentOSFixture/Dockerfile +++ b/src/test/resources/org/jenkinsci/plugins/durabletask/CentOSFixture/Dockerfile @@ -1,7 +1,7 @@ -FROM centos:7.4.1708 +FROM centos:7.9.2009 RUN yum -y install \ openssh-server \ - java-1.8.0-openjdk-headless \ + java-11-openjdk-headless \ && yum clean all RUN ssh-keygen -A RUN useradd test -d /home/test && \ diff --git a/src/test/resources/org/jenkinsci/plugins/durabletask/PowerShellCoreFixture/Dockerfile b/src/test/resources/org/jenkinsci/plugins/durabletask/PowerShellCoreFixture/Dockerfile index d4dd6ffb..9c96e49d 100644 --- a/src/test/resources/org/jenkinsci/plugins/durabletask/PowerShellCoreFixture/Dockerfile +++ b/src/test/resources/org/jenkinsci/plugins/durabletask/PowerShellCoreFixture/Dockerfile @@ -1,8 +1,8 @@ -FROM mcr.microsoft.com/powershell:ubuntu-bionic +FROM mcr.microsoft.com/powershell:ubuntu-jammy RUN apt-get update -y && \ apt-get install -y \ openssh-server \ - openjdk-8-jre-headless \ + openjdk-11-jre-headless \ locales # openssh installs procps, and thus /bin/ps, as a dependency, so to reproduce JENKINS-52881 we need to delete it: RUN dpkg --force-depends -r procps diff --git a/src/test/resources/org/jenkinsci/plugins/durabletask/SlimFixture/Dockerfile b/src/test/resources/org/jenkinsci/plugins/durabletask/SlimFixture/Dockerfile index d16eeb37..08ebd8c3 100644 --- a/src/test/resources/org/jenkinsci/plugins/durabletask/SlimFixture/Dockerfile +++ b/src/test/resources/org/jenkinsci/plugins/durabletask/SlimFixture/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:8-jre-slim +FROM openjdk:11-jre-slim RUN apt-get update -y && \ apt-get install -y \ openssh-server \