X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_3.groovy;h=a65b8b7085690d59a1d852cb1917a567c677857b;hb=8585f3369306457cb2c3918f8bb5e47d5796dd79;hp=5d27c7f8a2f3d1291919b0c055514ceeaad7ea61;hpb=d7f1c2729ec9310b83cf7e5459cd3beb77406733;p=osm%2Fdevops.git

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index 5d27c7f8..a65b8b70 100644
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -448,8 +448,8 @@ node("${params.NODE}") {
                         pty: true
                     ]
 
-                    // Force loading of the ETSI Debian Package Signing Key
-                    sshCommand remote: remote, command: 'sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93EC7342B1168CDB'
+                    // Ensure the VM is ready
+                    sshCommand remote: remote, command: 'cloud-init status --wait'
                     // Force time sync to avoid clock drift and invalid certificates
                     sshCommand remote: remote, command: 'sudo apt-get update'
                     sshCommand remote: remote, command: 'sudo apt-get install -y chrony'
@@ -675,8 +675,8 @@ EOF"""
                                 'osm-ha', // bundle
                                 'osm-grafana',
                                 'osm-mariadb',
-                                'mongodb-exporter',
-                                'mysqld-exporter',
+                                'mongodb-exporter-k8s',
+                                'mysqld-exporter-k8s',
                                 'osm-lcm',
                                 'osm-mon',
                                 'osm-nbi',
@@ -684,7 +684,7 @@ EOF"""
                                 'osm-pol',
                                 'osm-ro',
                                 'osm-prometheus',
-                                'osm-vca-integrator-operator',
+                                'osm-vca-integrator',
                             ]
                             for (charm in charms) {
 
@@ -699,14 +699,12 @@ EOF"""
                                     sh "charmcraft status $charm --format json > ${charm}.json"
                                     isCharm = sh(returnStdout: true, script: "grep architecture ${charm}.json | wc -l").trim() as int
                                     if (isCharm) {
-                                        jqScriptEdge = "cat ${charm}.json | jq -r '.[] | select(.track==\"$channel\") | .mappings[] | select(.base.architecture==\"amd64\" and .base.channel==\"20.04\") | .releases[] | select(.channel==\"latest/edge/merged\")| .version'"
-                                        jqScriptBeta = "cat ${charm}.json | jq -r '.[] | select(.track==\"$channel\") | .mappings[] | select(.base.architecture==\"amd64\" and .base.channel==\"20.04\") | .releases[] | select(.channel==\"latest/beta\")| .version'"
+                                        jqScriptEdge = "cat ${charm}.json | jq -r '.[] | select(.track==\"$channel\") | .mappings[] | select(.base.architecture==\"amd64\" and .base.channel==\"20.04\") | .releases[] | select(.channel==\"latest/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==\"latest/beta\")| .version'|head -1"
                                     } else {
-                                        jqScriptEdge = "cat ${charm}.json | jq -r '.[] | select(.track==\"$channel\") | .mappings[].releases[] | select(.channel==\"latest/edge/merged\")| .version'"
-                                        jqScriptBeta = "cat ${charm}.json | jq -r '.[] | select(.track==\"$channel\") | .mappings[].releases[] | select(.channel==\"latest/beta\")| .version'"
+                                        jqScriptEdge = "cat ${charm}.json | jq -r '.[] | select(.track==\"$channel\") | .mappings[].releases[] | select(.channel==\"latest/edge/merged\")| .version'|head -1"
+                                        jqScriptBeta = "cat ${charm}.json | jq -r '.[] | select(.track==\"$channel\") | .mappings[].releases[] | select(.channel==\"latest/beta\")| .version'|head -1"
                                     }
-                                    println(jqScriptEdge)
-                                    println(jqScriptBeta)
                                     // edge/merged is used in place of /edge as 10.1.0 LTS uses latest/edge
                                     edge_rev = sh(returnStdout: true, script: jqScriptEdge).trim()
                                     beta_rev = sh(returnStdout: true, script: jqScriptBeta).trim()