diff options
| author |   Denes Nemeth <denes.nemeth@nokia.com> | 2018-05-02 10:34:48 +0200 |
|---|---|---|
| committer | Denes Nemeth <denes.nemeth@nokia.com> | 2018-05-02 12:19:51 +0200 |
| commit | b26a800ef2385f0f384d29be8977397327b50b91 (patch) | |
| tree | 91e3358c2b49baed88d7de84979cd983f145d552 | |
| parent | e7ec7b7ade4b3afe1a49acfaa1ab19aac338552f (diff) | |
Run docker build on image with docker
Change-Id: I80a2beecbd40f03174087e43b8d283db125a5188
Signed-off-by: Denes Nemeth <denes.nemeth@nokia.com>
Issue-ID: VFC-728
| -rwxr-xr-x | jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh | 4 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml | 40 |
2 files changed, 29 insertions, 15 deletions
diff --git a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh index d729cb1bd..63ed4095d 100755 --- a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh +++ b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh @@ -17,7 +17,3 @@ echo '============== BUILDING NOKIA V1 IMAGE =================' chmod 755 ./nokia/vnfmdriver/vfcadaptorservice/docker/*.* ./nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh -echo '============== BUILDING NOKIA V2 IMAGE =================' -chmod 755 ./nokiav2/deployment/src/main/resources/*.sh -./nokiav2/deployment/src/main/resources/build_image.sh buildDocker pushImage - diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml index c2a0194fa..f9cc2c05a 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml @@ -1,8 +1,8 @@ --- - project: name: vfc-nfvo-driver-vnfm-svnfm-nokiav2 - project-name: 'vfc-nfvo-driver-svnfm-nokiav2' project: 'vfc/nfvo/driver/vnfm/svnfm' + project-name: 'vfc-nfvo-driver-svnfm-nokiav2' stream: - 'master': branch: 'master' @@ -17,27 +17,45 @@ - '{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-builder-4c-4g + +- project: + name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-docker + project: 'vfc/nfvo/driver/vnfm/svnfm' + project-name: 'vfc-nfvo-driver-svnfm-nokiav2' + stream: + - 'master': + branch: 'master' + mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' + subproject: + - 'docker-vnfm-nokiav2': + pom: 'nokiav2/pom.xml' + pattern: 'nokiav2/**' + jobs: - '{project-name}-{subproject}-{stream}-merge-docker': - pre_build_script: 'cd $WORKSPACE/nokiav2/deployment; mvn install' + docker_build_args: '--build-arg MODE=-SNAPSHOT --build-arg REPO=snapshots' docker_name: 'onap/vfc/nfvo/svnfm/nokiav2' - docker_root: '$WORKSPACE/nokiav2/deployment/src/main/resources' + docker_root: '$WORKSPACE/nokiav2/deployment' - '{project-name}-{subproject}-{stream}-release-version-docker-daily-no-sonar': - pre_build_script: 'cd $WORKSPACE/nokiav2/deployment; mvn install' + docker_build_args: '--build-arg MODE= --build-arg REPO=staging' docker_name: 'onap/vfc/nfvo/svnfm/nokiav2' - docker_root: '$WORKSPACE/nokiav2/deployment/src/main/resources' + docker_root: '$WORKSPACE/nokiav2/deployment/src' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1604-docker-8c-8g + - project: name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-sonar - jobs: - - gerrit-maven-sonar - cron: 'H 11 * * *' - mvn-params: '-f nokiav2/pom.xml' - build-node: ubuntu1604-builder-4c-4g project: 'vfc/nfvo/driver/vnfm/svnfm' project-name: 'vfc-nfvo-driver-vnfm-svnfm-nokiav2' + cron: 'H 11 * * *' branch: 'master' + mvn-params: '-f nokiav2/pom.xml' mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-builder-4c-4g |