mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-12 17:30:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: move skip-e2e-check after GitHub API usage

Browse Source 
When the [ci/skip/e2e] label is set on PRs, the withCredentials()
statement is aborted, but the other stages still continue. This causes
the tests to run, which is not what we want when the label is added.

Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2020-10-20 08:20:19 +02:00 committed by mergify[bot]
parent ed671ec207
commit 126fcd4cb5
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mini-e2e-helm.groovy
View File

@ -35,11 +35,6 @@ node('cico-workspace') {
script: "./scripts/get_github_labels.py --id=${ghprbPullId} --has-label=ci/skip/e2e", script: "./scripts/get_github_labels.py --id=${ghprbPullId} --has-label=ci/skip/e2e",
returnStatus: true) returnStatus: true)
} }
// if skip_e2e returned 0, do not run full tests
if (skip_e2e == 0) {
currentBuild.result = 'SUCCESS'
return
}
stage("detect k8s-${k8s_version} patch release") { stage("detect k8s-${k8s_version} patch release") {
k8s_release = sh( k8s_release = sh(
@ -49,6 +44,12 @@ node('cico-workspace') {
} }
} }
// if skip_e2e returned 0, do not run full tests
if (skip_e2e == 0) {
currentBuild.result = 'SUCCESS'
return
}
stage('checkout PR') { stage('checkout PR') {
if (params.ghprbPullId != null) { if (params.ghprbPullId != null) {
ref = "pull/${ghprbPullId}/head" ref = "pull/${ghprbPullId}/head"

11
mini-e2e.groovy
View File

@ -32,11 +32,6 @@ node('cico-workspace') {
script: "./scripts/get_github_labels.py --id=${ghprbPullId} --has-label=ci/skip/e2e", script: "./scripts/get_github_labels.py --id=${ghprbPullId} --has-label=ci/skip/e2e",
returnStatus: true) returnStatus: true)
} }
// if skip_e2e returned 0, do not run full tests
if (skip_e2e == 0) {
currentBuild.result = 'SUCCESS'
return
}
stage("detect k8s-${k8s_version} patch release") { stage("detect k8s-${k8s_version} patch release") {
k8s_release = sh( k8s_release = sh(
@ -46,6 +41,12 @@ node('cico-workspace') {
} }
} }
// if skip_e2e returned 0, do not run full tests
if (skip_e2e == 0) {
currentBuild.result = 'SUCCESS'
return
}
stage('checkout PR') { stage('checkout PR') {
if (params.ghprbPullId != null) { if (params.ghprbPullId != null) {
ref = "pull/${ghprbPullId}/head" ref = "pull/${ghprbPullId}/head"

11
upgrade-tests.groovy
View File

@ -32,11 +32,6 @@ node('cico-workspace') {
script: "./scripts/get_github_labels.py --id=${ghprbPullId} --has-label=ci/skip/e2e", script: "./scripts/get_github_labels.py --id=${ghprbPullId} --has-label=ci/skip/e2e",
returnStatus: true) returnStatus: true)
} }
// if skip_e2e returned 0, do not run full tests
if (skip_e2e == 0) {
currentBuild.result = 'SUCCESS'
return
}
stage("detect k8s-${k8s_version} patch release") { stage("detect k8s-${k8s_version} patch release") {
k8s_release = sh( k8s_release = sh(
@ -46,6 +41,12 @@ node('cico-workspace') {
} }
} }
// if skip_e2e returned 0, do not run full tests
if (skip_e2e == 0) {
currentBuild.result = 'SUCCESS'
return
}
stage('checkout PR') { stage('checkout PR') {
if (params.ghprbPullId != null) { if (params.ghprbPullId != null) {
ref = "pull/${ghprbPullId}/head" ref = "pull/${ghprbPullId}/head"