(FM-6170) Addition of branch check for build number creation #190
Conversation
HelenCampbell
force-pushed
the
cibranchupdate
branch
2 times, most recently
from
c151dd2
to
5f8e4c4
Compare
|
Please use |
| @@ -500,10 +500,15 @@ def max_thread_limit | |||
| end | |||
|
|
|||
| sha = `git rev-parse HEAD`[0..7] | |||
| branch = `git branch` | |||
There was a problem hiding this comment.
Might be better to use git rev-parse --abbrev-ref HEAD
Doesn't require any magic text parsing.
|
|
||
| # If we're in a CI environment include our build number | ||
| if build = ENV['BUILD_NUMBER'] || ENV['TRAVIS_BUILD_NUMBER'] | ||
| new_version = sprintf('%s-%04d-%s', version, build, sha) | ||
| if branch.include? "* release" |
There was a problem hiding this comment.
Should we really be special casing release branch? Can we make this generic?
e.g. for master, append nothing. for any other branch append, say the first 7 letters or something?
There was a problem hiding this comment.
I don't think there's any reason to make this generic? We only ever juggle the two branches on CI. If someone else adds another job they'll need to decide for themselves if it requires the amendment. Though I'll maybe add a comment saying why it's needed so others know what's going on here :)
|
Waiting for CLA signature by @HelenCampbell @HelenCampbell - We require a Contributor License Agreement (CLA) for people who contribute to Puppet, but we have an easy click-through license with instructions, which is available at https://cla.puppet.com/ Note: if your contribution is trivial and you think it may be exempt from the CLA, please post a short reply to this comment with details. http://docs.puppet.com/community/trivial_patch_exemption.html |
HelenCampbell
force-pushed
the
cibranchupdate
branch
from
5f8e4c4
to
d5fe67d
Compare
HelenCampbell
force-pushed
the
cibranchupdate
branch
from
d5fe67d
to
3e25fd5
Compare
The build ID on the release pipelines were occasionally causing the builds to break due to having the same or an already existing build number on master job. This PR provides the addition of a simple branch check followed by adding an 'r' to the release branch jobs - ensuring the conflict doesn't happen again.