summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenes Nemeth <denes.nemeth@nokia.com>2018-02-08 13:34:44 +0100
committerDenes Nemeth <denes.nemeth@nokia.com>2018-02-08 13:34:53 +0100
commit1d5d59c37978827d90ade5e30e38e38412c8e7e4 (patch)
treee46ddc02457ac2c8bb9640d7b016713a6cdde638
parentb188a17ff129bdfda103b7455511c14321446613 (diff)
Move Nokia SVNFM driver directory
Signed-off-by: Denes Nemeth <denes.nemeth@nokia.com> Issue-ID: VFC-728 Change-Id: Ifdb9a4ac482d2d775a583ed2e80f864d3ffc4809
-rwxr-xr-xjjb/vfc/build-nfvo-svnfm-driver-docker-image.sh5
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml6
2 files changed, 6 insertions, 5 deletions
diff --git a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh
index db1b504a0..2f33312c0 100755
--- a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh
+++ b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh
@@ -11,5 +11,6 @@ chmod 755 ./zte/vmanager/docker/*.*
chmod 755 ./huawei/vnfmadapter/VnfmadapterService/docker/*.*
./huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh
-chmod 755 ./nokia/vnfmdriver/vfcadaptorservice/docker/*.*
-./nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh \ No newline at end of file
+cd nokia/deployment
+mvn package -Dexec.args="buildDocker pushImage"
+
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
index f030e1ba4..ae29db7ab 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/vnfmdriver/pom.xml'
- pattern: 'nokia/vnfmdriver/**'
+ pom: 'nokia/pom.xml'
+ pattern: 'nokia/**'
jobs:
- gerrit-maven-clm:
java-version: ''
@@ -26,7 +26,7 @@
name: vfc-nfvo-driver-vnfm-svnfm-nokia-sonar
jobs:
- gerrit-maven-sonar
- mvn-params: '-f nokia/vnfmdriver/pom.xml'
+ mvn-params: '-f nokia/pom.xml'
build-node: ubuntu1604-basebuild-4c-4g
java-version: ''
project: 'vfc/nfvo/driver/vnfm/svnfm'