Pin OSM charms to newer revision numbers and update releasing script
Change-Id: Ib5e737cfb721e7e987ec14ea94cdc939e2164542
Signed-off-by: David Garcia <david.garcia@canonical.com>
diff --git a/installers/charm/release_edge.sh b/installers/charm/release_edge.sh
index 2a6d62f..6e8a40c 100755
--- a/installers/charm/release_edge.sh
+++ b/installers/charm/release_edge.sh
@@ -41,17 +41,26 @@
echo "$charm charm released!"
done
-# 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::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
+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"