Create incremental build for BOM and ATH test #26051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

MarkEWaite wants to merge 29 commits into jenkinsci:master from MarkEWaite:aardvark-octopus

Jenkinsfile

-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ properties([ @@
     ])
     def axes = [
-      platforms: ['linux', 'windows'],
+      platforms: ['linux'],
       jdks: [21, 25],
     ]
@@ Expand Down Expand Up / @@ -216,41 +216,6 @@ axes.values().combinations { @@
       }
     }
-    def athAxes = [
-      platforms: ['linux'],
-      jdks: [21],
-      browsers: ['firefox'],
-    ]
-    athAxes.values().combinations {
-      def (platform, jdk, browser) = it
-      builds["ath-${platform}-jdk${jdk}-${browser}"] = {
-        retry(conditions: [agent(), nonresumable()], count: 2) {
-          node('docker-highmem') {
-            // Just to be safe
-            deleteDir()
-            checkout scm
-            withChecks(name: 'Tests', includeStage: true) {
-              infra.withArtifactCachingProxy {
-                sh "bash ath.sh ${jdk} ${browser}"
-              }
-              junit testResults: 'target/ath-reports/TEST-*.xml', testDataPublishers: [[$class: 'AttachmentPublisher']]
-            }
-            /*
-             * Currently disabled, as the fact that this is a manually created subset will confuse Launchable,
-             * which expects this to be a full build. When we implement subsetting, this can be re-enabled using
-             * Launchable's subset rather than our own.
-             */
-            /*
-             withCredentials([string(credentialsId: 'launchable-jenkins-acceptance-test-harness', variable: 'LAUNCHABLE_TOKEN')]) {
-             sh "launchable verify && launchable record tests --no-build --flavor platform=${platform} --flavor jdk=${jdk} --flavor browser=${browser} maven './target/ath-reports'"
-             }
-             */
-          }
-        }
-      }
-    }
     builds.failFast = failFast
     parallel builds
     infra.maybePublishIncrementals()

core/pom.xml

-Original file line number
+Diff line change
@@ Expand Up / @@ -40,7 +40,7 @@ THE SOFTWARE. @@
       <properties>
         <!-- Minimum Remoting version, which is tested for API compatibility, duplicated so that renovate only updates the latest remoting version property -->
-        <remoting.minimum.supported.version>3107.v665000b_51092</remoting.minimum.supported.version>
+        <remoting.minimum.supported.version>3176.v207ec082a_8c0</remoting.minimum.supported.version>
         <!-- Filled in by jacoco-maven-plugin -->
         <jacocoSurefireArgs />
       </properties>
@@ Expand Down @@

core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -356,24 +356,32 @@ @@
             return messages.toString();
         }
+        /**
+         * Lock used to make initial admin account creation atomic.
+         */
+        private static final Object CREATE_FIRST_ACCOUNT_LOCK = new Object();
         /**
          * Creates a first admin user account.
          *
          * <p>
          * This can be run by anyone, but only to create the very first user account.
          */
         @RequirePOST
-        public void doCreateFirstAccount(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
-            if (hasSomeUser()) {
-                rsp.sendError(SC_UNAUTHORIZED, "First user was already created");
-                return;
-            }
-            User u = createAccount(req, rsp, false, "firstUser.jelly");
-            if (u != null) {
-                tryToMakeAdmin(u);
-                loginAndTakeBack(req, rsp, u);
+        public void doCreateFirstAccount(StaplerRequest2 req, StaplerResponse2 rsp)
+                throws IOException, ServletException {
+            synchronized (CREATE_FIRST_ACCOUNT_LOCK) {
+                if (hasSomeUser()) {
+                    rsp.sendError(SC_UNAUTHORIZED, "First user was already created");
+                    return;
+                }
+                User u = createAccount(req, rsp, false, "firstUser.jelly");
+                if (u != null) {
+                    tryToMakeAdmin(u);
+                    loginAndTakeBack(req, rsp, u);
+                }
             }
         }
         /**
          * Try to make this user a super-user
@@ Expand Down @@

core/src/main/java/jenkins/monitor/JavaVersionRecommendationAdminMonitor.java

-Original file line number
+Diff line change
@@ Expand Up @@
         static {
             NavigableMap<Integer, LocalDate> supportedVersions = new TreeMap<>();
+            supportedVersions.put(17, LocalDate.of(2026, 3, 31)); // Temurin: 2027-10-31
             supportedVersions.put(21, LocalDate.of(2027, 9, 30)); // Temurin: 2029-09-30
             supportedVersions.put(25, LocalDate.of(2029, 9, 30)); // Temurin: 2031-09-30
             SUPPORTED_JAVA_VERSIONS = Collections.unmodifiableNavigableMap(supportedVersions);
@@ Expand Down @@

core/src/main/java/jenkins/security/stapler/StaplerDispatchValidator.java

-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             }
+            @SuppressFBWarnings(value = "SIC_INNER_SHOULD_BE_STATIC", justification = "TODO needs triage")
             private class Validator {
                 // lazy load parents to avoid trying to load potentially unavailable classes
                 private final Supplier<Collection<Validator>> parentsSupplier;
@@ Expand Down @@

core/src/main/java/jenkins/telemetry/impl/JavaSystemProperties.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -70,13 +70,13 @@ @@
         @NonNull
         @Override
         public LocalDate getStart() {
-            return LocalDate.of(2023, 12, 17);
+            return LocalDate.of(2026, 1, 4);
         }
         @NonNull
         @Override
         public LocalDate getEnd() {
-            return LocalDate.of(2024, 4, 1);
+            return LocalDate.of(2026, 4, 1);
         }
         @Override
@@ Expand Down @@

pom.xml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -28,7 +28,7 @@ THE SOFTWARE.
  
      <parent>

        <groupId>org.jenkins-ci</groupId>

        <artifactId>jenkins</artifactId>

        <version>2.1326.v00b_e26755312</version>

        <version>1.142</version>

        <relativePath />

      </parent>

    @@ -281,7 +281,7 @@ THE SOFTWARE.
  
                <dependency>

                  <groupId>com.puppycrawl.tools</groupId>

                  <artifactId>checkstyle</artifactId>

                  <version>12.3.0</version>

                  <version>12.3.1</version>

                </dependency>

              </dependencies>

              <executions>

test/pom.xml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -39,7 +39,7 @@ THE SOFTWARE.
  
      <properties>

        <mavenDebug>false</mavenDebug>

        <!-- Minimum Remoting version, which is tested for API compatibility, duplicated so that renovate only updates the latest remoting version property -->

        <remoting.minimum.supported.version>3107.v665000b_51092</remoting.minimum.supported.version>

        <remoting.minimum.supported.version>3176.v207ec082a_8c0</remoting.minimum.supported.version>

        <!-- Filled in by jacoco-maven-plugin -->

        <jacocoSurefireArgs />

        <!--

    @@ -52,6 +52,8 @@ THE SOFTWARE.
  
        <!-- Filled in by maven-hpi-plugin with "-javaagent:/path/to/mockito-core-<version>.jar" -->

        <jenkins.javaAgent />

        <test>hudson.AboutJenkinsTest</test>

      </properties>

      <dependencyManagement>

    @@ -238,7 +240,7 @@ THE SOFTWARE.
  
        <dependency>

          <groupId>org.jenkins-ci.plugins</groupId>

          <artifactId>credentials</artifactId>

          <version>1453.v9b_a_29777a_b_fd</version>

          <version>1460.v48765a_c7d849</version>

          <scope>test</scope>

        </dependency>

        <dependency>

war/pom.xml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -48,7 +48,7 @@ THE SOFTWARE.
  
        <port>8080</port>

        <mina-sshd-api.version>2.16.0-167.va_269f38cc024</mina-sshd-api.version>

        <!-- Minimum Remoting version, which is tested for API compatibility, duplicated so that renovate only updates the latest remoting version property -->

        <remoting.minimum.supported.version>3107.v665000b_51092</remoting.minimum.supported.version>

        <remoting.minimum.supported.version>3176.v207ec082a_8c0</remoting.minimum.supported.version>

      </properties>

    @@ -346,7 +346,7 @@ THE SOFTWARE.
  
                      <!-- dependency of junit -->

                      <groupId>io.jenkins.plugins</groupId>

                      <artifactId>checks-api</artifactId>

                      <version>373.vfe7645102093</version>

                      <version>402.vca_263b_f200e3</version>

                      <type>hpi</type>

                    </artifactItem>

                    <artifactItem>

    @@ -397,7 +397,7 @@ THE SOFTWARE.
  
                      <!-- dependency of jackson2-api -->

                      <groupId>io.jenkins.plugins</groupId>

                      <artifactId>jakarta-xml-bind-api</artifactId>

                      <version>4.0.6-10.v9b_7e1d1fc40b_</version>

                      <version>4.0.6-12.vb_1833c1231d3</version>

                      <type>hpi</type>

                    </artifactItem>

    @@ -471,7 +471,7 @@ THE SOFTWARE.
  
                      <!-- detached after 2.163 -->

                      <groupId>io.jenkins.plugins</groupId>

                      <artifactId>jaxb</artifactId>

                      <version>2.3.9-133.vb_ec76a_73f706</version>

                      <version>2.3.9-143.v5979df3304e6</version>

                      <type>hpi</type>

                    </artifactItem>

                    <artifactItem>

    @@ -606,7 +606,7 @@ THE SOFTWARE.
  
                    <artifactItem>

                      <groupId>io.jenkins.lib</groupId>

                      <artifactId>support-log-formatter</artifactId>

                      <version>118.v18c3eb_f88f07</version>

                      <version>121.v4db_e40a_98359</version>

                    </artifactItem>

                  </artifactItems>

                  <outputDirectory>${project.build.directory}</outputDirectory>

war/src/main/java/executable/Main.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -76,7 +76,7 @@ public class Main { @@
          * This list must remain synchronized with the one in {@code
          * JavaVersionRecommendationAdminMonitor}.
          */
-        private static final NavigableSet<Integer> SUPPORTED_JAVA_VERSIONS = new TreeSet<>(List.of(21, 25));
+        private static final NavigableSet<Integer> SUPPORTED_JAVA_VERSIONS = new TreeSet<>(List.of(17, 21, 25));
         /**
          * Sets custom session cookie name.
@@ Expand Down @@

war/src/test/java/executable/MainTest.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -13,26 +13,26 @@ void unsupported() { @@
             assertJavaCheckFails(8, true);
             assertJavaCheckFails(11, false);
             assertJavaCheckFails(11, true);
-            assertJavaCheckFails(17, false);
-            assertJavaCheckFails(17, true);
         }
         @Test
         void supported() {
+            assertJavaCheckPasses(17, false);
+            assertJavaCheckPasses(17, true);
             assertJavaCheckPasses(21, false);
             assertJavaCheckPasses(21, true);
-            assertJavaCheckPasses(25, false);
-            assertJavaCheckPasses(25, true);
         }
         @Test
         void future() {
+            assertJavaCheckFails(18, false);
+            assertJavaCheckFails(19, false);
+            assertJavaCheckFails(20, false);
             assertJavaCheckFails(22, false);
-            assertJavaCheckFails(23, false);
-            assertJavaCheckFails(24, false);
+            assertJavaCheckPasses(18, true);
+            assertJavaCheckPasses(19, true);
+            assertJavaCheckPasses(20, true);
             assertJavaCheckPasses(22, true);
-            assertJavaCheckPasses(23, true);
-            assertJavaCheckPasses(24, true);
         }
         private static void assertJavaCheckFails(int releaseVersion, boolean enableFutureJava) {
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Create incremental build for BOM and ATH test #26051

Uh oh!

Diff view

Diff view

There are no files selected for viewing

ci.jenkins.io / Code Coverage

ci.jenkins.io / Code Coverage

Uh oh!