-
Improvement
-
Resolution: Unresolved
-
Minor
-
None
We use multibranch pipelines for our project, it works pretty well and it is nice to have PRs tested merged with the master branch, we also use Blueocean for our UI, and here we have to use a workaround to make our UI user-friendly.
Our jobs spin 100-150 test in parallel, BO is not really user-friendly with that amount of parallel stages so we make groups and launch a downstream job for each group, at this point all OK, the problem starts when you try to pass the GIT_COMMIT
to the downstream job if the master branch has changed when the checkout make the merge, the resulting commit (GIT_COMMIT env variable) is not in the repo,so the downstream job cannot checkout the GIT_COMMIT and it fails.
I can pass the GIT_BRANCH but I'd prefer to pass the commit sha1. I start to play with `git rev-list HEAD -4` and `git reflog -6` to see if always have the same pattern and try to grab the correct commit sha1, but I start thinking that should be a better way.
Also, I can disable the merge and make it on the downstream job but I don't like it either.
GIT_PREVIOUS_COMMIT also point to an existing commit so I cannot use it.
In this example, the PR head commit is `08da92d31512c4a0c24948bc80f911f83c075070`, but GIT_COMMIT points to'7c36975a772dbab59e20169a0ac01e60fb6db739' and GIT_PREVIOUS_COMMIT to '6cd1da59add5d188cad41b9cbdcd33f4a7241c63' none of those in the repo
using credential token > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url https://github.com/org/repo.git # timeout=10 Fetching without tags Fetching upstream changes from https://github.com/org/repo.git > git --version # timeout=10 using GIT_ASKPASS to set credentials GitHub user @elasticmachine User + Personal Access Token > git fetch --no-tags --progress https://github.com/org/arepo.git +refs/pull/352/head:refs/remotes/origin/PR-352 +refs/heads/master:refs/remotes/origin/master Merging remotes/origin/master commit e067dce0923be39f9b48e721240cf26ee083ab9e into PR head commit 08da92d31512c4a0c24948bc80f911f83c075070 > git config core.sparsecheckout # timeout=10 > git checkout -f 08da92d31512c4a0c24948bc80f911f83c075070 > git merge e067dce0923be39f9b48e721240cf26ee083ab9e # timeout=10 > git rev-parse HEAD^{commit} # timeout=10 Merge succeeded, producing a620f8fbd54f038733b1b238d90c59ccf18f3fc1 Checking out Revision a620f8fbd54f038733b1b238d90c59ccf18f3fc1 (PR-352) Commit message: "Merge commit 'e067dce0923be39f9b48e721240cf26ee083ab9e' into HEAD" First time build. Skipping changelog. > git checkout -f 08da92d31512c4a0c24948bc80f911f83c075070 > git merge e067dce0923be39f9b48e721240cf26ee083ab9e # timeout=10 > git rev-parse HEAD^{commit} # timeout=10 > git config core.sparsecheckout # timeout=10 > git checkout -f a620f8fbd54f038733b1b238d90c59ccf18f3fc1 > git rev-list --no-walk 6cd1da59add5d188cad41b9cbdcd33f4a7241c63 # timeout=10
[2019-02-28T19:36:16.610Z] export GIT_BRANCH='PR-352' [2019-02-28T19:36:16.838Z] export GIT_COMMIT='7c36975a772dbab59e20169a0ac01e60fb6db739' [2019-02-28T19:36:16.838Z] export GIT_PREVIOUS_COMMIT='6cd1da59add5d188cad41b9cbdcd33f4a7241c63'
I can grab `git HEAD -1` but I am not sure always would be correct because if there aren't changes on the master branch GIT_COMMIT is correct.
[2019-02-28T19:36:16.838Z] + git reflog -6
[2019-02-28T19:36:16.838Z] a620f8f HEAD@{0}: merge e067dce0923be39f9b48e721240cf26ee083ab9e: Merge made by the 'recursive' strategy.
[2019-02-28T19:36:16.838Z] 08da92d HEAD@{1}: checkout: moving from master to 08da92d31512c4a0c24948bc80f911f83c075070
[2019-02-28T19:36:16.838Z] + git rev-list HEAD -4 [2019-02-28T19:36:16.838Z] a620f8fbd54f038733b1b238d90c59ccf18f3fc1 [2019-02-28T19:36:16.838Z] 08da92d31512c4a0c24948bc80f911f83c075070 [2019-02-28T19:36:16.838Z] 6646f0310ea4e6e176faa178a6a2ecf3be11168b [2019-02-28T19:36:16.838Z] 6ff5224c0892801c2632be855d91a38426677ba5
the workaround is to use git to calculate the commit
def getBaseCommit(){
def baseCommit = ''
def latestCommit = sh(label: 'Get previous commit', script: "git rev-parse HEAD", returnStdout: true)?.trim()
def previousCommit = sh(label: 'Get previous commit', script: "git rev-parse HEAD^", returnStdout: true)?.trim()
if(env?.CHANGE_ID == null){
baseCommit = env.GIT_COMMIT
} else if("${env.GIT_COMMIT}".equals("${latestCommit}")){
baseCommit = env.GIT_COMMIT
} else {
baseCommit = previousCommit
}
env.GIT_BASE_COMMIT = baseCommit
return baseCommit
}
Google groups conversation about it
https://groups.google.com/forum/?utm_medium=email&utm_source=footer#!msg/jenkinsci-dev/Dus0VX6y04g/XwVPA8odBwAJ