diff options
-rw-r--r-- | jjb/music/music-jar.yaml | 2 | ||||
-rw-r--r-- | jjb/music/music.yaml | 2 | ||||
-rw-r--r-- | jjb/optf/optf-has.yaml | 2 | ||||
-rw-r--r-- | jjb/optf/optf-osdf.yaml | 2 | ||||
-rw-r--r-- | jjb/portal/portal-docker.yaml | 4 | ||||
-rw-r--r-- | jjb/portal/portal.yaml | 4 | ||||
-rw-r--r-- | jjb/sdc/sdc.yaml | 3 | ||||
-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 | 38 | ||||
-rw-r--r-- | shell/pypi-dist-build.sh | 2 | ||||
-rw-r--r-- | shell/pypi-publish.sh | 2 |
11 files changed, 47 insertions, 18 deletions
diff --git a/jjb/music/music-jar.yaml b/jjb/music/music-jar.yaml index dba2ab2bd..86fcf1384 100644 --- a/jjb/music/music-jar.yaml +++ b/jjb/music/music-jar.yaml @@ -13,7 +13,7 @@ - '{project-name}-{stream}-{subproject}-merge-java' project: 'music' stream: - - 'release-2.5.3': + - 'jar-release-2.5.3': branch: 'release-2.5.3' mvn-settings: 'music-settings' files: '**' diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml index 0866f063e..00b4d2fb1 100644 --- a/jjb/music/music.yaml +++ b/jjb/music/music.yaml @@ -14,6 +14,8 @@ stream: - 'master': branch: 'master' + - 'release-2.5.3': + branch: 'master' mvn-settings: 'music-settings' files: '**' archive-artifacts: '' diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml index ddbccf651..c07a7697e 100644 --- a/jjb/optf/optf-has.yaml +++ b/jjb/optf/optf-has.yaml @@ -6,6 +6,8 @@ stream: - 'master': branch: 'master' + - 'release-1.1.1': + branch: 'master' mvn-settings: 'optf-has-settings' subproject: - 'conductor': diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml index c93cccff6..3f575cef7 100644 --- a/jjb/optf/optf-osdf.yaml +++ b/jjb/optf/optf-osdf.yaml @@ -6,6 +6,8 @@ stream: - 'master': branch: 'master' + - 'release-1.1.1': + branch: 'master' mvn-settings: 'optf-osdf-settings' subproject: - 'osdf': diff --git a/jjb/portal/portal-docker.yaml b/jjb/portal/portal-docker.yaml index 71edff8d7..d275d6536 100644 --- a/jjb/portal/portal-docker.yaml +++ b/jjb/portal/portal-docker.yaml @@ -17,8 +17,8 @@ stream: - 'master': branch: 'master' - - 'release-1.3.0': - branch: 'release-1.3.0' + - 'release-2.2.0': + branch: 'release-2.2.0' mvn-settings: 'portal-settings' files: '**' archive-artifacts: '' diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml index 9a04c1e6a..4f8eb8443 100644 --- a/jjb/portal/portal.yaml +++ b/jjb/portal/portal.yaml @@ -9,8 +9,8 @@ stream: - 'master': branch: 'master' - - 'release-1.3.0': - branch: 'release-1.3.0' + - 'release-2.2.0': + branch: 'release-2.2.0' mvn-settings: 'portal-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 4b63bde9d..039f4aef4 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -31,5 +31,6 @@ project-name: 'sdc' branch: 'master' mvn-settings: 'sdc-settings' - mvn-goals: 'clean install -Djacoco.skip=false' + mvn-params: '-Djacoco.skip=false' + mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' 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 dbfdd39e6..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' @@ -20,16 +20,42 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g + - project: - name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-sonar + 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: - - gerrit-maven-sonar - cron: 'H 11 * * *' - mvn-params: '-f nokiav2/pom.xml' - build-node: ubuntu1604-builder-4c-4g + - '{project-name}-{subproject}-{stream}-merge-docker': + docker_build_args: '--build-arg MODE=-SNAPSHOT --build-arg REPO=snapshots' + docker_name: 'onap/vfc/nfvo/svnfm/nokiav2' + docker_root: '$WORKSPACE/nokiav2/deployment' + - '{project-name}-{subproject}-{stream}-release-version-docker-daily-no-sonar': + docker_build_args: '--build-arg MODE= --build-arg REPO=staging' + docker_name: 'onap/vfc/nfvo/svnfm/nokiav2' + docker_root: '$WORKSPACE/nokiav2/deployment/src' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-docker-8c-8g + +- project: + name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-sonar 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 diff --git a/shell/pypi-dist-build.sh b/shell/pypi-dist-build.sh index 7733f6242..bc3d4ae65 100644 --- a/shell/pypi-dist-build.sh +++ b/shell/pypi-dist-build.sh @@ -2,7 +2,7 @@ # Script to build PyPI artifacts set -e -x -o pipefail -virtualenv /tmp/v/twine +virtualenv -p "$PYTHON_VERSION" /tmp/v/twine source "/tmp/v/twine/bin/activate" pip install twine wheel diff --git a/shell/pypi-publish.sh b/shell/pypi-publish.sh index 7ea3fa2d9..2510ed38b 100644 --- a/shell/pypi-publish.sh +++ b/shell/pypi-publish.sh @@ -2,7 +2,7 @@ # Script to publush PyPI artifacts set -e -x -o pipefail -virtualenv /tmp/v/twine +virtualenv -p "$PYTHON_VERSION" /tmp/v/twine source "/tmp/v/twine/bin/activate" pip install twine |