X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_3.groovy;h=90cd9f7b0166a4f64185bc98cac3aad59f05ce3b;hb=8375da1695c98bd23fcc226f0e26c20ac5710d1b;hp=c94b80a9d38843d49ff72081bb722def8b01a9d7;hpb=8a5650e095c5c279131f54c5dcab46dd521d10fd;p=osm%2Fdevops.git

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index c94b80a9..90cd9f7b 100644
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -34,6 +34,7 @@ properties([
         string(defaultValue: 'ubuntu22.04', description: '', name: 'OPENSTACK_BASE_IMAGE'),
         string(defaultValue: 'osm.sanity', description: '', name: 'OPENSTACK_OSM_FLAVOR'),
         booleanParam(defaultValue: false, description: '', name: 'TRY_OLD_SERVICE_ASSURANCE'),
+        booleanParam(defaultValue: true, description: '', name: 'TRY_JUJU_INSTALLATION'),
         booleanParam(defaultValue: false, description: '', name: 'SAVE_CONTAINER_ON_FAIL'),
         booleanParam(defaultValue: false, description: '', name: 'SAVE_CONTAINER_ON_PASS'),
         booleanParam(defaultValue: true, description: '', name: 'SAVE_ARTIFACTS_ON_SMOKE_SUCCESS'),
@@ -531,7 +532,7 @@ node("${params.NODE}") {
                     ]
 
                     sshCommand remote: remote, command: '''
-                        wget https://osm-download.etsi.org/ftp/osm-13.0-thirteen/install_osm.sh
+                        wget https://osm-download.etsi.org/ftp/osm-14.0-fourteen/install_osm.sh
                         chmod +x ./install_osm.sh
                         sed -i '1 i\\export PATH=/snap/bin:\$PATH' ~/.bashrc
                     '''
@@ -568,7 +569,10 @@ node("${params.NODE}") {
                         // Run -k8s installer here specifying internal docker registry and docker proxy
                         osm_installation_options = ""
                         if (params.TRY_OLD_SERVICE_ASSURANCE) {
-                            osm_installation_options = "--old-sa"
+                            osm_installation_options = "${osm_installation_options} --old-sa"
+                        }
+                        if (params.TRY_JUJU_INSTALLATION) {
+                            osm_installation_options = "${osm_installation_options} --juju --lxd"
                         }
                         withCredentials([gitlabCredentialsMap]) {
                             sshCommand remote: remote, command: """
@@ -712,24 +716,25 @@ EOF"""
                         } // stage('Snap promotion')
                         stage('Charm promotion') {
                             charms = [
-                                'osm', // bundle
-                                'osm-ha', // bundle
-                                'osm-grafana',
-                                'osm-mariadb',
-                                'mongodb-exporter-k8s',
-                                'mysqld-exporter-k8s',
-                                'osm-lcm',
-                                'osm-mon',
-                                'osm-nbi',
-                                'osm-ng-ui',
-                                'osm-pol',
-                                'osm-ro',
-                                'osm-prometheus',
-                                'osm-update-db-operator',
-                                'osm-vca-integrator',
+                                [name: 'osm',                       base: "22.04"],
+                                [name: 'osm-ha',                    base: "22.04"],
+                                [name: 'mongodb-exporter-k8s',      base: "20.04"],
+                                [name: 'mysqld-exporter-k8s',       base: "20.04"],
+                                [name: 'osm-grafana',               base: "20.04"],
+                                [name: 'osm-keystone',              base: "22.04"],
+                                [name: 'osm-lcm',                   base: "22.04"],
+                                [name: 'osm-mon',                   base: "22.04"],
+                                [name: 'osm-nbi',                   base: "22.04"],
+                                [name: 'osm-ng-ui',                 base: "22.04"],
+                                [name: 'osm-pol',                   base: "22.04"],
+                                [name: 'osm-ro',                    base: "22.04"],
+                                [name: 'osm-prometheus',            base: "20.04"],
+                                [name: 'osm-update-db-operator',    base: "20.04"],
+                                [name: 'osm-vca-integrator',        base: "22.04"],
                             ]
-                            for (charm in charms) {
-
+                            for (entry in charms) {
+                                charm = entry.name
+                                base = entry.base
                                 channel = 'latest'
                                 if (BRANCH_NAME.startsWith('v')) {
                                     channel = BRANCH_NAME.substring(1)
@@ -739,15 +744,15 @@ EOF"""
 
                                 withCredentials([string(credentialsId: 'Charmstore', variable: 'CHARMCRAFT_AUTH')]) {
                                     sh "charmcraft status $charm --format json > ${charm}.json"
-                                    isCharm = sh(returnStdout: true, script: "grep architecture ${charm}.json | wc -l").trim() as int
+                                    isCharm = sh(returnStdout: true, script: "grep architecture ${charm}.json | wc -l 2>/dev/null").trim() as int
                                     resourceArgument = ""
                                     if (isCharm) {
-                                        jqScriptEdge = "cat ${charm}.json | jq -r '.[] | select(.track==\"$channel\") | .mappings[] | select(.base.architecture==\"amd64\" and .base.channel==\"20.04\") | .releases[] | select(.channel==\"$channel/edge/merged\")| .version'|head -1"
-                                        jqScriptBeta = "cat ${charm}.json | jq -r '.[] | select(.track==\"$channel\") | .mappings[] | select(.base.architecture==\"amd64\" and .base.channel==\"20.04\") | .releases[] | select(.channel==\"$channel/beta\")| .version'|head -1"
+                                        jqScriptEdge = "cat ${charm}.json | jq -r '.[] | select(.track==\"$channel\") | .mappings[] | select(.base.architecture==\"amd64\" and .base.channel==\"$base\") | .releases[] | select(.channel==\"$channel/edge/merged\")| .version'|head -1"
+                                        jqScriptBeta = "cat ${charm}.json | jq -r '.[] | select(.track==\"$channel\") | .mappings[] | select(.base.architecture==\"amd64\" and .base.channel==\"$base\") | .releases[] | select(.channel==\"$channel/beta\")| .version'|head -1"
                                         index=0
                                         while (index < 5) {
-                                            resourceNameScript = "cat ${charm}.json | jq -r '.[] | select(.track==\"$channel\") | .mappings[] | select(.base.architecture==\"amd64\" and .base.channel==\"20.04\") | .releases[] | select(.channel==\"$channel/edge/merged\")| .resources[$index].name'|head -1"
-                                            resourceRevsScript = "cat ${charm}.json | jq -r '.[] | select(.track==\"$channel\") | .mappings[] | select(.base.architecture==\"amd64\" and .base.channel==\"20.04\") | .releases[] | select(.channel==\"$channel/edge/merged\")| .resources[$index].revision'|head -1"
+                                            resourceNameScript = "cat ${charm}.json | jq -r '.[] | select(.track==\"$channel\") | .mappings[] | select(.base.architecture==\"amd64\" and .base.channel==\"$base\") | .releases[] | select(.channel==\"$channel/edge/merged\")| .resources[$index].name'|head -1"
+                                            resourceRevsScript = "cat ${charm}.json | jq -r '.[] | select(.track==\"$channel\") | .mappings[] | select(.base.architecture==\"amd64\" and .base.channel==\"$base\") | .releases[] | select(.channel==\"$channel/edge/merged\")| .resources[$index].revision'|head -1"
                                             resourceName = sh(returnStdout: true, script: resourceNameScript).trim()
                                             resourceRevs = sh(returnStdout: true, script: resourceRevsScript).trim()
                                             if (resourceName != "null") {