ubuntu20 as base image for OSM installation

[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 44e6ae9..c3880b0 100644 (file)
--- 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] = {
@@ -201,7 +207,7 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa
                                     def channel="latest"
                                     if (BRANCH_NAME.startsWith("v")) {
                                         channel=BRANCH_NAME.substring(1)
-                                    } else if (BRANCH_NAME!="master") {
+                                    } else if (BRANCH_NAME!="master" && JOB_NAME.contains('merge')) {
                                         charmBranch=BRANCH_NAME
                                     }
 
@@ -213,15 +219,28 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa
                                     try {
                                         def resourceName = sh(
                                             returnStdout:true,
-                                            script: "cat metadata.yaml | yq '.resources | keys | .[0]'").trim()
+                                            script: "cat metadata.yaml | yq '.resources | keys | .[0]'"
+                                        ).trim()
+                                        if( resourceName != "null" ) {
+                                            sh "charmcraft resource-revisions $charmName $resourceName | head -2 | tail -1 | awk '{print \$1}'"
+                                            def resourceVers = sh(
+                                                returnStdout:true,
+                                                script: "charmcraft resource-revisions $charmName $resourceName | head -2 | tail -1 | awk '{print \$1}'"
+                                            ).trim()
 
-                                        resourceArgument = "--resource $resourceName:1"
+                                            resourceArgument = "--resource $resourceName:$resourceVers"
 
-                                        resourceName = sh(
-                                            returnStdout:true,
-                                            script: "cat metadata.yaml | yq '.resources | keys | .[1]'").trim()
-                                        if( resourceName != "null" ) {
-                                            resourceArgument += " --resource $resourceName:1"
+                                            resourceName = sh(
+                                                returnStdout:true,
+                                                script: "cat metadata.yaml | yq '.resources | keys | .[1]'").trim()
+
+                                            if( resourceName != "null" ) {
+                                                resourceVers = sh(
+                                                    returnStdout:true,
+                                                    script: "charmcraft resource-revisions $charmName $resourceName | head -2 | tail -1 | awk '{print \$1}'"
+                                                ).trim()
+                                                resourceArgument += " --resource $resourceName:$resourceVers"
+                                            }
                                         }
 
                                     } catch (Exception discard) {