Add validation-pmdictionary*.jar to docker container

Issue-ID: VNFSDK-713
Signed-off-by: Pawel <pawel.kasperkiewicz@nokia.com>
Change-Id: I9d614aba7764ec36e3e883b76520d56c5a5fbdc4

diff --git a/Changelog.md b/Changelog.md
index e6cc9fa..0adeb1c 100644 (file)
--- a/Changelog.md
+++ b/Changelog.md
@@ -28,3 +28,7 @@ All notable changes to this project will be documented in this file.
 - Updated validation version to 1.2.14
 
 ## [1.6.3]
+
+### Added
+- Add validation-pmdictionary*.jar to docker container
+  - https://jira.onap.org/browse/VNFSDK-713

diff --git a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/install-vtp.sh b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/install-vtp.sh
index d23083f..82ecb3a 100644 (file)
--- a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/install-vtp.sh
+++ b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/install-vtp.sh
@@ -74,11 +74,12 @@ wget -O $CSARVAL_ZIP $CSARVALIDATOR_LATEST_BINARY
 unzip -d csarvalidator $CSARVAL_ZIP
 echo install csarvalidator into vtp
 cp csarvalidator/commons-lang3*.jar $VTP_INSTALL_DIR/lib/
-cp csarvalidator/validation-csar*.jar $VTP_INSTALL_DIR/lib/
 cp csarvalidator/bcpkix-jdk15on-1.61.jar $VTP_INSTALL_DIR/lib/
 cp csarvalidator/bcprov-jdk15on-1.61.jar $VTP_INSTALL_DIR/lib/
 cp csarvalidator/commons-collections*.jar $VTP_INSTALL_DIR/lib/
 cp csarvalidator/snakeyaml-1.26.jar $VTP_INSTALL_DIR/lib/
+cp csarvalidator/validation-csar*.jar $VTP_INSTALL_DIR/lib/
+cp csarvalidator/validation-pmdictionary*.jar $VTP_INSTALL_DIR/lib/
 rm -rf csarvalidator $CSARVAL_ZIP $VTP_ZIP
 cd -
 

diff --git a/vnfmarket-be/deployment/install/vtp_install.sh b/vnfmarket-be/deployment/install/vtp_install.sh
index 7a5c40a..e862e97 100755 (executable)
--- a/vnfmarket-be/deployment/install/vtp_install.sh
+++ b/vnfmarket-be/deployment/install/vtp_install.sh
@@ -161,10 +161,11 @@ function vtp_csar_validation_install() {
         unzip $VTP_STAGE_DIR/CSAR-VALIDATE.zip -d $VTP_STAGE_DIR/CSAR-VALIDATE
         cp $VTP_STAGE_DIR/csar-validate.jar $OPEN_CLI_HOME/lib
         cp $VTP_STAGE_DIR/CSAR-VALIDATE/commons-lang3*.jar $OPEN_CLI_HOME/lib
-        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
+        cp $VTP_STAGE_DIR/CSAR-VALIDATE/validation-csar*.jar $OPEN_CLI_HOME/lib
+        cp $VTP_STAGE_DIR/CSAR-VALIDATE/validation-pmdictionary*.jar $OPEN_CLI_HOME/lib
     else
         echo "CSAR Validation Test cases (TOSCA & HEAT) already installed"
     fi