[JEP-230] [JENKINS-55582] Test instance-identity as a detached plugin

jenkinsci · Jul 29, 2022 · 0dd6bda · 0dd6bda
1 parent 38543f2
commit 0dd6bda
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 29 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -37,7 +37,6 @@ stage('prep') {
         dir('target') {
             plugins = readFile('plugins.txt').split('\n')
             lines = readFile('lines.txt').split('\n')
-            lines = [lines[0], lines[-1]] // run PCT only on newest and oldest lines, to save resources
             stash name: 'pct', includes: 'pct.jar'
             lines.each {stash name: "megawar-$it", includes: "megawar-${it}.war"}
         }

diff --git a/bom-weekly/pom.xml b/bom-weekly/pom.xml
@@ -229,6 +229,11 @@
                 <artifactId>lockable-resources</artifactId>
                 <version>2.16</version>
             </dependency>
+            <dependency>
+                <groupId>org.jenkins-ci.modules</groupId>
+                <artifactId>instance-identity</artifactId>
+                <version>116.vf8f487400980</version>
+            </dependency>
             <dependency>
                 <groupId>org.jenkins-ci.modules</groupId>
                 <artifactId>sshd</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -20,9 +20,6 @@
     </licenses>
     <modules>
         <module>bom-weekly</module>
-        <module>bom-2.346.x</module>
-        <module>bom-2.332.x</module>
-        <module>bom-2.319.x</module>
         <module>sample-plugin</module>
     </modules>
     <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">

diff --git a/prep.sh b/prep.sh
@@ -11,7 +11,6 @@ $MVN clean install ${SAMPLE_PLUGIN_OPTS:-}
 
 ALL_LINEZ=$(
 	echo weekly
-	grep -F '.x</bom>' sample-plugin/pom.xml | sed -E 's, *<bom>(.+)</bom>,\1,g' | sort -rn
 )
 : "${LINEZ:=$ALL_LINEZ}"
 echo "${LINEZ}" >target/lines.txt

diff --git a/sample-plugin/pom.xml b/sample-plugin/pom.xml
@@ -539,28 +539,4 @@
             </plugin>
         </plugins>
     </build>
-    <profiles>
-        <!-- Use .1 of most recent active line, and .3 (or later) of previous lines: https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/#choosing-a-version -->
-        <profile>
-            <id>2.346.x</id>
-            <properties>
-                <bom>2.346.x</bom>
-                <jenkins.version>2.346.1</jenkins.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>2.332.x</id>
-            <properties>
-                <bom>2.332.x</bom>
-                <jenkins.version>2.332.4</jenkins.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>2.319.x</id>
-            <properties>
-                <bom>2.319.x</bom>
-                <jenkins.version>2.319.3</jenkins.version>
-            </properties>
-        </profile>
-    </profiles>
 </project>