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

Using RestartableJenkinsRule.then #2959

Merged
merged 6 commits into from
Sep 6, 2017
Merged

Using RestartableJenkinsRule.then #2959

merged 6 commits into from
Sep 6, 2017

Conversation

jglick
Copy link
Member

@jglick jglick commented Aug 1, 2017

Downstream of jenkinsci/jenkins-test-harness#66.

@reviewbybees

@ghost
Copy link

ghost commented Aug 1, 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.

oleg-nenashev
oleg-nenashev approved these changes Aug 2, 2017
View reviewed changes
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.

🐝 once JTH is released

daniel-beck
daniel-beck approved these changes Aug 2, 2017
View reviewed changes
Copy link
Member

@daniel-beck daniel-beck left a comment

Choose a reason for hiding this comment

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

Reviewer diff: https://github.com/jenkinsci/jenkins/pull/2959/files?w=1

@oleg-nenashev
Copy link
Member

@reviewbybees done. Ready to go once the changes pass.
IMHO it requires an internal changelog entry since we pick major changes in JTH: https://github.com/jenkinsci/jenkins-test-harness#changelog . E.g. new Jetty version

@jglick
Copy link
Member Author

jglick commented Aug 2, 2017

we pick major changes in JTH

So? They are not exposed to plugins.

@jglick jglick added ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback and removed ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback labels Aug 4, 2017
@jglick
Copy link
Member Author

jglick commented Aug 4, 2017

Passing on Linux. The Windows nodes seem to be extremely slow. Need to investigate whether something in this PR is actually responsible.

jglick
jglick commented Aug 4, 2017
View reviewed changes
test/pom.xml Outdated
@@ -53,7 +53,7 @@ THE SOFTWARE.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jenkins-test-harness</artifactId>
<version>2.20</version>
<version>2.24</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.

Changelog

I am wondering if jenkinsci/jenkins-test-harness#63 is responsible for the extremely slow Windows builds (2× time on Linux), or if this is just random bad luck. Other recent PRs seem to complete, though certainly more slowly than I would expect.

@jglick jglick mentioned this pull request Aug 4, 2017
Closed
@oleg-nenashev oleg-nenashev added the on-hold This pull request depends on another event/release, and it cannot be merged right now label Aug 4, 2017
@oleg-nenashev
Copy link
Member

I have put it on hold to let @jglick investigate the JTH issues.
I suffer from Windows build time in Remoting without Jetty, so I am not sure the referenced PR is related

jglick
jglick commented Aug 8, 2017
View reviewed changes
Jenkinsfile Outdated
@@ -32,7 +32,7 @@ for(i = 0; i < buildTypes.size(); i++) {

// Now run the actual build.
stage("${buildType} Build / Test") {
timeout(time: 180, unit: 'MINUTES') {
timeout(time: 240, unit: 'MINUTES') {
Copy link
Member Author

Choose a reason for hiding this comment

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

Getting timeouts; cf. #2967.

@kohsuke kohsuke mentioned this pull request Sep 5, 2017
Closed
2 tasks
@oleg-nenashev oleg-nenashev added the unresolved-merge-conflict There is a merge conflict with the target branch. label Sep 5, 2017
@oleg-nenashev
Copy link
Member

Merge conflict

@jglick jglick removed on-hold This pull request depends on another event/release, and it cannot be merged right now unresolved-merge-conflict There is a merge conflict with the target branch. labels Sep 5, 2017
oleg-nenashev
oleg-nenashev approved these changes Sep 5, 2017
View reviewed changes
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.

🐝 if the test passes

jglick
jglick commented Sep 6, 2017
View reviewed changes
test/src/test/java/hudson/cli/CLIActionTest.java
@@ -255,6 +256,7 @@ public void encodingAndLocale() throws Exception {
// -ssh mode does not pass client locale or encoding
}

@Ignore("TODO JENKINS-46659 seems to be broken")
Copy link
Member Author

Choose a reason for hiding this comment

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

JENKINS-46659 appears to have been the cause of the earlier failures, as well as those in #2754.

@jglick jglick merged commit 68f5585 into jenkinsci:master Sep 6, 2017
@jglick jglick deleted the lambdas branch September 6, 2017 01:41
@jglick jglick mentioned this pull request Sep 13, 2017
Merged
@jglick jglick mentioned this pull request Sep 29, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@daniel-beck daniel-beck daniel-beck approved these changes

@oleg-nenashev oleg-nenashev oleg-nenashev approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jglick @oleg-nenashev @daniel-beck