projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update base image for Airflow to support Python 3.10
[osm/devops.git]
/
jenkins
/
ci-pipelines
/
ci_stage_2.groovy
diff --git
a/jenkins/ci-pipelines/ci_stage_2.groovy
b/jenkins/ci-pipelines/ci_stage_2.groovy
index
a6dcfa4
..
0691dcc
100644
(file)
--- a/
jenkins/ci-pipelines/ci_stage_2.groovy
+++ b/
jenkins/ci-pipelines/ci_stage_2.groovy
@@
-147,9
+147,14
@@
def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa
for (charmPath in charms) {
def directory = charmPath
if (fileExists("$charmPath/charmcraft.yaml")) {
for (charmPath in charms) {
def directory = charmPath
if (fileExists("$charmPath/charmcraft.yaml")) {
- CHECK_CHANGES = "git diff --name-only origin/$GERRIT_BRANCH -- $directory |wc -l"
+ if (isMergeJob) {
+ CHECK_CHANGES = "git diff --name-only HEAD^1 -- $directory |wc -l"
+ } else {
+ CHECK_CHANGES = "git diff --name-only origin/$GERRIT_BRANCH -- $directory |wc -l"
+ }
charmsChanged = sh(returnStdout:true, script: CHECK_CHANGES).trim()
charmsChanged = sh(returnStdout:true, script: CHECK_CHANGES).trim()
- if (charmsChanged != "0" || isMergeJob) {
+
+ if (charmsChanged != "0") {
println("$directory has changes, rebuilding")
parallelSteps[directory] = {
println("$directory has changes, rebuilding")
parallelSteps[directory] = {