Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Update dependencies and stabilize tests #206

Merged
merged 4 commits into from
Aug 24, 2023
Merged

Update dependencies and stabilize tests #206

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7909855
Upgrade BOM to latest
basil Aug 18, 2023
482cce8
Starting to clean up tests
jglick Aug 23, 2023
da596d9
Some test idiom cleanups, and leaving the rest to `RemainingActivityL…
jglick Aug 23, 2023
1d2e081
https://github.com/jenkinsci/jenkins-test-harness/pull/643 released
jglick Aug 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 0 additions & 5 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,3 @@ updates:
directory: "/"
schedule:
interval: "monthly"
ignore:
# maven plugin updates break plugin bill of materials
# do not offer minor version updates
- dependency-name: "org.jenkins-ci.main:maven-plugin"
update-types: ["version-update:semver-minor"]
20 changes: 13 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,12 @@
<revision>1.49</revision>
<changelist>999999-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<jenkins.version>2.361.4</jenkins.version>
<jenkins.version>2.387.3</jenkins.version>
<useBeta>true</useBeta>
<spotbugs.effort>Max</spotbugs.effort>
<spotbugs.threshold>Low</spotbugs.threshold>
<!-- TODO pending inclusion in parent: -->
<jenkins-test-harness.version>2061.v04b_f07857801</jenkins-test-harness.version> <!-- TODO https://github.com/jenkinsci/jenkins-test-harness/pull/643 -->
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jenkinsci/jenkins-test-harness#643

</properties>

<build>
Expand All @@ -44,17 +46,21 @@
<compatibleSinceVersion>1.44</compatibleSinceVersion>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
<org.jvnet.hudson.test.RemainingActivityListener.wait>true</org.jvnet.hudson.test.RemainingActivityListener.wait>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Example:

=== Starting testWithPermalinkBuildSelector(hudson.plugins.copyartifact.LastCompletedBuildSelectorTest)
   0.008 [id=102]	INFO	o.jvnet.hudson.test.JenkinsRule#createWebServer: Running on http://localhost:40519/jenkins/
   0.090 [id=115]	INFO	jenkins.InitReactorRunner$1#onAttained: Started initialization
   0.092 [id=132]	INFO	jenkins.InitReactorRunner$1#onAttained: Listed all plugins
   0.093 [id=116]	INFO	j.b.api.BouncyCastlePlugin#start: …/plugins/bouncycastle-api/WEB-INF/optional-lib not found; for non RealJenkinsRule this is fine and can be ignored.
   0.321 [id=123]	INFO	jenkins.InitReactorRunner$1#onAttained: Prepared all plugins
   0.324 [id=136]	INFO	jenkins.InitReactorRunner$1#onAttained: Started all plugins
   0.324 [id=118]	INFO	jenkins.InitReactorRunner$1#onAttained: Augmented all extensions
   0.326 [id=136]	INFO	h.p.c.CopyArtifactConfiguration#load: CopyArtifact is set to Production mode.
   0.860 [id=125]	INFO	jenkins.InitReactorRunner$1#onAttained: System config loaded
   0.860 [id=121]	INFO	jenkins.InitReactorRunner$1#onAttained: System config adapted
   0.873 [id=126]	INFO	jenkins.InitReactorRunner$1#onAttained: Loaded all jobs
   0.874 [id=126]	INFO	jenkins.InitReactorRunner$1#onAttained: Configuration for all jobs updated
   0.887 [id=127]	INFO	jenkins.InitReactorRunner$1#onAttained: Completed initialization
   1.900 [id=153]	INFO	hudson.model.Run#execute: test0 #2 aborted
java.lang.InterruptedException: sleep interrupted
	at java.base/java.lang.Thread.sleep(Native Method)
	at org.jvnet.hudson.test.SleepBuilder.perform(SleepBuilder.java:51)
	at hudson.tasks.BuildStepMonitor$1.perform(BuildStepMonitor.java:20)
	at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:818)
	at hudson.model.Build$BuildExecution.build(Build.java:199)
	at hudson.model.Build$BuildExecution.doRun(Build.java:164)
	at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:526)
	at hudson.model.Run.execute(Run.java:1900)
	at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:44)
	at hudson.model.ResourceController.execute(ResourceController.java:101)
	at hudson.model.Executor.run(Executor.java:442)
   1.901 [id=102]	WARNING	o.j.h.t.RemainingActivityListener#onTearDown: test0 #2 still seems to be running, which could break deletion of log files or metadata
   6.904 [id=102]	INFO	hudson.lifecycle.Lifecycle#onStatusUpdate: Stopping Jenkins
   6.920 [id=102]	INFO	hudson.lifecycle.Lifecycle#onStatusUpdate: Jenkins stopped
   7.011 [id=102]	INFO	o.j.h.t.TemporaryDirectoryAllocator#dispose: deleting …

pointing to

copyartifact-plugin/src/test/java/hudson/plugins/copyartifact/LastCompletedBuildSelectorTest.java

Line 256 in da596d9

upstream.scheduleBuild2(0);
as a possible source of instability in this test. It seems that

copyartifact-plugin/src/test/java/hudson/plugins/copyartifact/LastCompletedBuildSelectorTest.java

Lines 262 to 263 in da596d9

assertTrue(upstreamIncompleteBuild.isBuilding());
upstreamIncompleteBuild.getExecutor().interrupt();
attempts to abort it, but the actual build termination will occur a bit later…and, evidently, sometimes after the test method exits.

</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>maven-plugin</artifactId>
<!-- Intentionally kept at 3.16 to not disrupt Jenkins plugin bill of materials -->
<!-- https://github.com/jenkinsci/bom/pull/1978#issuecomment-1516220549 -->
<!-- TODO: Before upgrading this version, must check that plugin bill of materials is unharmed -->
<version>3.16</version>
<optional>true</optional>
</dependency>
<dependency>
Expand Down Expand Up @@ -151,8 +157,8 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.361.x</artifactId>
<version>2102.v854b_fec19c92</version>
<artifactId>bom-2.387.x</artifactId>
<version>2329.v078520e55c19</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down