Merge pull request #255 from jglick/incrementals

Publish incrementals
jenkinsci · Sep 18, 2020 · 693d749 · 693d749
2 parents f09992d + 1e1ef18
commit 693d749
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 26 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 ### Maven
 target/
-plugins-compat-tester-cli/dependency-reduced-pom.xml
 
 ### IntelliJ IDEA
 .idea/

diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -0,0 +1,7 @@
+<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
+  <extension>
+    <groupId>io.jenkins.tools.incrementals</groupId>
+    <artifactId>git-changelist-maven-extension</artifactId>
+    <version>1.2</version>
+  </extension>
+</extensions>
diff --git a/.mvn/maven.config b/.mvn/maven.config
@@ -0,0 +1,2 @@
+-Pconsume-incrementals
+-Pmight-produce-incrementals
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -2,39 +2,47 @@
 properties([[$class: 'BuildDiscarderProperty',
                 strategy: [$class: 'LogRotator', numToKeepStr: '10']]])
 
+def buildNumber = BUILD_NUMBER as int; if (buildNumber > 1) milestone(buildNumber - 1); milestone(buildNumber) // JENKINS-43353 / JENKINS-58625
+
 // TODO: Move it to Jenkins Pipeline Library
 
 /* These platforms correspond to labels in ci.jenkins.io, see:
  *  https://github.com/jenkins-infra/documentation/blob/master/ci.adoc
  */
 List platforms = ['linux', 'windows']
-Map branches = [:]
+Map branches = [failFast: true]
 
 for (int i = 0; i < platforms.size(); ++i) {
     String label = platforms[i]
+    boolean publishing = (label == 'linux')
     branches[label] = {
         node(label) {
-            timestamps {
                 stage('Checkout') {
+                    if (isUnix()) { // have to clean the workspace as root
+                        sh 'docker run --rm -v $(pwd):/src -w /src maven:3.6.0-jdk-8 sh -c "rm -rf * .[a-zA-Z]*" || :'
+                    }
                     checkout scm
                 }
 
                 stage('Build') {
                   timeout(30) {
-                    infra.runMaven(["clean", "install", "-Dmaven.test.failure.ignore=true"])
+                    def args = ['clean', 'install', '-Dmaven.test.failure.ignore=true']
+                    if (publishing) {
+                      args += '-Dset.changelist'
+                    }
+                    infra.runMaven(args)
                   }
                 }
 
                 stage('Archive') {
                     /* Archive the test results */
                     junit '**/target/surefire-reports/TEST-*.xml'
 
-                    if (label == 'linux') {
-                      archiveArtifacts artifacts: '**/target/**/*.jar'
+                    if (publishing) {
                       findbugs pattern: '**/target/findbugsXml.xml'
+                      infra.prepareToPublishIncrementals()
                     }
                 }
-            }
         }
     }
 }
@@ -191,3 +199,5 @@ disabled_itBranches['CasC tests success'] = {
 
 itBranches.failFast = false
 parallel itBranches
+
+infra.maybePublishIncrementals()
diff --git a/plugins-compat-tester-cli/pom.xml b/plugins-compat-tester-cli/pom.xml
@@ -4,11 +4,10 @@
   <parent>
       <groupId>org.jenkins-ci.tests</groupId>
       <artifactId>plugins-compat-tester-aggregator</artifactId>
-      <version>0.5.1-SNAPSHOT</version>
+      <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>plugins-compat-tester-cli</artifactId>
-  <version>0.5.1-SNAPSHOT</version>
   <name>Plugins compatibility tester CLI</name>
   <description>Jenkins Plugin Compatibility Tester (PCT) against latest released version</description>
 
@@ -26,6 +25,7 @@
                   <goal>shade</goal>
                 </goals>
                 <configuration>
+                  <createDependencyReducedPom>false</createDependencyReducedPom>
                   <transformers>
                     <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                       <mainClass>org.jenkins.tools.test.PluginCompatTesterCli</mainClass>
@@ -59,7 +59,7 @@
   	<dependency>
         <groupId>org.jenkins-ci.tests</groupId>
         <artifactId>plugins-compat-tester</artifactId>
-        <version>0.5.1-SNAPSHOT</version>
+        <version>${project.version}</version>
   	</dependency>
     <dependency>
         <groupId>com.beust</groupId>

diff --git a/plugins-compat-tester-cli/src/main/java/org/jenkins/tools/test/CliOptions.java b/plugins-compat-tester-cli/src/main/java/org/jenkins/tools/test/CliOptions.java
@@ -37,7 +37,7 @@
 import org.jenkins.tools.test.model.TestStatus;
 
 /**
- * POJO containing CLI arguments & help
+ * POJO containing CLI arguments &amp; help.
  *
  * @author Frederic Camblor
  */

diff --git a/plugins-compat-tester-model/pom.xml b/plugins-compat-tester-model/pom.xml
@@ -4,11 +4,10 @@
   <parent>
       <groupId>org.jenkins-ci.tests</groupId>
       <artifactId>plugins-compat-tester-aggregator</artifactId>
-      <version>0.5.1-SNAPSHOT</version>
+      <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>plugins-compat-tester-model</artifactId>
-  <version>0.5.1-SNAPSHOT</version>
   <name>Plugins compatibility tester model layer</name>
   <description>Jenkins Plugin Compatibility Tester (PCT) model layer</description>
 

diff --git a/plugins-compat-tester/pom.xml b/plugins-compat-tester/pom.xml
@@ -4,11 +4,10 @@
   <parent>
       <groupId>org.jenkins-ci.tests</groupId>
       <artifactId>plugins-compat-tester-aggregator</artifactId>
-      <version>0.5.1-SNAPSHOT</version>
+      <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>plugins-compat-tester</artifactId>
-  <version>0.5.1-SNAPSHOT</version>
   <name>Plugins compatibility tester</name>
   <description>Jenkins Plugin Compatibility Tester (PCT) against latest released version</description>
 
@@ -24,7 +23,7 @@
     <dependency>
       <groupId>org.jenkins-ci.tests</groupId>
       <artifactId>plugins-compat-tester-model</artifactId>
-      <version>0.5.1-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
   	<dependency>
 	    <groupId>org.jenkins-ci.main</groupId>

diff --git a/plugins-compat-tester/src/test/java/org/jenkins/tools/test/PluginCompatTesterTest.java b/plugins-compat-tester/src/test/java/org/jenkins/tools/test/PluginCompatTesterTest.java
@@ -32,11 +32,7 @@
 
 import java.io.File;
 
-import org.apache.commons.io.FileUtils;
-import org.jenkins.tools.test.model.MavenCoordinates;
 import org.jenkins.tools.test.model.PCTPlugin;
-import org.jenkins.tools.test.model.PluginCompatReport;
-import org.jenkins.tools.test.model.PluginCompatResult;
 
 import java.io.IOException;
 import java.nio.file.Paths;
@@ -53,7 +49,6 @@
 import org.codehaus.plexus.PlexusContainerException;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 import org.jenkins.tools.test.exception.PomExecutionException;
-import org.jenkins.tools.test.model.MavenBom;
 import org.jenkins.tools.test.model.MavenCoordinates;
 import org.jenkins.tools.test.model.PluginCompatReport;
 import org.jenkins.tools.test.model.PluginCompatResult;
@@ -63,6 +58,7 @@
 import org.jenkins.tools.test.model.TestStatus;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -102,6 +98,7 @@ public void tearDown() {
         SCMManagerFactory.getInstance().stop();
     }
 
+    @Ignore("TODO broken by https://github.com/jenkinsci/active-directory-plugin/releases/tag/active-directory-2.17; figure out how to pin a version")
     @Test
     public void testWithUrl() throws Throwable {
         PluginCompatTesterConfig config = getConfig(ImmutableList.of("active-directory"));
@@ -142,6 +139,7 @@ public void testWithUrl() throws Throwable {
         }
     }
 
+    @Ignore("TODO broken by https://github.com/jenkinsci/active-directory-plugin/releases/tag/active-directory-2.17; figure out how to pin a version")
     @Test
     public void testWithIsolatedTest() throws Throwable {
         PluginCompatTesterConfig config = getConfig(ImmutableList.of("active-directory"));

diff --git a/pom.xml b/pom.xml
@@ -4,24 +4,29 @@
   <parent> 
     <groupId>org.jenkins-ci</groupId>
     <artifactId>jenkins</artifactId>
-    <version>1.54</version>
+    <version>1.57</version>
+    <relativePath />
   </parent>
 
   <groupId>org.jenkins-ci.tests</groupId>
   <artifactId>plugins-compat-tester-aggregator</artifactId>
-  <version>0.5.1-SNAPSHOT</version>
+  <version>${revision}${changelist}</version>
   <name>Plugins compatibility tester Aggregator</name>
   <description>Jenkins Plugin Compatibility Tester (PCT) against latest released version</description>
   <url>https://github.com/jenkinsci/plugin-compat-tester</url>
   <packaging>pom</packaging>
 
   <scm>
-    <connection>scm:git:ssh://git@github.com/jenkinsci/plugin-compat-tester.git</connection>
-    <developerConnection>scm:git:ssh://git@github.com/jenkinsci/plugin-compat-tester.git</developerConnection>
-    <tag>HEAD</tag>
+    <connection>scm:git:ssh://git@github.com/${gitHubRepo}.git</connection>
+    <developerConnection>scm:git:ssh://git@github.com/${gitHubRepo}.git</developerConnection>
+    <url>https://github.com/${gitHubRepo}</url>
+    <tag>${scmTag}</tag>
   </scm>
 
   <properties>
+    <revision>0.5.1</revision>
+    <changelist>-SNAPSHOT</changelist>
+    <gitHubRepo>jenkinsci/plugin-compat-tester</gitHubRepo>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <logbackVersion>1.2.3</logbackVersion>
     <java.level>8</java.level>
@@ -31,6 +36,7 @@
     <!-- Test libs -->
     <powermock.version>1.6.1</powermock.version>
     <spotbugs.effort>Max</spotbugs.effort>
+    <spotbugs.excludeFilterFile>${basedir}/../src/spotbugs/excludeFilter.xml</spotbugs.excludeFilterFile>
   </properties>
 
   <modules>

diff --git a/src/spotbugs/excludeFilter.xml b/src/spotbugs/excludeFilter.xml
@@ -0,0 +1,6 @@
+<FindBugsFilter>
+    <Match>
+        <!-- Irrelevant for a development tool. -->
+        <Bug category="SECURITY"/>
+    </Match>
+</FindBugsFilter>