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

Fix race condition in JenkinsTriggerHelper #229

Merged
merged 3 commits into from
Feb 3, 2017
Merged

Fix race condition in JenkinsTriggerHelper #229

merged 3 commits into from
Feb 3, 2017

Conversation

Veske
Copy link
Contributor

@Veske Veske commented Feb 3, 2017

Fix race condition in JenkinsTriggerHelper

@Veske Veske closed this Feb 3, 2017
@Veske Veske reopened this Feb 3, 2017
@khmarbaise
Copy link
Member

I have checked the build it's not your fault the failing build....

@Veske
Copy link
Contributor Author

Veske commented Feb 3, 2017

Alright, I don't have the options currently to set-up the environment to run your IT tests also. Will wait till you guys can figure it out then.

@khmarbaise
Copy link
Member

khmarbaise commented Feb 3, 2017 •
edited
Loading

So the problem was a fix which failed an integration tests which was an wrong implementation...which is now fixed...Can you please rebase against current master...

khmarbaise and others added 2 commits February 3, 2017 22:46
@khmarbaise
Fixed jenkinsci#220 Followup
984d828 
     o getViews() default api/json?depth=1 cause timeout
       but that change has caused in a failing integration
       test case which is now fixed by using tree=.. parameters.
Simplify the triggerJobAndWaitUntilFinished method a bit
628dd1a 
Make the polling rate configurable
@Veske
Copy link
Contributor Author

Veske commented Feb 3, 2017 •
edited
Loading

I might have messed up the PR, includes your changes also. Can you check if it's okay? Also if you could advice me on how to run these IT tests then I could maybe write an IT for this also later. Right now I wrote it "blindly".

@khmarbaise
Copy link
Member

You can the IT's simply by using: mvn -Prun-docker-its clean verify But you need to start the docker container in the sub project jenkins-client-it-docker first (and run the script build-docker.sh first and afterwards start-docker.sh) ...You need of course Docker(version 1.12 recommended) installed on your machine...

BTW: Currently I'm trying to make that more simpler, cause I find it too complex as well...But the travis build already says everything looks ok...

I assume you did something wrong while you tried to do the rebase...
Simply can be done in your branch:
git rebase master

This will integrate all changes from the master which have been committed after you have created your branch...in the end a git log -1 should show only your single commit...you have made..Afterwards you need to do a git push --force origin BRANCH which will push that back...

@khmarbaise khmarbaise merged commit a1ef2d0 into jenkinsci:master Feb 3, 2017
@khmarbaise
Copy link
Member

Looks fine so far, cause I got only a fast-forward pull...No problem.

@khmarbaise khmarbaise added this to the Release 0.3.8 milestone Feb 3, 2017
@Veske
Copy link
Contributor Author

Veske commented Feb 3, 2017

I mean the method it self, that it works. Not at work currently, have nothing to test against. Did look ok tough.

@khmarbaise
Copy link
Member

Updated the ReleaseNotes with a hint to your GitHub reference. Thanks for your pull request.

@khmarbaise
Copy link
Member

Can you now close the PR...

@Veske
Copy link
Contributor Author

Veske commented Feb 3, 2017

Umh... It's closed now, no?

@khmarbaise
Copy link
Member

Ah sorry..missed that it is already closed. Sorry..

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
enhancement
Projects
None yet
Milestone
Release 0.3.8
Development

Successfully merging this pull request may close these issues.
2 participants
@Veske @khmarbaise