commit 5d9ce300ce3f5aaeaa635a49ae2c3cee819a4d7d
author Mark Beierl <mark.beierl@canonical.com> Sat Jan 28 04:05:48 2023 +0000
committer Mark Beierl <mark.beierl@canonical.com> Sat Jan 28 04:05:48 2023 +0000
tree 4e4bdf77e9a07bcd7e76abee958d2874240dbab9
parent 810002d5ecce421a50534052f79ffafaa4231a4d

Improve Merge Job Speed

Checks for charms that were changed for the merge job too
instead of forcing all charms to be rebuilt

Change-Id: I9018813ba087cd968968dc98f6167097a8ca4bdb
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>

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
--- a/jenkins/ci-pipelines/ci_stage_2.groovy
+++ b/jenkins/ci-pipelines/ci_stage_2.groovy
@@ -147,9 +147,14 @@
         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()
-                if (charmsChanged != "0" || isMergeJob) {
+
+                if (charmsChanged != "0") {
                     println("$directory has changes, rebuilding")
 
                     parallelSteps[directory] = {