Merge remote-tracking branch 'origin/master' into paas

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

diff --combined jenkins/ci-pipelines/ci_stage_2.groovy
index 6ca88f0,0691dcc..ddee6f4
--- 1/jenkins/ci-pipelines/ci_stage_2.groovy
--- 2/jenkins/ci-pipelines/ci_stage_2.groovy
+++ b/jenkins/ci-pipelines/ci_stage_2.groovy
@@@ -139,8 -139,6 +139,8 @@@ def ci_pipeline(mdg,url_prefix,project,
              'installers/charm/osm-ng-ui',
              'installers/charm/osm-pol',
              'installers/charm/osm-ro',
 +            'installers/charm/osm-temporal',
 +            'installers/charm/osm-temporal-ui',
              'installers/charm/prometheus',
              'installers/charm/vca-integrator-operator',
          ]
@@@ -149,9 -147,14 +149,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] = {