X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Frelease_edge.sh;h=c59b2d58dbfae371c3eb60551aefd5bda32b1512;hb=d68e0b4f0bc482d61f2e2a775b899237e15f93e9;hp=2a6d62f4b8c64eea1147e8a747452611685dc871;hpb=49379ced23b5e344a773ce77ac9cb59c1864e19b;p=osm%2Fdevops.git

diff --git a/installers/charm/release_edge.sh b/installers/charm/release_edge.sh
index 2a6d62f4..c59b2d58 100755
--- a/installers/charm/release_edge.sh
+++ b/installers/charm/release_edge.sh
@@ -20,14 +20,6 @@ tag=testing-daily
 # 1. Build charms
 ./build.sh
 
-# 2. Release charms
-# Reactive charms
-charms="lcm-k8s mon-k8s pol-k8s ro-k8s"
-for charm in $charms; do
-    cs_revision=`charm push $charm/release cs:~charmed-osm/$charm | tail -n +1 | head -1 | awk '{print $2}'`
-    charm release --channel $channel $cs_revision
-    echo "$charm charm released!"
-done
 
 # New charms (with resources)
 charms="ng-ui nbi pla keystone ro lcm mon pol"
@@ -41,20 +33,40 @@ for charm in $charms; do
     echo "$charm charm released!"
 done
 
-# New charms (with resources) (with oci-images from ubuntu)
-charms="prometheus grafana"
+charms="mongodb-exporter kafka-exporter mysqld-exporter"
 for charm in $charms; do
     echo "Releasing $charm charm"
     cs_revision=$(charm push $charm/$charm.charm cs:~charmed-osm/$charm | tail -n +1 | head -1 | awk '{print $2}')
-    resource_revision=$(charm attach $cs_revision image=external::ubuntu/$charm:latest | tail -n +1 | sed 's/[^0-9]*//g')
+    resource_revision=$(charm attach $cs_revision image=external::bitnami/$charm:latest | tail -n +1 | sed 's/[^0-9]*//g')
     image_revision_num=$(echo $resource_revision  | awk '{print $NF}')
     resources_string="--resource image-$image_revision_num"
     charm release --channel $channel $cs_revision $resources_string
     echo "$charm charm released!"
 done
 
+charm="prometheus"
+echo "Releasing $charm charm"
+cs_revision=$(charm push $charm/$charm.charm cs:~charmed-osm/$charm | tail -n +1 | head -1 | awk '{print $2}')
+resource_revision=$(charm attach $cs_revision image=external::ubuntu/$charm:latest | tail -n +1 | sed 's/[^0-9]*//g')
+image_revision_num=$(echo $resource_revision  | awk '{print $NF}')
+backup_resource_revision=$(charm attach $cs_revision backup-image=external::ed1000/prometheus-backup:latest | tail -n +1 | sed 's/[^0-9]*//g')
+backup_image_revision_num=$(echo $backup_resource_revision  | awk '{print $NF}')
+resources_string="--resource image-$image_revision_num --resource backup-image-$backup_image_revision_num"
+charm release --channel $channel $cs_revision $resources_string
+echo "$charm charm released!"
+
+
+charm="grafana"
+echo "Releasing $charm charm"
+cs_revision=$(charm push $charm/$charm.charm cs:~charmed-osm/$charm | tail -n +1 | head -1 | awk '{print $2}')
+resource_revision=$(charm attach $cs_revision image=external::ubuntu/$charm:latest | tail -n +1 | sed 's/[^0-9]*//g')
+image_revision_num=$(echo $resource_revision  | awk '{print $NF}')
+resources_string="--resource image-$image_revision_num"
+charm release --channel $channel $cs_revision $resources_string
+echo "$charm charm released!"
+
 # 3. Grant permissions
-all_charms="ng-ui nbi pla keystone ro lcm mon pol grafana prometheus"
+all_charms="ng-ui nbi pla keystone ro lcm mon pol grafana prometheus mongodb-exporter kafka-exporter mysqld-exporter"
 for charm in $all_charms; do
     echo "Granting permission for $charm charm"
     charm grant cs:~charmed-osm/$charm --channel $channel --acl read everyone