From cbbc9a5136c8d227d6a0a24fa7a9834d1a99eece Mon Sep 17 00:00:00 2001 From: jitendra sharma Date: Fri, 30 Oct 2020 06:01:20 +0000 Subject: Update vtp install script for cli 6.0.0 and upgrade java 8 to 11 Issue-ID: VNFSDK-706 Signed-off-by: jitendra sharma Change-Id: Id6d881444c8e1b5f6ad7a9058ffc5b2b647e540d --- vnfmarket-be/deployment/install/vtp_install.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) mode change 100644 => 100755 vnfmarket-be/deployment/install/vtp_install.sh diff --git a/vnfmarket-be/deployment/install/vtp_install.sh b/vnfmarket-be/deployment/install/vtp_install.sh old mode 100644 new mode 100755 index bef33750..7a5c40a0 --- a/vnfmarket-be/deployment/install/vtp_install.sh +++ b/vnfmarket-be/deployment/install/vtp_install.sh @@ -59,7 +59,7 @@ export VTP_STAGE_DIR=/opt/vtp_stage export OPEN_CLI_HOME=/opt/oclip export PATH=$OPEN_CLI_HOME/bin:$PATH export CATALINA_HOME=/opt/controller -export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/ +export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/ #export ONAP_VVP_HOME=$VTP_STAGE_DIR/vvp-validation-scripts/ice_validator export VTP_TRACK_MARK=+++++++++++++++++++++++++++++++++++ @@ -119,7 +119,7 @@ function vtp_download() { if [ ! -d $JAVA_HOME ] then - apt-get install -y openjdk-8-jre + apt-get install -y openjdk-11-jre else echo $VTP_TRACK_MARK JAVA already installed fi @@ -164,6 +164,7 @@ function vtp_csar_validation_install() { cp $VTP_STAGE_DIR/CSAR-VALIDATE/validation-csar*.jar $OPEN_CLI_HOME/lib cp $VTP_STAGE_DIR/CSAR-VALIDATE/bcpkix-jdk15on-1.61.jar $OPEN_CLI_HOME/lib cp $VTP_STAGE_DIR/CSAR-VALIDATE/bcprov-jdk15on-1.61.jar $OPEN_CLI_HOME/lib + cp $VTP_STAGE_DIR/CSAR-VALIDATE/snakeyaml-1.26.jar $OPEN_CLI_HOME/lib else echo "CSAR Validation Test cases (TOSCA & HEAT) already installed" fi -- cgit 1.2.3-korg