diff options
| author |   Jessica Wagantall <jwagantall@linuxfoundation.org> | 2018-02-16 18:06:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-02-16 18:06:09 +0000 |
| commit | 23219aedd43737e3220be28502f6f9abde6a3314 (patch) | |
| tree | 1bf8c4892909c916d8a2da3d4d3ac588e8c8ef0a | |
| parent | 6d55635fceae5e06f595580d5a37edc78dea7b8a (diff) | |
| parent | 6c45f5aa2fcad147897211dd8ca1136e847b1de0 (diff) | |
Merge "Add Nokia v2 driver into separate directory"
| -rwxr-xr-x | jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh | 3 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml | 35 |
2 files changed, 38 insertions, 0 deletions
diff --git a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh index eb7961ed4..36a76a916 100755 --- a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh +++ b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh @@ -14,3 +14,6 @@ chmod 755 ./huawei/vnfmadapter/VnfmadapterService/docker/*.* chmod 755 ./nokia/vnfmdriver/vfcadaptorservice/docker/*.* ./nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh +cd nokiav2/deployment +mvn package -Dexec.args="buildDocker pushImage" + diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml new file mode 100644 index 000000000..01fced425 --- /dev/null +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml @@ -0,0 +1,35 @@ +--- +- project: + name: vfc-nfvo-driver-vnfm-svnfm-nokiav2 + project-name: 'vfc-nfvo-driver-svnfm-nokiav2' + project: 'vfc/nfvo/driver/vnfm/svnfm' + stream: + - 'master': + branch: 'master' + mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' + subproject: + - 'drv-vnfm-nokiav2': + pom: 'nokia/pom.xml' + pattern: 'nokia/**' + jobs: + - gerrit-maven-clm: + java-version: '' + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-{subproject}-release-version-java-daily' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g +- project: + name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-sonar + jobs: + - gerrit-maven-sonar + mvn-params: '-f nokiav2/pom.xml' + build-node: ubuntu1604-basebuild-4c-4g + java-version: '' + project: 'vfc/nfvo/driver/vnfm/svnfm' + project-name: 'vfc-nfvo-driver-vnfm-svnfm-nokiav2' + branch: 'master' + mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' |