Bump org.jenkins-ci.test:docker-fixtures from 190.vd6a_e600cb_775 to …

…200.v22a_e8766731c (#275) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
jenkinsci · May 20, 2024 · db121e3 · db121e3
1 parent 18f198b
commit db121e3
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 32 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -3,7 +3,7 @@
  https://github.com/jenkins-infra/pipeline-library/
 */
 buildPlugin(
-  useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests
+  useContainerAgent: false, // Set to `false` if you need to use Docker for containerized tests
   configurations: [
     [platform: 'linux', jdk: 21],
     [platform: 'linux', jdk: 17],

diff --git a/pom.xml b/pom.xml
@@ -133,7 +133,7 @@
         <dependency>
             <groupId>org.jenkins-ci.test</groupId>
             <artifactId>docker-fixtures</artifactId>
-            <version>190.vd6a_e600cb_775</version>
+            <version>200.v22a_e8766731c</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>

diff --git a/src/test/java/hudson/plugins/mercurial/FunctionalTest.java b/src/test/java/hudson/plugins/mercurial/FunctionalTest.java
@@ -120,25 +120,13 @@ public interface MercurialInstallationFactory {
         };
         return new Object[][] {
             {false, defaultFactory, null},
-            {true, defaultFactory, MercurialContainer.Version.HG2},
-            {true, defaultFactory, MercurialContainer.Version.HG3},
-            {true, defaultFactory, MercurialContainer.Version.HG4},
-            {true, defaultFactory, MercurialContainer.Version.HG5},
+            {true, defaultFactory, MercurialContainer.Version.HG6},
             {false, cachingFactory, null},
-            // Skip testing caching with older Hg versions since a locally installed version might be 3.x+,
-            // in which case controller sends a new version and we get abort: xfer.hg: unknown bundle version 20
-            // cf. https://hglabhq.com/blog/2014/4/29/what-s-new-in-mercurial-3-0
-            {true, cachingFactory, MercurialContainer.Version.HG3},
-            {true, cachingFactory, MercurialContainer.Version.HG4},
-            {true, cachingFactory, MercurialContainer.Version.HG5},
+            {true, cachingFactory, MercurialContainer.Version.HG6},
             {false, sharingFactory, null},
-            // Sharing implies caching, so same issue with bundle version.
-            {true, sharingFactory, MercurialContainer.Version.HG3},
-            {true, sharingFactory, MercurialContainer.Version.HG4},
-            {true, sharingFactory, MercurialContainer.Version.HG5},
+            {true, sharingFactory, MercurialContainer.Version.HG6},
             {false, debugFactory, null},
-            // Do not waste time looking at old versions for this.
-            {true, debugFactory, MercurialContainer.Version.HG5},
+            {true, debugFactory, MercurialContainer.Version.HG6},
         };
     }
 

diff --git a/src/test/java/hudson/plugins/mercurial/MercurialContainer.java b/src/test/java/hudson/plugins/mercurial/MercurialContainer.java
@@ -65,11 +65,8 @@ public Slave createSlave(JenkinsRule r) throws Exception {
     }
 
     public enum Version {
-        // Latest in https://www.mercurial-scm.org/release/ from each major line; MercurialContainer/Dockerfile must match:
-        HG2("2.9.2"),
-        HG3("3.9.2"),
-        HG4("4.9.1"),
-        HG5("5.5.2");
+        // Latest in https://www.mercurial-scm.org/; MercurialContainer/Dockerfile must match:
+        HG6("6.6.3");
         public final String exactVersion;
         Version(String exactVersion) {
             this.exactVersion = exactVersion;

diff --git a/src/test/java/hudson/plugins/mercurial/MercurialRule.java b/src/test/java/hudson/plugins/mercurial/MercurialRule.java
@@ -74,7 +74,7 @@ private HgExe hgExe(EnvVars env) throws Exception {
                 String version = hg.version();
                 Assume.assumeNotNull(version);
                 System.out.println("Mercurial version detected: " + version);
-                Assume.assumeFalse(version + " is too old to even test", new VersionNumber(version).isOlderThan(new VersionNumber(MercurialContainer.Version.HG2.exactVersion)));
+                Assume.assumeFalse(version + " is too old to even test", new VersionNumber(version).isOlderThan(new VersionNumber(MercurialContainer.Version.HG6.exactVersion)));
             } catch (IOException ioe) {
                 String message = ioe.getMessage();
                 if (message.startsWith("Cannot run program \"hg\"") && message.endsWith("No such file or directory")) {

diff --git a/src/test/java/hudson/plugins/mercurial/MercurialSCMSource2Test.java b/src/test/java/hudson/plugins/mercurial/MercurialSCMSource2Test.java
@@ -67,7 +67,7 @@ public class MercurialSCMSource2Test {
         MercurialContainer container = docker.create();
         Slave slave = container.createSlave(r);
         m.withNode(slave);
-        MercurialInstallation inst = container.createInstallation(r, MercurialContainer.Version.HG5, false, false, false, "", slave);
+        MercurialInstallation inst = container.createInstallation(r, MercurialContainer.Version.HG6, false, false, false, "", slave);
         assertNotNull(inst);
         m.withInstallation(inst);
         FilePath sampleRepo = slave.getRootPath().child("sampleRepo");

diff --git a/src/test/java/hudson/plugins/mercurial/MercurialStatusPermissionTest.java b/src/test/java/hudson/plugins/mercurial/MercurialStatusPermissionTest.java
@@ -55,7 +55,7 @@ public void setup() throws Exception {
         MercurialContainer container = docker.create();
         Slave slave = container.createSlave(j);
         m.withNode(slave);
-        MercurialInstallation inst = container.createInstallation(j, MercurialContainer.Version.HG5, false, false, false, "", slave);
+        MercurialInstallation inst = container.createInstallation(j, MercurialContainer.Version.HG6, false, false, false, "", slave);
         assertNotNull(inst);
         m.withInstallation(inst);
         FilePath sampleRepo = slave.getRootPath().child("sampleRepo");

diff --git a/src/test/java/hudson/plugins/mercurial/PipelineTest.java b/src/test/java/hudson/plugins/mercurial/PipelineTest.java
@@ -77,7 +77,7 @@ public class PipelineTest {
         MercurialContainer container = docker.create();
         Slave slave = container.createSlave(r);
         m.withNode(slave);
-        MercurialInstallation inst = container.createInstallation(r, MercurialContainer.Version.HG5, false, false, false, "", slave);
+        MercurialInstallation inst = container.createInstallation(r, MercurialContainer.Version.HG6, false, false, false, "", slave);
         assertNotNull(inst);
         m.withInstallation(inst);
         FilePath sampleRepo = slave.getRootPath().child("sampleRepo");

diff --git a/src/test/resources/hudson/plugins/mercurial/MercurialContainer/Dockerfile b/src/test/resources/hudson/plugins/mercurial/MercurialContainer/Dockerfile
@@ -1,14 +1,15 @@
-FROM jenkins/java:387404da3ce7
+# curl -s https://raw.githubusercontent.com/jenkinsci/docker-fixtures/master/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaContainer/Dockerfile | sha1sum | cut -c 1-12
+FROM jenkins/java:978f1af53461
 RUN apt-get update -y && \
     apt-get install --no-install-recommends -y \
-        python2.7 \
-        python \
-        libpython2.7-dev \
+        python3 \
+        python3-setuptools \
+        libpython3-dev \
         make \
         gcc \
         gettext
 RUN set -e; \
-    for v in 2.9.2 3.9.2 4.9.1 5.5.2; do \
+    for v in 6.6.3; do \
         wget -nv -O /tmp/mercurial.tar.gz https://www.mercurial-scm.org/release/mercurial-$v.tar.gz; \
         cd /opt; \
         tar xfz /tmp/mercurial.tar.gz; \