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.

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

[JENKINS-33358] Test against 2.73.x since that includes Groovy 2.4.11 #41

Merged
merged 3 commits into from
Nov 6, 2017

Conversation

jglick
Copy link
Member

@jglick jglick commented Sep 18, 2017

Like jenkinsci/workflow-cps-plugin#175.

@reviewbybees

Jenkinsfile Outdated
@@ -1 +1 @@
buildPlugin(jenkinsVersions: [null, '2.32.3', '2.47'])
buildPlugin(jenkinsVersions: [null, '2.32.3', '2.60.3', '2.73.1'])
Copy link
Member Author

Choose a reason for hiding this comment

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

Probably you want to bump up the jenkins.version to 2.7.3, in which case we could drop the tests against 2.32.x I think.

@ghost
Copy link

ghost commented Sep 18, 2017

This pull request originates from a CloudBees employee. At CloudBees, we require that all pull requests be reviewed by other CloudBees employees before we seek to have the change accepted. If you want to learn more about our process please see this explanation.

… security advisory and its immediate regression fixes.
@jglick jglick requested review from abayer and svanoort September 19, 2017 16:57
@@ -1 +1 @@
buildPlugin(jenkinsVersions: [null, '2.32.3', '2.47'])
buildPlugin(jenkinsVersions: [null, '2.60.3', '2.73.1'])
Copy link
Member Author

Choose a reason for hiding this comment

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

2.7.x–2.47 uses one version of Groovy, 2.48–2.60.x another, 2.61+ yet another. At least we are dropping 1.x!

<jenkins.version>1.642.3</jenkins.version>
<workflow-cps-plugin.version>2.30</workflow-cps-plugin.version>
<jenkins.version>2.7.3</jenkins.version>
<workflow-cps-plugin.version>2.39</workflow-cps-plugin.version>
Copy link
Member Author

Choose a reason for hiding this comment

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

last security advisory

@@ -108,7 +108,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>script-security</artifactId>
<version>1.27</version>
<version>1.33</version>
Copy link
Member Author

Choose a reason for hiding this comment

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

ditto, plus some follow-up fixes likely to affect testing of Groovy-heavy code like this

Copy link
Member

Choose a reason for hiding this comment

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

We could theoretically go straight to 1.34, but 1.33 is good enough, yeah.

@@ -93,7 +93,6 @@

// TODO test transitive dependencies; need to find something in Central which has a dependency not in this plugin’s test classpath and which could be used easily from a script

@Ignore("TODO ClassNodeResolver.tryAsLoaderClassOrScript swallows the CompilationFailedException and throws a generic GroovyBugError; fixed in Jenkins 2 / Groovy 2")
Copy link
Member Author

Choose a reason for hiding this comment

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

Can finally have automated tests cover Jenkins 2 behaviors.

@@ -108,7 +108,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>script-security</artifactId>
<version>1.27</version>
<version>1.33</version>
Copy link
Member

Choose a reason for hiding this comment

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

We could theoretically go straight to 1.34, but 1.33 is good enough, yeah.

@jglick
Copy link
Member Author

jglick commented Sep 19, 2017

Webhooks broken pending hub4j/github-api#373, will try to retrigger.

@jglick jglick closed this Sep 19, 2017
@jglick jglick reopened this Sep 19, 2017
@jglick
Copy link
Member Author

jglick commented Sep 19, 2017

@reviewbybees done

@abayer abayer merged commit e080b50 into jenkinsci:master Nov 6, 2017
@jglick jglick deleted the new-Groovy-JENKINS-33358 branch November 27, 2017 20:18
@jglick jglick mentioned this pull request Dec 1, 2017
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.

2 participants