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-44266, JENKINS-36654] Fix PCT for 2.46.2 #103

Merged
merged 6 commits into from
Jun 16, 2017

Conversation

varyvol
Copy link

@varyvol varyvol commented May 15, 2017

JENKINS-44266

  • Bump core version.
  • Bump some plugins versions.
  • Remove HudsonTestCase and use JenkinsRule.

@reviewbybees @oleg-nenashev @kwhetstone

@ghost
Copy link

ghost commented May 15, 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.

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.

This seems suspicious. There is no mention of subversion (or Subversion or svn) in the repository. So why do tests need this dependency?

When filing issues like JENKINS-44266 it would be appreciated if you would mention what the actual test failures are. Otherwise it is very difficult for reviewers to understand why you are proposing a change.

Copy link
Member

@oleg-nenashev oleg-nenashev left a comment

Choose a reason for hiding this comment

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

🐛 until the issue gets clarified in JIRA. It is a very bad practice to report issues without explaining them (repro steps, stacktrace, link to failing test, etc.). Does not add much value to the Knowledge Base

@varyvol
Copy link
Author

varyvol commented May 16, 2017

@jglick @oleg-nenashev it's the usual issue with transitive test dependencies. I have improved the JIRA issue with the actual error message.

@jglick
Copy link
Member

jglick commented May 16, 2017

So does jenkinsci/plugin-compat-tester#28 fix it?

@varyvol
Copy link
Author

varyvol commented May 16, 2017

@jglick no, that would avoid a transitive optional dependency to be added to the POM, but this is failing even without modifying the POM (check that the command just changes the core version).

@jglick
Copy link
Member

jglick commented May 16, 2017

I thought I saw that this plugin was not in the dependency:tree but I forget now.

@varyvol
Copy link
Author

varyvol commented May 25, 2017

@oleg-nenashev @jglick do you think this need further work?

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.

I suspect what you actually wanted to do was update the parent POM so as to pick up jenkinsci/jenkins-test-harness#54. But this seems harmless anyway.

@varyvol
Copy link
Author

varyvol commented Jun 1, 2017

@oleg-nenashev could you review this again?

Copy link
Member

@oleg-nenashev oleg-nenashev left a comment

Choose a reason for hiding this comment

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

Subversion plugin 2.5.2 requires Jenkins Core 1.568: https://github.com/jenkinsci/subversion-plugin/blob/subversion-2.5.2/pom.xml#L31

This plugin declares compatibility with 1.565. It means that all default testing will be effectively running with possibly unstable configuration.

As a maintainer, I suggest bumping the core dependency to 1.609.3 as a dependency resolution measure. I would also recommend to pick the new parent pom (2.27+) with JTH 2.22 as @jglick suggests. Probably there will be no need in such hack after that.

If you have no time for it, I will take a look later

@varyvol
Copy link
Author

varyvol commented Jun 9, 2017

@oleg-nenashev I will look at it, don't worry.

@varyvol
Copy link
Author

varyvol commented Jun 9, 2017

@oleg-nenashev done and yes, adding subversion is not necessary now.
@jglick it would be great if you could review this again.

Copy link
Member

@oleg-nenashev oleg-nenashev left a comment

Choose a reason for hiding this comment

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

Some changes are really unrelated, but it is a good refactoring anyway. I will need to check the dependencies before merging.

Ideally @Bug annotations should be replaced by @Issue

🐛 for removing repositories from pom.xml

pom.xml Outdated
@@ -47,43 +47,11 @@
</license>
</licenses>

<repositories>
Copy link
Member

Choose a reason for hiding this comment

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

🐛 In such case it won't be able to retrieve Parent pom if it is missing in the local cache.

OTOH you can simplify it to

    <repositories> 
      <repository>
        <id>repo.jenkins-ci.org</id>
        <url>http://repo.jenkins-ci.org/public/</url>
      </repository>
    </repositories>
    <pluginRepositories>
      <pluginRepository>
        <id>repo.jenkins-ci.org</id>
        <url>http://repo.jenkins-ci.org/public/</url>
      </pluginRepository>
    </pluginRepositories>

Copy link
Member

Choose a reason for hiding this comment

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

Well, use https but otherwise yes that is the standard blurb.

Copy link
Member

Choose a reason for hiding this comment

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

copypasted from the wrong plugin :(

Copy link
Author

Choose a reason for hiding this comment

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

My bad, I thought this was already included in the parent POM.

@varyvol
Copy link
Author

varyvol commented Jun 12, 2017

@oleg-nenashev I have added back the "repositories" tag and replaced @Bug for @Issue.

@@ -22,7 +21,7 @@
@Rule
public JenkinsRule j = new JenkinsRule();

@Bug(7972)
@Issue("7972")
Copy link
Member

Choose a reason for hiding this comment

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

Please use full id, e.g. "JENKINS-7972"

Copy link
Author

Choose a reason for hiding this comment

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

Done.

@oleg-nenashev
Copy link
Member

It also fixes https://issues.jenkins-ci.org/browse/JENKINS-36654 from what I see

@oleg-nenashev oleg-nenashev changed the title [JENKINS-44266] Fix PCT for 2.46.2 [JENKINS-44266, JENKINS-36654] Fix PCT for 2.46.2 Jun 12, 2017
Copy link
Member

@oleg-nenashev oleg-nenashev left a comment

Choose a reason for hiding this comment

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

🐝 and @reviewbybees done

@oleg-nenashev
Copy link
Member

Merging. Will see if I can release it today

@oleg-nenashev oleg-nenashev merged commit 22ec3e2 into jenkinsci:master Jun 16, 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.

4 participants