From: yangyan <yangyanyj@chinamobile.com>
Date: Wed, 14 Feb 2018 01:45:17 +0000 (+0800)
Subject: Update vfc nokia driver jjb template
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F53%2F31653%2F1;p=ci-management.git

Update vfc nokia driver jjb template

Issue-ID: VFC-728
Change-Id: Ia260cd57433e531b61a046bbfe5e9e0d51bd654f
Signed-off-by: yangyan <yangyanyj@chinamobile.com>
---

diff --git a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh
index 2f33312c0..eb7961ed4 100755
--- a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh
+++ b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh
@@ -11,6 +11,6 @@ chmod 755 ./zte/vmanager/docker/*.*
 chmod 755 ./huawei/vnfmadapter/VnfmadapterService/docker/*.*
 ./huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh
 
-cd nokia/deployment
-mvn package -Dexec.args="buildDocker pushImage"
+chmod 755 ./nokia/vnfmdriver/vfcadaptorservice/docker/*.*
+./nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh
 
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
index 42ed55ce8..c08037344 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
@@ -11,8 +11,8 @@
     mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
     subproject:
       - 'drv-vnfm-nokia':
-          pom: 'nokia/pom.xml'
-          pattern: 'nokia/**'
+          pom: 'nokia/vnfmdirver/pom.xml'
+          pattern: 'nokia/vnfmdriver/**'
     jobs:
       - gerrit-maven-clm:
       - '{project-name}-{stream}-{subproject}-verify-java'
@@ -25,7 +25,7 @@
     name: vfc-nfvo-driver-vnfm-svnfm-nokia-sonar
     jobs:
       - gerrit-maven-sonar
-    mvn-params: '-f nokia/pom.xml'
+    mvn-params: '-f nokia/vnfmdriver/pom.xml'
     build-node: ubuntu1604-basebuild-4c-4g
     project: 'vfc/nfvo/driver/vnfm/svnfm'
     project-name: 'vfc-nfvo-driver-vnfm-svnfm-nokia'