X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_2.groovy;h=6722e47b74bc094a6a42d67f934f1c491ec3fe3e;hb=fd97f814dcd29f877db7f7f689bfc0b551d37e12;hp=a6dcfa460e15b7bf44bd3607164bc7f4d993cf97;hpb=27da38deb3b184608a6d66ab6bc476506d8d7301;p=osm%2Fdevops.git

diff --git a/jenkins/ci-pipelines/ci_stage_2.groovy b/jenkins/ci-pipelines/ci_stage_2.groovy
index a6dcfa46..6722e47b 100644
--- a/jenkins/ci-pipelines/ci_stage_2.groovy
+++ b/jenkins/ci-pipelines/ci_stage_2.groovy
@@ -139,6 +139,7 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa
             'installers/charm/osm-ng-ui',
             'installers/charm/osm-pol',
             'installers/charm/osm-ro',
+            'installers/charm/osm-update-db-operator',
             'installers/charm/prometheus',
             'installers/charm/vca-integrator-operator',
         ]
@@ -147,9 +148,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")) {
-                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] = {
@@ -260,7 +266,8 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa
             def downstream_params_stage_3 = [
                 string(name: 'GERRIT_BRANCH', value: "${branch}"),
                 string(name: 'INSTALLER', value: "Default" ),
-                string(name: 'OPENSTACK_BASE_IMAGE', value: "ubuntu20.04" ),
+                string(name: 'OPENSTACK_BASE_IMAGE', value: "ubuntu22.04" ),
+                string(name: 'OPENSTACK_OSM_FLAVOR', value: "osm.sanity" ),
                 string(name: 'UPSTREAM_JOB_NAME', value: "${JOB_NAME}" ),
                 string(name: 'UPSTREAM_JOB_NUMBER', value: "${BUILD_NUMBER}" ),
                 booleanParam(name: 'DO_STAGE_4', value: do_stage_4 )