X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Ffull_install_osm.sh;h=776ab061f9d8d19ea16a3f3364373a146617b84c;hb=3c25fabc0802a4f2aa17c7e5b28de2376833d429;hp=d6a0286204418e14a1c426f3c04507cafa069550;hpb=024f6c39ec6b93381963b5033e7aff9ac6409237;p=osm%2Fdevops.git diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index d6a02862..776ab061 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -631,7 +631,7 @@ function install_docker_compose() { function install_juju() { echo "Installing juju" - sudo snap install juju --classic --channel=2.5/stable + sudo snap install juju --classic [ -z "$INSTALL_NOLXD" ] && sudo dpkg-reconfigure -p medium lxd echo "Finished installation of juju" return 0 @@ -1415,8 +1415,7 @@ if [ -z "$OSM_DEVOPS" ]; then fi fi -OSM_JENKINS="$OSM_DEVOPS/jenkins" -. $OSM_JENKINS/common/all_funcs +. $OSM_DEVOPS/common/all_funcs [ -n "$INSTALL_LIGHTWEIGHT" ] && [ -n "$UNINSTALL" ] && uninstall_lightweight && echo -e "\nDONE" && exit 0 [ -n "$UNINSTALL" ] && uninstall && echo -e "\nDONE" && exit 0