X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Frelease_edge.sh;h=6e8a40c0a9e170aa83008dadfd59d969c0238440;hb=refs%2Fchanges%2F54%2F10754%2F3;hp=2a6d62f4b8c64eea1147e8a747452611685dc871;hpb=996a5604c7d31f3758503b08a426f1f40619b17b;p=osm%2Fdevops.git diff --git a/installers/charm/release_edge.sh b/installers/charm/release_edge.sh index 2a6d62f4..6e8a40c0 100755 --- a/installers/charm/release_edge.sh +++ b/installers/charm/release_edge.sh @@ -41,17 +41,26 @@ for charm in $charms; do 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"