Fixing snap promotion

Removes some charms from the list as they are not needed
for OSM

Adds an explicit import of the ETSI GPG signing key

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

diff --git a/jenkins/ci-pipelines/ci_stage_2.groovy b/jenkins/ci-pipelines/ci_stage_2.groovy
index 73842e3..e3e86c5 100644 (file)
--- a/jenkins/ci-pipelines/ci_stage_2.groovy
+++ b/jenkins/ci-pipelines/ci_stage_2.groovy
@@ -131,9 +131,6 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa
             'installers/charm/bundles/osm',
             'installers/charm/bundles/osm-ha',
             'installers/charm/grafana',
-            'installers/charm/juju-simplestreams-operator',
-            'installers/charm/kafka-exporter',
-            'installers/charm/mariadb-k8s',
             'installers/charm/mongodb-exporter',
             'installers/charm/mysqld-exporter',
             'installers/charm/osm-lcm',
@@ -167,7 +164,7 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa
                     try {
                         dir("${directory}") {
                             try {
-                                sh "charmcraft pack --force --format json --verbosity brief 1> pack.json 2> pack-stderr.log"
+                                sh "charmcraft pack --format json --verbosity brief 1> pack.json 2> pack-stderr.log"
                             } catch (Exception e) {
                                 sh "cat pack-stderr.log"
                                 throw e

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index b052b9c..5d27c7f 100644 (file)
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -448,6 +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'
                     // 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'
@@ -672,11 +674,9 @@ EOF"""
                                 'osm', // bundle
                                 'osm-ha', // bundle
                                 'osm-grafana',
-                                //'juju-simplestreams-operator',
-                                //'kafka-exporter',
                                 'osm-mariadb',
-                                //'mongodb-exporter',
-                                //'mysqld-exporter',
+                                'mongodb-exporter',
+                                'mysqld-exporter',
                                 'osm-lcm',
                                 'osm-mon',
                                 'osm-nbi',
@@ -684,7 +684,7 @@ EOF"""
                                 'osm-pol',
                                 'osm-ro',
                                 'osm-prometheus',
-                                //'osm-vca-integrator-operator',
+                                'osm-vca-integrator-operator',
                             ]
                             for (charm in charms) {