Skip to content

Commit 4b93ef8

Browse files
thst-nordicmbolivar-nordic
authored andcommitted
[nrf noup] ci: allow jenkins build plans on tags
Use {env.TAG_NAME} in jenkinsfile to find correct COMMIT_RANGE Signed-off-by: Thomas Stilwell <[email protected]> (cherry picked from commit 330fd0f) (cherry picked from commit 4aa8728) Signed-off-by: Martí Bolívar <[email protected]>
1 parent d962b65 commit 4b93ef8

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

Jenkinsfile

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,18 +62,31 @@ pipeline {
6262
dir('zephyr') {
6363
script {
6464
// If we're a pull request, compare the target branch against the current HEAD (the PR)
65+
println "CHANGE_TARGET = ${env.CHANGE_TARGET}"
66+
println "BRANCH_NAME = ${env.BRANCH_NAME}"
67+
println "TAG_NAME = ${env.TAG_NAME}"
68+
6569
if (env.CHANGE_TARGET) {
66-
COMMIT_RANGE = "origin/$CHANGE_TARGET..HEAD"
70+
COMMIT_RANGE = "origin/${env.CHANGE_TARGET}..HEAD"
6771
COMPLIANCE_ARGS = "$COMPLIANCE_ARGS $COMPLIANCE_REPORT_ARGS"
6872
sh "echo change id: $CHANGE_ID"
6973
sh "echo git commit: $GIT_COMMIT"
7074
sh "echo commit range: $COMMIT_RANGE"
7175
sh "git rev-parse origin/$CHANGE_TARGET"
7276
sh "git rev-parse HEAD"
77+
println "Building a PR: ${COMMIT_RANGE}"
78+
}
79+
else if (env.TAG_NAME) {
80+
COMMIT_RANGE = "tags/${env.BRANCH_NAME}..tags/${env.BRANCH_NAME}"
81+
println "Building a Tag: ${COMMIT_RANGE}"
7382
}
7483
// If not a PR, it's a non-PR-branch or master build. Compare against the origin.
75-
else {
84+
else if (env.BRANCH_NAME) {
7685
COMMIT_RANGE = "origin/${env.BRANCH_NAME}..HEAD"
86+
println "Building a Branch: ${COMMIT_RANGE}"
87+
}
88+
else {
89+
assert condition : "Build fails because it is not a PR/Tag/Branch"
7790
}
7891
// Run the compliance check
7992
try {

0 commit comments

Comments
 (0)