Merge "Fix Nokia image generation"

diff --git a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh
index 36a76a9..d729cb1 100755 (executable)
--- a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh
+++ b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh
@@ -5,15 +5,19 @@ echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
 CURRENTDIR="$(pwd)"
 echo $CURRENTDIR
 
+echo '============== BUILDING ZTE IMAGE ================='
 chmod 755 ./zte/vmanager/docker/*.*
 ./zte/vmanager/docker/build_image.sh
 
+echo '============== BUILDING HUAWEI IMAGE ================='
 chmod 755 ./huawei/vnfmadapter/VnfmadapterService/docker/*.*
 ./huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh
 
+echo '============== BUILDING NOKIA V1 IMAGE ================='
 chmod 755 ./nokia/vnfmdriver/vfcadaptorservice/docker/*.*
 ./nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh
 
-cd nokiav2/deployment
-mvn package -Dexec.args="buildDocker pushImage"
+echo '============== BUILDING NOKIA V2 IMAGE ================='
+chmod 755 ./nokiav2/deployment/src/main/resources/*.sh
+./nokiav2/deployment/src/main/resources/build_image.sh buildDocker pushImage