fix: update Agent tests (#540)

jenkinsci · Dec 20, 2024 · e04c942 · e04c942
1 parent fcdcfa4
commit e04c942
Show file tree

Hide file tree

Showing 39 changed files with 134 additions and 180 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -7,4 +7,8 @@ updates:
   - package-ecosystem: "github-actions"
     directory: /
     schedule:
-      interval: "daily"
+      interval: "daily"
+  - package-ecosystem: "docker"
+    directory: /src/test/resources/hudson/plugins/sshslaves/agents
+    schedule:
+      interval: "daily"
diff --git a/.github/workflows/ssh-agent-docker.yml b/.github/workflows/ssh-agent-docker.yml
@@ -0,0 +1,64 @@
+---
+# Workdlow to build the SSH Agent Docker base image used on tests
+name: ssh-agent-docker
+on:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  docker-image:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+      attestations: write
+      id-token: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: ${{ github.ref }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ghcr.io/${{ github.repository }}
+          tags: |
+            type=raw,prefix=base,value=latest,enable={{is_default_branch}}
+            type=ref,prefix=base,event=branch
+            type=ref,prefix=base,vent=pr
+            type=sha,prefix=base
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        id: build
+        with:
+          context: src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-base
+          platforms: linux/amd64,linux/arm64
+          push: true
+          sbom: true
+          provenance: mode=max
+          labels: ${{ steps.meta.outputs.labels }}
+          tags: ${{ steps.meta.outputs.tags }}
+
+      - name: Write Summary
+        run: |
+          DOCKER_IMAGE="$(printenv DOCKER_METADATA_OUTPUT_JSON|jq -r '.tags[0]')"
+          echo "docker pull ${DOCKER_IMAGE}" >> "${GITHUB_STEP_SUMMARY}"
diff --git a/src/test/java/hudson/plugins/sshslaves/agents/AgentUbuntu1804RSAConnectionTest.java b/src/test/java/hudson/plugins/sshslaves/agents/AgentUbuntu1804RSAConnectionTest.java
diff --git a/...nts/AgentUbuntu2004RSAConnectionTest.java → ...gents/AgentUbuntu20RSAConnectionTest.java b/...nts/AgentUbuntu2004RSAConnectionTest.java → ...gents/AgentUbuntu20RSAConnectionTest.java
@@ -21,8 +21,8 @@
  */
 @Ignore("Only for manual test.")
 @Category({ AgentSSHTest.class, SSHKeyAuthenticationTest.class})
-public class AgentUbuntu2004RSAConnectionTest extends AgentConnectionBase {
-  public static final String SSH_AGENT_NAME = "ssh-agent-ubuntu-20.04";
+public class AgentUbuntu20RSAConnectionTest extends AgentConnectionBase {
+  public static final String SSH_AGENT_NAME = "ssh-agent-ubuntu-20";
   public static final String SSH_KEY_PATH = "ssh/rsa-key";
   public static final String SSH_KEY_PUB_PATH = "ssh/rsa-key.pub";
 

diff --git a/...nts/AgentUbuntu1404RSAConnectionTest.java → ...gents/AgentUbuntu22RSAConnectionTest.java b/...nts/AgentUbuntu1404RSAConnectionTest.java → ...gents/AgentUbuntu22RSAConnectionTest.java
@@ -1,17 +1,18 @@
 package hudson.plugins.sshslaves.agents;
 
 import java.io.IOException;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.images.builder.ImageFromDockerfile;
+
 import hudson.model.Descriptor;
 import hudson.model.Node;
 import hudson.plugins.sshslaves.categories.AgentSSHTest;
 import hudson.plugins.sshslaves.categories.SSHKeyAuthenticationTest;
 import static org.junit.Assert.assertTrue;
-import org.junit.Ignore;
 
 /**
  * Connect to a remote SSH Agent
@@ -20,8 +21,8 @@
  */
 @Ignore("Only for manual test.")
 @Category({ AgentSSHTest.class, SSHKeyAuthenticationTest.class})
-public class AgentUbuntu1404RSAConnectionTest extends AgentConnectionBase {
-  public static final String SSH_AGENT_NAME = "ssh-agent-ubuntu-14.04";
+public class AgentUbuntu22RSAConnectionTest extends AgentConnectionBase {
+  public static final String SSH_AGENT_NAME = "ssh-agent-ubuntu-22";
   public static final String SSH_KEY_PATH = "ssh/rsa-key";
   public static final String SSH_KEY_PUB_PATH = "ssh/rsa-key.pub";
 

diff --git a/...nts/AgentUbuntu1604RSAConnectionTest.java → ...gents/AgentUbuntu24RSAConnectionTest.java b/...nts/AgentUbuntu1604RSAConnectionTest.java → ...gents/AgentUbuntu24RSAConnectionTest.java
@@ -1,17 +1,18 @@
 package hudson.plugins.sshslaves.agents;
 
 import java.io.IOException;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.images.builder.ImageFromDockerfile;
+
 import hudson.model.Descriptor;
 import hudson.model.Node;
 import hudson.plugins.sshslaves.categories.AgentSSHTest;
 import hudson.plugins.sshslaves.categories.SSHKeyAuthenticationTest;
 import static org.junit.Assert.assertTrue;
-import org.junit.Ignore;
 
 /**
  * Connect to a remote SSH Agent
@@ -20,8 +21,8 @@
  */
 @Ignore("Only for manual test.")
 @Category({ AgentSSHTest.class, SSHKeyAuthenticationTest.class})
-public class AgentUbuntu1604RSAConnectionTest extends AgentConnectionBase {
-  public static final String SSH_AGENT_NAME = "ssh-agent-ubuntu-16.04";
+public class AgentUbuntu24RSAConnectionTest extends AgentConnectionBase {
+  public static final String SSH_AGENT_NAME = "ssh-agent-ubuntu-24";
   public static final String SSH_KEY_PATH = "ssh/rsa-key";
   public static final String SSH_KEY_PUB_PATH = "ssh/rsa-key.pub";
 

diff --git a/.../agents/ssh-agent-ubuntu-18.04/Dockerfile → ...shslaves/agents/ssh-agent-base/Dockerfile b/.../agents/ssh-agent-ubuntu-18.04/Dockerfile → ...shslaves/agents/ssh-agent-base/Dockerfile
@@ -1,40 +1,30 @@
-FROM ubuntu:18.04
+FROM ubuntu:24.04
 USER root
 
 ENV TZ=Etc/UTC
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+RUN add-apt-repository ppa:openjdk-r/ppa -y
 RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
-  &&  apt-get install -y -qq \
+  && DEBIAN_FRONTEND="noninteractive" apt-get install -y -qq \
     --no-install-recommends \
     openssh-server \
     software-properties-common \
     git \
-    make
-
-RUN add-apt-repository ppa:openjdk-r/ppa -y \
-  && apt-get update -y -qq \
-  && apt-get install -y -qq \
+    make \
     openjdk-17-jdk \
   && rm -rf /var/lib/apt/lists/*
 
-RUN useradd --password password --shell /bin/bash --uid 1000 jenkins \
+RUN useradd --password password --shell /bin/bash jenkins \
   && mkdir /home/jenkins \
   && chown -R jenkins:jenkins /home/jenkins
 
-COPY ssh /home/jenkins/.ssh
-RUN chown -R jenkins:jenkins /home/jenkins/ \
-  && chmod 700 /home/jenkins/.ssh \
-  && chmod 600 /home/jenkins/.ssh/*
-COPY ssh /root/.ssh
-RUN chown -R root:root /root/ \
-  && chmod 700 /root/.ssh \
-  && chmod 600 /root/.ssh/*
-RUN ssh-keygen -A
-COPY ssh/sshd_config /etc/ssh/sshd_config
 RUN mkdir -p  /var/run/sshd
 
 RUN echo "password\npassword" | passwd root \
   && echo "password\npassword" | passwd jenkins
 
+RUN ssh-keygen -A
+
 EXPOSE 22
 ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-17-openjdk-amd64/jre/bin:/usr/lib/jvm/java-17-openjdk-amd64/bin
 RUN echo "PATH=${PATH}" >> /etc/environment

diff --git a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-curve25519-sha256/Dockerfile b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-curve25519-sha256/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 USER root
 
 ENV TZ=Etc/UTC
@@ -17,7 +17,7 @@ RUN add-apt-repository ppa:openjdk-r/ppa -y \
     openjdk-17-jdk \
   && rm -rf /var/lib/apt/lists/*
 
-RUN useradd --password password --shell /bin/bash --uid 1000 jenkins \
+RUN useradd --password password --shell /bin/bash jenkins \
   && mkdir /home/jenkins \
   && chown -R jenkins:jenkins /home/jenkins
 

diff --git a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-dsa/Dockerfile b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-dsa/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 USER root
 
 ENV TZ=Etc/UTC
@@ -17,7 +17,7 @@ RUN add-apt-repository ppa:openjdk-r/ppa -y \
     openjdk-17-jdk \
   && rm -rf /var/lib/apt/lists/*
 
-RUN useradd --password password --shell /bin/bash --uid 1000 jenkins \
+RUN useradd --password password --shell /bin/bash jenkins \
   && mkdir /home/jenkins \
   && chown -R jenkins:jenkins /home/jenkins
 

diff --git a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ec/Dockerfile b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ec/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 USER root
 
 ENV TZ=Etc/UTC
@@ -17,7 +17,7 @@ RUN add-apt-repository ppa:openjdk-r/ppa -y \
     openjdk-17-jdk \
   && rm -rf /var/lib/apt/lists/*
 
-RUN useradd --password password --shell /bin/bash --uid 1000 jenkins \
+RUN useradd --password password --shell /bin/bash jenkins \
   && mkdir /home/jenkins \
   && chown -R jenkins:jenkins /home/jenkins
 

diff --git a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ecdh-sha2-nistp256/Dockerfile b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ecdh-sha2-nistp256/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 USER root
 
 ENV TZ=Etc/UTC
@@ -17,7 +17,7 @@ RUN add-apt-repository ppa:openjdk-r/ppa -y \
     openjdk-17-jdk \
   && rm -rf /var/lib/apt/lists/*
 
-RUN useradd --password password --shell /bin/bash --uid 1000 jenkins \
+RUN useradd --password password --shell /bin/bash jenkins \
   && mkdir /home/jenkins \
   && chown -R jenkins:jenkins /home/jenkins
 

diff --git a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ecdh-sha2-nistp384/Dockerfile b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ecdh-sha2-nistp384/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 USER root
 
 ENV TZ=Etc/UTC
@@ -17,7 +17,7 @@ RUN add-apt-repository ppa:openjdk-r/ppa -y \
     openjdk-17-jdk \
   && rm -rf /var/lib/apt/lists/*
 
-RUN useradd --password password --shell /bin/bash --uid 1000 jenkins \
+RUN useradd --password password --shell /bin/bash jenkins \
   && mkdir /home/jenkins \
   && chown -R jenkins:jenkins /home/jenkins
 

diff --git a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ecdh-sha2-nistp521/Dockerfile b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ecdh-sha2-nistp521/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 USER root
 
 ENV TZ=Etc/UTC
@@ -17,7 +17,7 @@ RUN add-apt-repository ppa:openjdk-r/ppa -y \
     openjdk-17-jdk \
   && rm -rf /var/lib/apt/lists/*
 
-RUN useradd --password password --shell /bin/bash --uid 1000 jenkins \
+RUN useradd --password password --shell /bin/bash jenkins \
   && mkdir /home/jenkins \
   && chown -R jenkins:jenkins /home/jenkins
 

diff --git a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ed25519/Dockerfile b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ed25519/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 USER root
 
 ENV TZ=Etc/UTC
@@ -17,7 +17,7 @@ RUN add-apt-repository ppa:openjdk-r/ppa -y \
     openjdk-17-jdk \
   && rm -rf /var/lib/apt/lists/*
 
-RUN useradd --password password --shell /bin/bash --uid 1000 jenkins \
+RUN useradd --password password --shell /bin/bash jenkins \
   && mkdir /home/jenkins \
   && chown -R jenkins:jenkins /home/jenkins
 

diff --git a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-host-ec/Dockerfile b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-host-ec/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 USER root
 
 ENV TZ=Etc/UTC
@@ -17,7 +17,7 @@ RUN add-apt-repository ppa:openjdk-r/ppa -y \
     openjdk-17-jdk \
   && rm -rf /var/lib/apt/lists/*
 
-RUN useradd --password password --shell /bin/bash --uid 1000 jenkins \
+RUN useradd --password password --shell /bin/bash jenkins \
   && mkdir /home/jenkins \
   && chown -R jenkins:jenkins /home/jenkins
 
@@ -43,4 +43,4 @@ RUN echo "PATH=${PATH}" >> /etc/environment
 ENTRYPOINT []
 CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]
 
-RUN rm /etc/ssh/ssh_host_dsa* /etc/ssh/ssh_host_ed* /etc/ssh/ssh_host_rsa*
+RUN rm /etc/ssh/ssh_host_ed* /etc/ssh/ssh_host_rsa*
diff --git a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-host-ed/Dockerfile b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-host-ed/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 USER root
 
 ENV TZ=Etc/UTC
@@ -17,7 +17,7 @@ RUN add-apt-repository ppa:openjdk-r/ppa -y \
     openjdk-17-jdk \
   && rm -rf /var/lib/apt/lists/*
 
-RUN useradd --password password --shell /bin/bash --uid 1000 jenkins \
+RUN useradd --password password --shell /bin/bash jenkins \
   && mkdir /home/jenkins \
   && chown -R jenkins:jenkins /home/jenkins
 
@@ -43,4 +43,4 @@ RUN echo "PATH=${PATH}" >> /etc/environment
 ENTRYPOINT []
 CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]
 
-RUN rm /etc/ssh/ssh_host_dsa* /etc/ssh/ssh_host_ec* /etc/ssh/ssh_host_rsa*
+RUN rm /etc/ssh/ssh_host_ec* /etc/ssh/ssh_host_rsa*