From: garciadeblas Date: Tue, 3 Oct 2023 15:52:02 +0000 (+0200) Subject: Update default URLs and tags to use 14 and fourteen X-Git-Tag: release-v15.0-start~17 X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fdevops.git;a=commitdiff_plain;h=931a512b2c2ecc7ab050d07e9eb992423c28aee4 Update default URLs and tags to use 14 and fourteen Change-Id: I0a6f2351a393bf17afe91a420d98b0ac2d5c5d14 Signed-off-by: garciadeblas --- diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index 4724a14e..15aee9c9 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -532,7 +532,7 @@ function install_osm() { arrange_docker_default_network_policy - wget -q -O- https://osm-download.etsi.org/ftp/osm-13.0-thirteen/README2.txt &> /dev/null + wget -q -O- https://osm-download.etsi.org/ftp/osm-14.0-fourteen/README2.txt &> /dev/null track end sudo find /etc/osm [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function @@ -726,7 +726,7 @@ OSM_WORK_DIR="/etc/osm" OSM_HELM_WORK_DIR="${OSM_WORK_DIR}/helm" OSM_HOST_VOL="/var/lib/osm" OSM_NAMESPACE_VOL="${OSM_HOST_VOL}/${OSM_NAMESPACE}" -OSM_DOCKER_TAG=latest +OSM_DOCKER_TAG="testing-daily" DOCKER_USER=opensourcemano PULL_IMAGES="y" KAFKA_TAG=2.11-1.0.2 @@ -937,7 +937,7 @@ fi # Installation starts here # Get README and create OSM_TRACK_INSTALLATION_ID -wget -q -O- https://osm-download.etsi.org/ftp/osm-13.0-thirteen/README.txt &> /dev/null +wget -q -O- https://osm-download.etsi.org/ftp/osm-14.0-fourteen/README.txt &> /dev/null export OSM_TRACK_INSTALLATION_ID="$(date +%s)-$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 16)" # Get OS info to be tracked @@ -953,7 +953,7 @@ if [ -n "$CHARMED" ]; then sudo snap install jq || FATAL "Could not install jq (snap package). Make sure that snap works" ${OSM_DEVOPS}/installers/charmed_install.sh --tag $OSM_DOCKER_TAG "$@" || \ FATAL_TRACK charmed_install "charmed_install.sh failed" - wget -q -O- https://osm-download.etsi.org/ftp/osm-13.0-thirteen/README2.txt &> /dev/null + wget -q -O- https://osm-download.etsi.org/ftp/osm-14.0-fourteen/README2.txt &> /dev/null echo -e "\nDONE" exit 0 fi diff --git a/installers/install_ngsa.sh b/installers/install_ngsa.sh index 93c5f2dd..4d74df50 100755 --- a/installers/install_ngsa.sh +++ b/installers/install_ngsa.sh @@ -85,7 +85,7 @@ function install_prometheus_alertmanager() { DOCKER_REGISTRY_URL= DOCKER_USER="opensourcemano" OSM_DEVOPS="/usr/share/osm-devops" -OSM_DOCKER_TAG="13" +OSM_DOCKER_TAG="testing-daily" OSM_HELM_WORK_DIR="/etc/osm/helm" while getopts ":D:d:t:r:U:-: " o; do diff --git a/installers/install_osm.sh b/installers/install_osm.sh index 5fca6483..35ced89f 100755 --- a/installers/install_osm.sh +++ b/installers/install_osm.sh @@ -13,9 +13,9 @@ # limitations under the License. # REPOSITORY_BASE=https://osm-download.etsi.org/repository/osm/debian -RELEASE=ReleaseTHIRTEEN +RELEASE=ReleaseFOURTEEN REPOSITORY=stable -DOCKER_TAG=13 +DOCKER_TAG="testing-daily" DEVOPS_PATH=/usr/share/osm-devops function usage(){