Skip to content
Snippets Groups Projects

Addresses regression with jenkins setup that does not use the multiproject setup

Merged username-removed-106509 requested to merge chrisrohr/gitlab-ee:master into master

The Jenkins Gitlab Hook Plugin allows for two kinds of setups. One where a Jenkins job is created for each branch and one where all branches are built in a single Jenkins job. MR !9 (merged) added support for the multi-job setup but broke the single job setup. This request addresses #30 (closed) and fixes the regression.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • @chrisrohr The rest looks good! :thumbsup: Can you make a fix for my comment and confirm that tests are green so we can merge it?

    Edited by username-removed-444
  • Added 1 commit:

    • f80ca51b - Cleaned up conditional syntax
  • @dzaporozhets I cleaned up the conditional and manually have confirmed the tests, regardless I setup CI and the build is running.

  • username-removed-444 Status changed to merged

    Status changed to merged

  • mentioned in commit 086bf47e

  • @chrisrohr btw you might need to click Enable shared runners button to make builds running

  • Thank you for reviewing and merging @dzaporozhets

    @rspeicher can you make sure this gets added to the next patch release?

  • @patricio and @dzaporozhets Thanks for bringing in my fix. One note just so you are aware. There seemed to have slipped into this another patch I was going to submit once this got in. If you look at the changes of my last commit, there is another option added to the screen to allow the unstable jenkins builds to be configured to show as failed or success. This is related to !11 (merged) and !18 (closed) that were merged in a while back. I apologize for this oversight, but the extra code did include tests that passed.

  • @chrisrohr yes thank you for mention it. Code looks good and have test so should be safe

  • Picked into 8-0-stable-ee.

  • mentioned in commit 9dd93813

  • Mentioned in commit 086bf47e

  • Please register or sign in to reply
    Loading