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

diff --git a/installers/charm/release_edge.sh b/installers/charm/release_edge.sh
old mode 100644
new mode 100755
index a3d698e8..2a6d62f4
--- a/installers/charm/release_edge.sh
+++ b/installers/charm/release_edge.sh
@@ -23,32 +23,39 @@ tag=testing-daily
 # 2. Release charms
 # Reactive charms
 charms="lcm-k8s mon-k8s pol-k8s ro-k8s"
-charms=""
 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 no resources)
-charms="pla keystone"
-charms=""
+# New charms (with resources)
+charms="ng-ui nbi pla keystone ro lcm mon pol"
 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}'`
-    charm release --channel $channel $cs_revision
+    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::opensourcemano/$charm:$tag | 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
 
-# New charms (with resources)
-charms="ng-ui nbi"
-charms="nbi"
+# New charms (with resources) (with oci-images from ubuntu)
+charms="prometheus grafana"
 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::opensourcemano/$charm:$tag | tail -n +1 | sed 's/[^0-9]*//g')
+    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!"
 done
+
+# 3. Grant permissions
+all_charms="ng-ui nbi pla keystone ro lcm mon pol grafana prometheus"
+for charm in $all_charms; do
+    echo "Granting permission for $charm charm"
+    charm grant cs:~charmed-osm/$charm --channel $channel --acl read everyone
+done
\ No newline at end of file