summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2018-02-14 02:05:33 +0000
committerGerrit Code Review <gerrit@onap.org>2018-02-14 02:05:33 +0000
commitdf4ccad71dc751214c66294c0fa1ff9014dda640 (patch)
tree8cb056e0733dec5ee200bca18886d939a5027e00 /jjb
parenteda92d586606e86735398610e616e3043d3a5017 (diff)
parent0a15ac5f48c64b9c6e1a1c5a811545fb1cec38a8 (diff)
Merge "Update vfc nokia driver jjb template"
Diffstat (limited to 'jjb')
-rwxr-xr-xjjb/vfc/build-nfvo-svnfm-driver-docker-image.sh4
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml6
2 files changed, 5 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 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'