ci: only abort on doc-change when running for PRs

In case a job has been started without a PR (manual, or timed), the
current checked out branch matches the original as there are not
additional changes in the tree. There is no need to abort the jobs when
the skip-doc-change.sh script did not detect any non-doc changes, as
there are no changes at all.

Updates: #1963
Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2021-04-09 11:29:28 +02:00 committed by mergify[bot]
parent 8f84e592d5
commit c04a319aa9
6 changed files with 6 additions and 6 deletions

View File

@ -40,7 +40,7 @@ node('cico-workspace') {
returnStatus: true)
}
// if doc_change (return value of skip-doc-change.sh is 1, do not run the other stages
if (doc_change == 1) {
if (doc_change == 1 && ref != git_since) {
currentBuild.result = 'SUCCESS'
return
}

View File

@ -58,7 +58,7 @@ node('cico-workspace') {
returnStatus: true)
}
// if doc_change (return value of skip-doc-change.sh is 1, do not run the other stages
if (doc_change == 1) {
if (doc_change == 1 && ref != git_since) {
currentBuild.result = 'SUCCESS'
return
}

View File

@ -68,7 +68,7 @@ node('cico-workspace') {
returnStatus: true)
}
// if doc_change (return value of skip-doc-change.sh is 1, do not run the other stages
if (doc_change == 1) {
if (doc_change == 1 && ref != git_since) {
currentBuild.result = 'SUCCESS'
return
}

View File

@ -84,7 +84,7 @@ node('cico-workspace') {
returnStatus: true)
}
// if doc_change (return value of skip-doc-change.sh is 1, do not run the other stages
if (doc_change == 1) {
if (doc_change == 1 && ref != git_since) {
currentBuild.result = 'SUCCESS'
return
}

View File

@ -81,7 +81,7 @@ node('cico-workspace') {
returnStatus: true)
}
// if doc_change (return value of skip-doc-change.sh is 1, do not run the other stages
if (doc_change == 1) {
if (doc_change == 1 && ref != git_since) {
currentBuild.result = 'SUCCESS'
return
}

View File

@ -81,7 +81,7 @@ node('cico-workspace') {
returnStatus: true)
}
// if doc_change (return value of skip-doc-change.sh is 1, do not run the other stages
if (doc_change == 1) {
if (doc_change == 1 && ref != git_since) {
currentBuild.result = 'SUCCESS'
return
}