projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix syntax error in in test_vnfs from systest
[osm/devops.git]
/
installers
/
full_install_osm.sh
diff --git
a/installers/full_install_osm.sh
b/installers/full_install_osm.sh
index
40cbfda
..
283c19d
100755
(executable)
--- a/
installers/full_install_osm.sh
+++ b/
installers/full_install_osm.sh
@@
-180,7
+180,7
@@
EONG
remove_network $OSM_STACK_NAME
echo "Removing $OSM_DOCKER_WORK_DIR"
$WORKDIR_SUDO rm -rf $OSM_DOCKER_WORK_DIR
remove_network $OSM_STACK_NAME
echo "Removing $OSM_DOCKER_WORK_DIR"
$WORKDIR_SUDO rm -rf $OSM_DOCKER_WORK_DIR
- sg lxd -c "juju destroy-controller --yes $OSM_STACK_NAME"
+ sg lxd -c "juju destroy-controller --
destroy-all-models --
yes $OSM_STACK_NAME"
fi
echo "Some docker images will be kept in case they are used by other docker stacks"
echo "To remove them, just run 'docker image prune' in a terminal"
fi
echo "Some docker images will be kept in case they are used by other docker stacks"
echo "To remove them, just run 'docker image prune' in a terminal"
@@
-1051,7
+1051,7
@@
function install_lightweight() {
[ -n "$INSTALL_PERFMON" ] && deploy_perfmon && track perfmon
[ -z "$INSTALL_NOHOSTCLIENT" ] && install_osmclient
track osmclient
[ -n "$INSTALL_PERFMON" ] && deploy_perfmon && track perfmon
[ -z "$INSTALL_NOHOSTCLIENT" ] && install_osmclient
track osmclient
- wget -q -O- https://osm-download.etsi.org/ftp/osm-
5.0-five
/README2.txt &> /dev/null
+ wget -q -O- https://osm-download.etsi.org/ftp/osm-
6.0-six
/README2.txt &> /dev/null
track end
return 0
}
track end
return 0
}
@@
-1154,7
+1154,7
@@
SHOWOPTS=""
COMMIT_ID=""
ASSUME_YES=""
INSTALL_FROM_SOURCE=""
COMMIT_ID=""
ASSUME_YES=""
INSTALL_FROM_SOURCE=""
-RELEASE="Release
FIVE
"
+RELEASE="Release
SIX
"
REPOSITORY="stable"
INSTALL_VIMEMU=""
INSTALL_FROM_LXDIMAGES=""
REPOSITORY="stable"
INSTALL_VIMEMU=""
INSTALL_FROM_LXDIMAGES=""
@@
-1381,7
+1381,7
@@
OSM_JENKINS="$OSM_DEVOPS/jenkins"
[ -n "$INSTALL_ONLY" ] && echo -e "\nDONE" && exit 0
#Installation starts here
[ -n "$INSTALL_ONLY" ] && echo -e "\nDONE" && exit 0
#Installation starts here
-wget -q -O- https://osm-download.etsi.org/ftp/osm-
5.0-five
/README.txt &> /dev/null
+wget -q -O- https://osm-download.etsi.org/ftp/osm-
6.0-six
/README.txt &> /dev/null
track start
[ -n "$INSTALL_LIGHTWEIGHT" ] && install_lightweight && echo -e "\nDONE" && exit 0
track start
[ -n "$INSTALL_LIGHTWEIGHT" ] && install_lightweight && echo -e "\nDONE" && exit 0
@@
-1437,6
+1437,6
@@
fi
#Install vim-emu (optional)
[ -n "$INSTALL_VIMEMU" ] && install_docker_ce && install_vimemu
#Install vim-emu (optional)
[ -n "$INSTALL_VIMEMU" ] && install_docker_ce && install_vimemu
-wget -q -O- https://osm-download.etsi.org/ftp/osm-
5.0-five
/README2.txt &> /dev/null
+wget -q -O- https://osm-download.etsi.org/ftp/osm-
6.0-six
/README2.txt &> /dev/null
track end
echo -e "\nDONE"
track end
echo -e "\nDONE"