Skip to content

Conversation

@Zastai
Copy link
Contributor

@Zastai Zastai commented Jun 11, 2020

Uses the API being introduced for JENKINS-26097 (jenkinsci/jenkins#4774)

(Also squishes a spotbugs whine.)

Zastai added 2 commits June 11, 2020 22:54
…ion.

This also sets the the delimiter character on the label textbox to a space, so
that choosing "bar" after typing "foo && b" doesn't replace the whole thing.

(Plugin parent bumped to 4.2 to resolve dependencies of the recent Jenkins
incremental.)
@Zastai
Copy link
Contributor Author

Zastai commented Jun 12, 2020

At first glance, the test failures don't seem to come from these changes. Perhaps compatibility issue with newer Jenkins?

@jglick
Copy link
Member

jglick commented Jun 12, 2020

the test failures don't seem to come from these changes

No. I would think jenkinsci/jenkins-test-harness#210 would have solved all these, as in jenkinsci/workflow-basic-steps-plugin#116 (comment), but you did update the parent here. @dwnusbaum any idea offhand? I can dig into it.

@dwnusbaum
Copy link
Member

any idea offhand?

Best guess is that it has to do with issues fixed in workflow-job 2.33+. This plugin is still using 2.31, so I would try updating dependencies to see if that makes a difference. @Zastai If you are interested, you can try pulling the latest version of https://github.com/jenkinsci/bom into this PR to update everything, or we can handle it in a separate PR.

@dwnusbaum dwnusbaum self-requested a review June 12, 2020 17:10
Copy link
Member

@jglick jglick left a comment

Choose a reason for hiding this comment

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

Other than test failures, LGTM

@Zastai Zastai changed the title Adjust label validation and auto-completion [JENKINS-26097] Adjust label validation and auto-completion Jun 13, 2020
Added a dependency on the junit plugin (1.20); this seems to be required by
the InjectedTest from the plugin parent, so it's a bit odd we need to add
an explicit dependency here.
@Zastai
Copy link
Contributor Author

Zastai commented Jun 13, 2020

Looks like the bump to workflow-job 2.33 did it; made the tests pass for me.

I did have to add an explicit dependency on junit 1.20 for the InjectedTest (which I think comes from the plugin parent) failed (because it seems to use matrix-project 1.14, which wants junit 1.20, and apparently 1.6 was being pulled in).

@dwnusbaum
Copy link
Member

I think the ExecutorStepTest.buildShellScriptAcrossRestart failure is similar to flakes investigated in #139, so I pushed a fix into #121 and will rebuild this once that PR build passes and is merged.

@dwnusbaum dwnusbaum closed this Aug 14, 2020
@dwnusbaum dwnusbaum reopened this Aug 14, 2020
@dwnusbaum dwnusbaum merged commit 8f830f4 into jenkinsci:master Aug 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants