2.176.2

Jenkinsfile

@@ -23,13 +23,12 @@ def plugins
 stage('prep') {
     mavenEnv {
         checkout scm
-        // TODO rename to prep.sh & pct.sh, respectively, for clarity
-        sh 'bash ci-1.sh'
+        sh 'bash prep.sh'
         dir('sample-plugin/target') {
             plugins = readFile('plugins.txt').split(' ')
             stash name: 'pct', includes: 'megawar.war,pct.jar'
         }
-        stash name: 'ci', includes: 'ci-2.sh'
+        stash name: 'ci', includes: 'pct.sh'
     }
 }
 
@@ -40,8 +39,8 @@ plugins.each { plugin ->
             deleteDir()
             unstash 'ci'
             unstash 'pct'
-            withEnv(["PLUGIN=$plugin"]) {
-                sh 'bash ci-2.sh'
+            withEnv(["PLUGINS=$plugin"]) {
+                sh 'bash pct.sh'
             }
             warnError('some plugins could not be run in PCT') {
                 sh 'if fgrep -q "<status>INTERNAL_ERROR</status>" pct-report.xml; then echo PCT failed; exit 1; fi'
@@ -50,3 +49,5 @@ plugins.each { plugin ->
     }
 }
 parallel branches
+
+// TODO incrementalify and publish

README.md

@@ -80,7 +80,11 @@ and the specified Jenkins LTS version.
 If there is a PCT failure, fix it in the plugin with the failing test,
 and when that fix is released, try updating the BOM again.
 
-TODO could use a script to run the full build locally with just a single plugin and a single test.
+To reproduce a PCT failure locally, use something like
+
+```sh
+PLUGINS=structs,mailer TEST=InjectedTest bash local-test.sh
+```
 
 ## LTS lines
 

bom/pom.xml

@@ -66,6 +66,16 @@
                 <artifactId>apache-httpcomponents-client-4-api</artifactId>
                 <version>4.5.5-3.0</version>
             </dependency>
+            <dependency>
+                <groupId>org.jenkins-ci.plugins</groupId>
+                <artifactId>command-launcher</artifactId>
+                <version>1.3</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jenkins-ci.plugins</groupId>
+                <artifactId>credentials</artifactId>
+                <version>2.2.0</version>
+            </dependency>
             <dependency>
                 <groupId>org.jenkins-ci.plugins</groupId>
                 <artifactId>display-url-api</artifactId>
@@ -76,11 +86,26 @@
                 <artifactId>durable-task</artifactId>
                 <version>1.30</version>
             </dependency>
+            <dependency>
+                <groupId>org.jenkins-ci.plugins</groupId>
+                <artifactId>jdk-tool</artifactId>
+                <version>1.2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jenkins-ci.plugins</groupId>
+                <artifactId>junit</artifactId>
+                <version>1.28</version>
+            </dependency>
             <dependency>
                 <groupId>org.jenkins-ci.plugins</groupId>
                 <artifactId>mailer</artifactId>
                 <version>1.23</version>
             </dependency>
+            <dependency>
+                <groupId>org.jenkins-ci.plugins</groupId>
+                <artifactId>matrix-project</artifactId>
+                <version>1.14</version>
+            </dependency>
             <dependency>
                 <groupId>org.jenkins-ci.plugins</groupId>
                 <artifactId>scm-api</artifactId>
@@ -91,6 +116,16 @@
                 <artifactId>script-security</artifactId>
                 <version>1.61</version>
             </dependency>
+            <dependency>
+                <groupId>org.jenkins-ci.plugins</groupId>
+                <artifactId>ssh-credentials</artifactId>
+                <version>1.17.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jenkins-ci.plugins</groupId>
+                <artifactId>ssh-slaves</artifactId>
+                <version>1.29.4</version> <!-- TODO cannot use 1.30.0 pending https://github.com/jenkinsci/durable-task-plugin/pull/100 -->
+            </dependency>
             <dependency>
                 <groupId>org.jenkins-ci.plugins</groupId>
                 <artifactId>structs</artifactId>

local-test.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+set -euxo pipefail
+cd $(dirname $0)
+
+# expects: $PLUGINS, optionally $TEST
+
+export SAMPLE_PLUGIN_OPTS=-Dtest=InjectedTest
+bash prep.sh
+
+rm -rf target/local-test
+mkdir target/local-test
+cp -v sample-plugin/target/{megawar.war,pct.jar} pct.sh target/local-test
+
+cd target/local-test
+if [ -v TEST ]
+then
+    export EXTRA_MAVEN_PROPERTIES="test=$TEST"
+fi
+bash pct.sh

pct.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+set -euxo pipefail
+cd $(dirname $0)
+
+# expects: megawar.war, pct.war, $PLUGINS
+
+rm -rf pct-work pct-report.xml
+
+if [ -v MAVEN_SETTINGS ]
+then
+    PCT_S_ARG="-m2SettingsFile $MAVEN_SETTINGS"
+else
+    PCT_S_ARG=
+fi
+
+MAVEN_PROPERTIES=org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn:jth.jenkins-war.path=$(pwd)/megawar.war
+if [ -v EXTRA_MAVEN_PROPERTIES ]
+then
+    MAVEN_PROPERTIES="$MAVEN_PROPERTIES:$EXTRA_MAVEN_PROPERTIES"
+fi
+
+java -jar pct.jar \
+     -war $(pwd)/megawar.war \
+     -includePlugins $PLUGINS \
+     -workDirectory $(pwd)/pct-work \
+     -reportFile $(pwd)/pct-report.xml \
+     -mvn $(which mvn) \
+     $PCT_S_ARG \
+     -mavenProperties "$MAVEN_PROPERTIES" \
+     -skipTestCache true
+
+# TODO https://github.com/jenkinsci/workflow-cps-plugin/pull/302
+rm -fv pct-work/workflow-cps/target/surefire-reports/TEST-org.jenkinsci.plugins.workflow.cps.SnippetizerTest.xml
+# TODO https://github.com/jenkinsci/structs-plugin/pull/50
+rm -fv pct-work/structs-plugin/plugin/target/surefire-reports/TEST-org.jenkinsci.plugins.structs.describable.DescribableModelTest.xml
+# TODO https://github.com/jenkinsci/jenkins/pull/4120 problems with workflow-cps → jquery-detached:
+rm -fv pct-work/structs-plugin/plugin/target/surefire-reports/TEST-InjectedTest.xml
+rm -fv pct-work/apache-httpcomponents-client-4-api/target/surefire-reports/TEST-InjectedTest.xml
+rm -fv pct-work/ssh-slaves/target/surefire-reports/TEST-InjectedTest.xml
+# TODO https://github.com/jenkinsci/matrix-project-plugin/pull/59
+rm -fv pct-work/matrix-project/target/surefire-reports/TEST-InjectedTest.xml
+# TODO https://github.com/jenkinsci/jenkins/pull/4099 pending backport to 2.176.3
+rm -fv pct-work/command-launcher/target/surefire-reports/TEST-hudson.slaves.CommandLauncher2Test.xml
+# TODO pending ssh-slaves 1.30.0 with https://github.com/jenkinsci/ssh-slaves-plugin/pull/114 (plus https://github.com/jenkinsci/durable-task-plugin/pull/100):
+rm -fv pct-work/ssh-slaves/target/surefire-reports/TEST-hudson.plugins.sshslaves.verifiers.VerificationStrategyConfigurationTest.xml
+rm -fv pct-work/ssh-slaves/target/surefire-reports/TEST-hudson.plugins.sshslaves.SSHLauncherTest.xml
+
+# produces: pct-report.xml, **/target/surefire-reports/TEST-*.xml

pom.xml

@@ -20,14 +20,12 @@
             <url>https://opensource.org/licenses/MIT</url>
         </license>
     </licenses>
-    <!-- TODO
     <scm>
         <connection>scm:git:git@github.com/jenkinsci/${project.artifactId}.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/jenkinsci/${project.artifactId}.git</developerConnection>
         <url>https://github.com/jenkinsci/${project.artifactId}</url>
         <tag>HEAD</tag>
     </scm>
-    -->
     <modules>
         <module>bom</module>
         <module>sample-plugin</module>

ci-1.sh → prep.sh

@@ -11,11 +11,13 @@ then
     MVN="$MVN -s $MAVEN_SETTINGS"
 fi
 
-$MVN -Dmaven.test.failure.ignore install
+$MVN -Dmaven.test.failure.ignore install ${SAMPLE_PLUGIN_OPTS:-}
 
 cd sample-plugin/target
 cp -r jenkins-for-test megawar
-# TODO check if removing detached-plugins is still necessary, given use of explicit -includePlugins
+mkdir jenkins
+echo '# nothing' > jenkins/split-plugins.txt
+jar uvf megawar/WEB-INF/lib/jenkins-core-*.jar jenkins/split-plugins.txt
 rm -rfv megawar/WEB-INF/detached-plugins megawar/META-INF/*.{RSA,SF}
 mkdir megawar/WEB-INF/plugins
 cp -rv test-classes/test-dependencies/*.hpi megawar/WEB-INF/plugins

sample-plugin/check.groovy

@@ -7,13 +7,18 @@ assert artifactMap['junit:junit'] == project.artifactMap['junit:junit']
 def managedPluginDeps = managedDeps.collect {stripAllButGA(it)}.grep { ga ->
     def art = artifactMap[ga]
     if (art == null) {
-        println "Do not see managed dependency $ga"
-        return false
+        if (ga.contains('.plugins:')) { // TODO without an Artifact, we have no reliable way of checking whether it is actually a plugin
+            throw new org.apache.maven.plugin.MojoFailureException("Managed plugin dependency $ga not listed in test classpath of sample plugin")
+        } else {
+            println "Do not see managed dependency $ga"
+            return false
+        }
     }
     pluginName(art) != null
 }
 if (managedPluginDeps != managedPluginDeps.toSorted()) {
     throw new org.apache.maven.plugin.MojoFailureException("Managed plugin dependencies should be sorted: $managedPluginDeps")
+    // TODO also check sorting of sample plugin dependencies
 }
 
 project.artifacts.each { art ->

sample-plugin/pom.xml

@@ -12,7 +12,7 @@
     <version>2.176.1-SNAPSHOT</version>
     <packaging>hpi</packaging>
     <properties>
-        <jenkins.version>2.176.1</jenkins.version>
+        <jenkins.version>2.176.2</jenkins.version>
         <java.level>8</java.level>
     </properties>
     <dependencyManagement>
@@ -57,6 +57,26 @@
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>matrix-project</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>command-launcher</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>ssh-slaves</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>jdk-tool</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>