From e400dfdf8dd2bdd67321fa70a56cef6458533dbc Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Tue, 12 Dec 2023 21:53:43 +0100 Subject: [PATCH] Prepare installers and Jenkins for Release FIFTEEN Change-Id: I2b6f9d6743860e425915497314ab82a4e20c60e3 Signed-off-by: garciadeblas --- installers/full_install_osm.sh | 6 +++--- installers/helm/osm/Chart.yaml | 11 +++++++++-- installers/install_osm.sh | 2 +- jenkins/ci-pipelines/ci_stage_3.groovy | 2 +- jenkins/public-clouds-tests/Jenkinsfile | 2 +- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index a0007df9..8d56663a 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -546,7 +546,7 @@ function install_osm() { arrange_docker_default_network_policy - wget -q -O- https://osm-download.etsi.org/ftp/osm-14.0-fourteen/README2.txt &> /dev/null + wget -q -O- https://osm-download.etsi.org/ftp/osm-15.0-fifteen/README2.txt &> /dev/null track end sudo find /etc/osm [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function @@ -950,7 +950,7 @@ fi # Installation starts here # Get README and create OSM_TRACK_INSTALLATION_ID -wget -q -O- https://osm-download.etsi.org/ftp/osm-14.0-fourteen/README.txt &> /dev/null +wget -q -O- https://osm-download.etsi.org/ftp/osm-15.0-fifteen/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 @@ -966,7 +966,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-14.0-fourteen/README2.txt &> /dev/null + wget -q -O- https://osm-download.etsi.org/ftp/osm-15.0-fifteen/README2.txt &> /dev/null echo -e "\nDONE" exit 0 fi diff --git a/installers/helm/osm/Chart.yaml b/installers/helm/osm/Chart.yaml index 2c6b6275..06be3214 100644 --- a/installers/helm/osm/Chart.yaml +++ b/installers/helm/osm/Chart.yaml @@ -20,7 +20,7 @@ description: A Helm chart for Open Source MANO (OSM) type: application icon: https://www.etsi.org/images/articles/logos/OSM.png version: 0.0.1 -appVersion: "14" +appVersion: "15" dependencies: - name: mysql repository: "https://charts.bitnami.com/bitnami" @@ -34,4 +34,11 @@ dependencies: repository: "https://charts.bitnami.com/bitnami" version: "12.1.3" condition: zookeeper.enabled - +# - name: mongodb +# repository: "https://charts.bitnami.com/bitnami" +# version: "13.9.4" +# condition: mongodb.enabled +# - name: airflow +# repository: "https://airflow.apache.org" +# version: "1.6.0" +# condition: airflow.enabled diff --git a/installers/install_osm.sh b/installers/install_osm.sh index 35ced89f..23644215 100755 --- a/installers/install_osm.sh +++ b/installers/install_osm.sh @@ -13,7 +13,7 @@ # limitations under the License. # REPOSITORY_BASE=https://osm-download.etsi.org/repository/osm/debian -RELEASE=ReleaseFOURTEEN +RELEASE=ReleaseFIFTEEN REPOSITORY=stable DOCKER_TAG="testing-daily" DEVOPS_PATH=/usr/share/osm-devops diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy index 92a3dcfd..cff7217d 100644 --- a/jenkins/ci-pipelines/ci_stage_3.groovy +++ b/jenkins/ci-pipelines/ci_stage_3.groovy @@ -539,7 +539,7 @@ node("${params.NODE}") { ] sshCommand remote: remote, command: ''' - wget https://osm-download.etsi.org/ftp/osm-14.0-fourteen/install_osm.sh + wget https://osm-download.etsi.org/ftp/osm-15.0-fifteen/install_osm.sh chmod +x ./install_osm.sh sed -i '1 i\\export PATH=/snap/bin:\$PATH' ~/.bashrc ''' diff --git a/jenkins/public-clouds-tests/Jenkinsfile b/jenkins/public-clouds-tests/Jenkinsfile index d5f55a64..a5cf8a5b 100644 --- a/jenkins/public-clouds-tests/Jenkinsfile +++ b/jenkins/public-clouds-tests/Jenkinsfile @@ -21,7 +21,7 @@ pipeline { // Parameters to define the specific OSM version to test // --> Defaults to latest stable version of Release FOURTEEN - string(defaultValue: 'https://osm-download.etsi.org/ftp/osm-14.0-fourteen/install_osm.sh', description: 'URL to OSM installer', name: 'INSTALLER_URL') + string(defaultValue: 'https://osm-download.etsi.org/ftp/osm-15.0-fifteen/install_osm.sh', description: 'URL to OSM installer', name: 'INSTALLER_URL') string(defaultValue: 'testing-daily', description: 'Release for OSM binaries (REPO_BASE)', name: 'REPO_BASE') string(defaultValue: 'testing-daily', description: 'OSM docker tag (DOCKER_TAG)', name: 'DOCKER_TAG') string(defaultValue: 'testing', description: 'Repository name for OSM packages (REPO_NAME)', name: 'REPO_NAME') -- 2.17.1