Adapt test for git plugin 5.0 #40
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Git plugin 5.0 will require Java 11 and will add symbols to improve the Pipeline syntax editing experience. The test being modified in this pull request checks the specific syntax of the Pipeline snippet syntax generator. Adapt the test to check for current syntax with git plugin 4.x releases and for new syntax with any other releases. jenkinsci/git-client-plugin#939 is the git client plugin pull request that prepares git client plugin 4.0.0. It will require Java 11 and will upgrade from JGit 5.13.1 to JGit 6.4.0. jenkinsci/bom#1619 is the bom draft pull request that confirms git client plugin 4.0.0 pre-release works in the plugin bom. jenkinsci/git-plugin#1367 is the git plugin pull request that prepares git plugin 5.0.0. It will require Java 11. jenkinsci/bom#1624 is the bom draft pull request that tests git plugin 5.0.0 works in the plugin bom. jenkinsci/git-plugin#1373 is the git plugin pull request that relies on jenkinsci/git-plugin#1367 and adds symbols to the git plugin. jenkinsci/bom#1625 is the bom draft pull request that tests git plugin 5.0.0 with added symbols works in the plugin bom. It detected this test failure when run with git plugin 5.0.0 pre-release.
|
@jglick are you the preferred person to review this pull request or is there someone else that I should ask? |
jglick
approved these changes
Dec 21, 2022
| if (r.jenkins.get().getPlugin("git").getWrapper().getVersion().startsWith("4.")) { | ||
| snippetizerTester.assertRoundTrip(s, "library changelog: false, identifier: 'foo@master', retriever: legacySCM([$class: 'GitSCM', branches: [[name: '${library.foo.version}']], extensions: [], userRemoteConfigs: [[url: 'https://nowhere.net/']]])"); | ||
| } else { | ||
| snippetizerTester.assertRoundTrip(s, "library changelog: false, identifier: 'foo@master', retriever: legacySCM(scmGit(branches: [[name: '${library.foo.version}']], extensions: [], userRemoteConfigs: [[url: 'https://nowhere.net/']]))"); |
There was a problem hiding this comment.
I guess this is not simply git because that would conflict with the Step? 😞
There was a problem hiding this comment.
That's correct. I wanted to use git but there is already a git step defined.
| @@ -85,7 +85,11 @@ public class LibraryStepTest { | |||
| null, null, Collections.<GitSCMExtension>emptyList()))); | |||
| s.setChangelog(false); | |||
| r.assertEqualDataBoundBeans(s, stepTester.configRoundTrip(s)); | |||
| snippetizerTester.assertRoundTrip(s, "library changelog: false, identifier: 'foo@master', retriever: legacySCM([$class: 'GitSCM', branches: [[name: '${library.foo.version}']], extensions: [], userRemoteConfigs: [[url: 'https://nowhere.net/']]])"); | |||
| if (r.jenkins.get().getPlugin("git").getWrapper().getVersion().startsWith("4.")) { | |||
There was a problem hiding this comment.
OK for now (a cleanup PR in a few weeks would be appreciated) though in general we prefer to avoid this kind of switch—rather just update the test dependency to the newer version. If you have not released that version yet, file a draft PR with an incremental version so it is ready to go and be included in an omnibus bom PR.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adapt test for git plugin 5.0
Git plugin 5.0 will require Java 11 and will add symbols to improve the Pipeline syntax editing experience. The test being modified in this pull request checks the specific syntax of the Pipeline snippet syntax generator. Adapt the test to check for current syntax with git plugin 4.x releases and for new syntax with any other releases.
It would be nice to have a new release of this plugin ready to go at (or before) the release of git plugin 5.0.0 so that the bom can include git plugin 5.0.0 soon after the release of git plugin 5.0.0.