Skip to content

Commit

Permalink
fix(CI): push images on merge to develop
Browse files Browse the repository at this point in the history
Don't abort when indexing, instead run but only push images.
  • Loading branch information
tiagolobocastro authored and Paul Yoong committed May 27, 2022
1 parent 7b0b0eb commit 431af9f
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -120,14 +120,6 @@ def notifySlackUponE2EFailure(build) {
}
}

// Will ABORT current job for cases when we don't want to build
if (currentBuild.getBuildCauses('jenkins.branch.BranchIndexingCause') &&
BRANCH_NAME == "develop") {
print "INFO: Branch Indexing, aborting job."
currentBuild.result = 'ABORTED'
return
}

// Only schedule regular builds on develop branch, so we don't need to guard against it
// Run only on one Mayastor pipeline
String job_base_name = getJobBaseName()
Expand Down Expand Up @@ -160,6 +152,15 @@ if (params.e2e_continuous == true) {
}
e2e_alias_tag = getAliasTag()

if (currentBuild.getBuildCauses('jenkins.branch.BranchIndexingCause') &&
BRANCH_NAME == "develop") {
print "INFO: Branch Indexing, skip tests and push the new images."
run_linter = false
rust_test = false
grpc_test = false
pytest_test = false
}

pipeline {
agent none
options {
Expand Down

0 comments on commit 431af9f

Please sign in to comment.