diff options
Diffstat (limited to 'jjb')
137 files changed, 1580 insertions, 893 deletions
diff --git a/jjb/aaf/aaf-authz-docker.yaml b/jjb/aaf/aaf-authz-docker.yaml index 754fbddd3..c89d87843 100644 --- a/jjb/aaf/aaf-authz-docker.yaml +++ b/jjb/aaf/aaf-authz-docker.yaml @@ -5,7 +5,6 @@ project-name: 'aaf-authz-docker' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java-checkstyle' - '{project-name}-{stream}-merge-properties-java': mvn_properties: diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml index 89eb4289b..6e0a0f144 100644 --- a/jjb/aaf/aaf-authz.yaml +++ b/jjb/aaf/aaf-authz.yaml @@ -4,7 +4,6 @@ project-name: 'aaf-authz' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -22,4 +21,15 @@ mvn-profile: docker docker-pom: 'authz-service/pom.xml' files: '**' - archive-artifacts: ''
\ No newline at end of file + archive-artifacts: '' +- project: + name: aaf-authz-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'aaf/authz' + project-name: 'aaf-authz' + branch: 'master' + mvn-settings: 'aaf-authz-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml index d8037596d..63dfb73c8 100644 --- a/jjb/aaf/aaf-cadi.yaml +++ b/jjb/aaf/aaf-cadi.yaml @@ -4,7 +4,6 @@ project-name: 'aaf-cadi' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -18,4 +17,15 @@ branch: 'master' mvn-settings: 'aaf-cadi-settings' files: '**' - archive-artifacts: ''
\ No newline at end of file + archive-artifacts: '' +- project: + name: aaf-cadi-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'aaf/cadi' + project-name: 'aaf-cadi' + branch: 'master' + mvn-settings: 'aaf-cadi-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/aaf/aaf-inno.yaml b/jjb/aaf/aaf-inno.yaml index 22d8a2231..51a8b5f26 100644 --- a/jjb/aaf/aaf-inno.yaml +++ b/jjb/aaf/aaf-inno.yaml @@ -4,7 +4,6 @@ project-name: 'aaf-inno' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -18,4 +17,15 @@ branch: 'master' mvn-settings: 'aaf-inno-settings' files: '**' - archive-artifacts: ''
\ No newline at end of file + archive-artifacts: '' +- project: + name: aaf-inno-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'aaf/inno' + project-name: 'aaf-inno' + branch: 'master' + mvn-settings: 'aaf-inno-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/aaf/aaf-sms.yaml b/jjb/aaf/aaf-sms.yaml new file mode 100644 index 000000000..0cec0060d --- /dev/null +++ b/jjb/aaf/aaf-sms.yaml @@ -0,0 +1,16 @@ +--- +- project: + name: aaf-sms + project-name: 'aaf-sms' + path: 'sms-service/src/sms' + jobs: + - '{project-name}-{stream}-verify-golang' + - '{project-name}-{stream}-merge-golang' + project: 'aaf/sms' + stream: + - 'master': + branch: 'master' + mvn-settings: 'aaf-sms-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 421f4c6df..31b67c6fe 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -4,7 +4,6 @@ project-name: 'aai-aai-common' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -25,13 +24,12 @@ project-name: 'aai-aai-common' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily-no-sonar' + trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'aai/aai-common' stream: @@ -41,3 +39,14 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: aai-aai-common-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'aai/aai-common' + project-name: 'aai-aai-common' + branch: 'master' + mvn-settings: 'aai-aai-common-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/aai/aai-aai-service.yaml b/jjb/aai/aai-aai-service.yaml deleted file mode 100644 index 48514f623..000000000 --- a/jjb/aai/aai-aai-service.yaml +++ /dev/null @@ -1,19 +0,0 @@ ---- -- project: - name: aai-aai-service - project-name: 'aai-aai-service' - jobs: - - gerrit-maven-clm: - java-version: '' - build-timeout: 45 - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - project: 'aai/aai-service' - stream: - - 'release-1.0.0': - branch: 'release-1.0.0' - mvn-settings: 'aai-aai-service-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index 30162c76a..3e16cf5fa 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -4,7 +4,6 @@ project-name: 'aai-babel' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-java-daily' @@ -19,3 +18,14 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: aai-babel-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'aai/babel' + project-name: 'aai-babel' + branch: 'master' + mvn-settings: 'aai-babel-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml index ce859701c..842a49ec2 100644 --- a/jjb/aai/aai-champ.yaml +++ b/jjb/aai/aai-champ.yaml @@ -4,7 +4,6 @@ project-name: 'aai-champ' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -20,3 +19,14 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: aai-champ-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'aai/champ' + project-name: 'aai-champ' + branch: 'master' + mvn-settings: 'aai-champ-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml index 8d1a83779..3606b6831 100644 --- a/jjb/aai/aai-data-router.yaml +++ b/jjb/aai/aai-data-router.yaml @@ -4,7 +4,6 @@ project-name: 'aai-data-router' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -23,10 +22,9 @@ project-name: 'aai-data-router' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-aai-docker-java-daily': pom: 'pom.xml' mvn-goals: 'docker:build' @@ -37,3 +35,14 @@ mvn-settings: 'aai-data-router-settings' files: '**' archive-artifacts: '' +- project: + name: aai-data-router-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'aai/data-router' + project-name: 'aai-data-router' + branch: 'master' + mvn-settings: 'aai-data-router-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml index face2b853..b870687fb 100644 --- a/jjb/aai/aai-esr-gui.yaml +++ b/jjb/aai/aai-esr-gui.yaml @@ -4,10 +4,9 @@ project-name: 'aai-esr-gui' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-daily' project: 'aai/esr-gui' @@ -22,3 +21,14 @@ docker-pom: 'pom.xml' mvn-profile: docker build-node: ubuntu1604-basebuild-4c-4g +- project: + name: aai-esr-gui-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'aai/esr-gui' + project-name: 'aai-esr-gui' + branch: 'master' + mvn-settings: 'aai-esr-gui-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml index 3a9f31c1d..612fe9431 100644 --- a/jjb/aai/aai-esr-server.yaml +++ b/jjb/aai/aai-esr-server.yaml @@ -4,7 +4,6 @@ project-name: 'aai-esr-server' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -25,10 +24,9 @@ project-name: 'aai-esr-server' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-daily' project: 'aai/esr-server' @@ -41,3 +39,14 @@ docker-pom: 'pom.xml' mvn-profile: docker build-node: ubuntu1604-basebuild-4c-4g +- project: + name: aai-esr-server-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'aai/esr-server' + project-name: 'aai-esr-server' + branch: 'master' + mvn-settings: 'aai-esr-server-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vid/vid-asdcclient.yaml b/jjb/aai/aai-event-client.yaml index 6069ec0cd..3f755e50c 100644 --- a/jjb/vid/vid-asdcclient.yaml +++ b/jjb/aai/aai-event-client.yaml @@ -1,20 +1,16 @@ --- - project: - name: vid-asdcclient - project-name: 'vid-asdcclient' + name: aai-event-client-master + project-name: 'aai-event-client' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - project: 'vid/asdcclient' + project: 'aai/event-client' stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' - mvn-settings: 'vid-settings' + mvn-settings: 'aai-event-client-settings' files: '**' - archive-artifacts: '' + archive-artifacts: ''
\ No newline at end of file diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml index 326b0c51a..691796019 100644 --- a/jjb/aai/aai-logging-service.yaml +++ b/jjb/aai/aai-logging-service.yaml @@ -4,7 +4,6 @@ project-name: 'aai-logging-service' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -20,10 +19,9 @@ project-name: 'aai-logging-service' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'aai/logging-service' stream: - 'release-1.0.0': @@ -33,3 +31,14 @@ mvn-settings: 'aai-logging-service-settings' files: '**' archive-artifacts: '' +- project: + name: aai-logging-service-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'aai/logging-service' + project-name: 'aai-logging-service' + branch: 'master' + mvn-settings: 'aai-logging-service-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index a75a7126c..0f7b1ecc6 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -4,7 +4,6 @@ project-name: 'aai-model-loader' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -24,10 +23,9 @@ project-name: 'aai-model-loader' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-aai-docker-java-daily': pom: 'pom.xml' mvn-goals: 'docker:build' @@ -39,3 +37,14 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: aai-model-loader-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'aai/model-loader' + project-name: 'aai-model-loader' + branch: 'master' + mvn-settings: 'aai-model-loader-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index 5bf70c882..cd080b3fc 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -4,7 +4,6 @@ project-name: 'aai-resources' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -28,13 +27,12 @@ project-name: 'aai-resources' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily-no-sonar' + trigger-job: '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-aai-docker-java-version-daily': pom: 'aai-resources/pom.xml' mvn-goals: 'docker:build docker:push' @@ -47,3 +45,14 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: aai-resources-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'aai/resources' + project-name: 'aai-resources' + branch: 'master' + mvn-settings: 'aai-resources-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index 0bd90eb0c..848a22279 100644 --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@ -4,7 +4,6 @@ project-name: 'aai-rest-client' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -20,10 +19,9 @@ project-name: 'aai-rest-client' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'aai/rest-client' stream: - 'amsterdam': @@ -31,3 +29,14 @@ mvn-settings: 'aai-rest-client-settings' files: '**' archive-artifacts: '' +- project: + name: aai-rest-client-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'aai/rest-client' + project-name: 'aai-rest-client' + branch: 'master' + mvn-settings: 'aai-rest-client-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml index 4dd1c1f22..e159e7f20 100644 --- a/jjb/aai/aai-router-core-service.yaml +++ b/jjb/aai/aai-router-core-service.yaml @@ -4,7 +4,6 @@ project-name: 'aai-router-core' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -20,10 +19,9 @@ project-name: 'aai-router-core' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'aai/router-core' stream: - 'amsterdam': @@ -31,3 +29,14 @@ mvn-settings: 'aai-router-core-settings' files: '**' archive-artifacts: '' +- project: + name: aai-router-core-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'aai/router-core' + project-name: 'aai-router-core' + branch: 'master' + mvn-settings: 'aai-router-core-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml index 05c43015c..d86ea2e9b 100644 --- a/jjb/aai/aai-search-data-service.yaml +++ b/jjb/aai/aai-search-data-service.yaml @@ -4,7 +4,6 @@ project-name: 'aai-search-data-service' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -23,10 +22,9 @@ project-name: 'aai-search-data-service' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-aai-docker-java-daily': pom: 'pom.xml' mvn-goals: 'docker:build' diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index 8fc52a8ae..d2d0e4c16 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -4,7 +4,6 @@ project-name: 'aai-sparky-be' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -23,10 +22,9 @@ project-name: 'aai-sparky-be' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-aai-docker-java-daily': pom: 'pom.xml' mvn-goals: 'docker:build' @@ -37,3 +35,14 @@ mvn-settings: 'aai-sparky-be-settings' files: '**' archive-artifacts: '' +- project: + name: aai-sparky-be-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'aai/sparky-be' + project-name: 'aai-sparky-be' + branch: 'master' + mvn-settings: 'aai-sparky-be-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml index bec805f26..2dab4d5e4 100644 --- a/jjb/aai/aai-sparky-fe.yaml +++ b/jjb/aai/aai-sparky-fe.yaml @@ -5,10 +5,9 @@ build-node: 'centos7-basebuild-4c-4g' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'aai/sparky-fe' stream: - 'master': @@ -18,3 +17,14 @@ mvn-settings: 'aai-sparky-fe-settings' files: '**' archive-artifacts: '' +- project: + name: aai-sparky-fe-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'aai/sparky-fe' + project-name: 'aai-sparky-fe' + branch: 'master' + mvn-settings: 'aai-sparky-fe-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index 808d741eb..cecc7ae30 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -4,7 +4,6 @@ project-name: 'aai-traversal' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -28,13 +27,12 @@ project-name: 'aai-traversal' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily-no-sonar' + trigger-job: '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-aai-docker-java-version-daily': pom: 'aai-traversal/pom.xml' mvn-goals: 'docker:build docker:push' @@ -47,3 +45,14 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: aai-traversal-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'aai/traversal' + project-name: 'aai-traversal' + branch: 'master' + mvn-settings: 'aai-traversal-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml index 782e6e253..41b7de949 100644 --- a/jjb/appc/appc-deployment.yaml +++ b/jjb/appc/appc-deployment.yaml @@ -5,10 +5,9 @@ project-name: 'appc-deployment' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-daily' - '{project-name}-{stream}-docker-version-java-daily' - '{project-name}-docker-image-blessing' diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml index ef16fad4d..6dd2b7123 100644 --- a/jjb/appc/appc-master.yaml +++ b/jjb/appc/appc-master.yaml @@ -4,9 +4,9 @@ project-name: 'appc' jobs: - gerrit-maven-clm: - java-version: '' mvn-params: '-DskipTests' build-timeout: 30 + build-node: ubuntu1604-basebuild-8c-8g - '{project-name}-{stream}-verify-java': build-node: ubuntu1604-basebuild-8c-8g - '{project-name}-{stream}-merge-java': @@ -21,3 +21,14 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: appc-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-8c-8g + project: 'appc' + project-name: 'appc' + branch: 'master' + mvn-settings: 'appc-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/appc/appc-release.yaml b/jjb/appc/appc-release.yaml deleted file mode 100644 index d343a15d0..000000000 --- a/jjb/appc/appc-release.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -- project: - name: appc-release - project-name: 'appc' - jobs: - - gerrit-maven-clm: - java-version: '' - mvn-params: '-DskipTests' - build-timeout: 30 - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' - - project: 'appc' - stream: - - 'amsterdam': - branch: 'amsterdam' - mvn-settings: 'appc-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml index 05a134d9a..6189533f7 100644 --- a/jjb/ccsdk/dashboard.yaml +++ b/jjb/ccsdk/dashboard.yaml @@ -4,7 +4,6 @@ project-name: 'ccsdk-dashboard' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -20,3 +19,14 @@ deployAtEnd=true files: '**' archive-artifacts: '' +- project: + name: ccsdk-dashboard-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'ccsdk/dashboard' + project-name: 'ccsdk-dashboard' + branch: 'master' + mvn-settings: 'ccsdk-dashboard-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index a77f6a3c9..29dfe0f1f 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -4,10 +4,9 @@ project-name: 'ccsdk-distribution' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-daily' - '{project-name}-{stream}-docker-version-java-daily' @@ -21,3 +20,14 @@ docker-pom: 'pom.xml' mvn-profile: docker build-node: ubuntu1604-docker-8c-8g +- project: + name: ccsdk-distribution-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'ccsdk/distribution' + project-name: 'ccsdk-distribution' + branch: 'master' + mvn-settings: 'ccsdk-distribution-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index d1a4204b6..033f1c177 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -4,7 +4,6 @@ project-name: 'ccsdk-parent' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/ccsdk/platform-nbapi.yaml b/jjb/ccsdk/platform-nbapi.yaml index 771087aaf..ce67fa14a 100644 --- a/jjb/ccsdk/platform-nbapi.yaml +++ b/jjb/ccsdk/platform-nbapi.yaml @@ -4,10 +4,9 @@ project-name: 'ccsdk-platform-nbapi' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/platform/nbapi' stream: @@ -21,3 +20,14 @@ deployAtEnd=true files: '**' archive-artifacts: '' +- project: + name: ccsdk-platform-nbapi-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'ccsdk/platform/nbapi' + project-name: 'ccsdk-platform-nbapi' + branch: 'master' + mvn-settings: 'ccsdk-platform-nbapi-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml index 1fc194a5f..90d9c29e8 100644 --- a/jjb/ccsdk/platform-plugins.yaml +++ b/jjb/ccsdk/platform-plugins.yaml @@ -4,10 +4,9 @@ project-name: 'ccsdk-platform-plugins' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/platform/plugins' stream: @@ -21,3 +20,14 @@ deployAtEnd=true files: '**' archive-artifacts: '' +- project: + name: ccsdk-platform-plugins-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'ccsdk/platform/plugins' + project-name: 'ccsdk-platform-plugins' + branch: 'master' + mvn-settings: 'ccsdk-platform-plugins-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml index cc51531c0..38f44d3f4 100644 --- a/jjb/ccsdk/sli-adaptors.yaml +++ b/jjb/ccsdk/sli-adaptors.yaml @@ -4,7 +4,6 @@ project-name: 'ccsdk-sli-adaptors' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -22,3 +21,14 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: ccsdk-sli-adaptors-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'ccsdk/sli/adaptors' + project-name: 'ccsdk-sli-adaptors' + branch: 'master' + mvn-settings: 'ccsdk-sli-adaptors-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml index 16beca1f5..90d350a70 100644 --- a/jjb/ccsdk/sli-core.yaml +++ b/jjb/ccsdk/sli-core.yaml @@ -4,7 +4,6 @@ project-name: 'ccsdk-sli-core' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -22,3 +21,14 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: ccsdk-sli-core-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'ccsdk/sli/core' + project-name: 'ccsdk-sli-core' + branch: 'master' + mvn-settings: 'ccsdk-sli-core-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml index 1f7c4a884..99f1d98dd 100644 --- a/jjb/ccsdk/sli-northbound.yaml +++ b/jjb/ccsdk/sli-northbound.yaml @@ -4,7 +4,6 @@ project-name: 'ccsdk-sli-northbound' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -22,3 +21,14 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: ccsdk-sli-northbound-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'ccsdk/sli/northbound' + project-name: 'ccsdk-sli-northbound' + branch: 'master' + mvn-settings: 'ccsdk-sli-northbound-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml index 120ecec62..e3d2d8e08 100644 --- a/jjb/ccsdk/sli-plugins.yaml +++ b/jjb/ccsdk/sli-plugins.yaml @@ -4,7 +4,6 @@ project-name: 'ccsdk-sli-plugins' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -21,3 +20,14 @@ deployAtEnd=true files: '**' archive-artifacts: '' +- project: + name: ccsdk-sli-plugins-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'ccsdk/sli/plugins' + project-name: 'ccsdk-sli-plugins' + branch: 'master' + mvn-settings: 'ccsdk-sli-plugins-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/ccsdk/storage-pgaas.yaml b/jjb/ccsdk/storage-pgaas.yaml index ba8327aaa..c374a4138 100644 --- a/jjb/ccsdk/storage-pgaas.yaml +++ b/jjb/ccsdk/storage-pgaas.yaml @@ -4,10 +4,9 @@ project-name: 'ccsdk-storage-pgaas' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/storage/pgaas' stream: @@ -21,3 +20,14 @@ deployAtEnd=true files: '**' archive-artifacts: '' +- project: + name: ccsdk-storage-pgaas-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'ccsdk/storage/pgaas' + project-name: 'ccsdk-storage-pgaas' + branch: 'master' + mvn-settings: 'ccsdk-storage-pgaas-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml index 6613e874c..519e5968a 100644 --- a/jjb/ccsdk/utils.yaml +++ b/jjb/ccsdk/utils.yaml @@ -4,10 +4,9 @@ project-name: 'ccsdk-utils' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/utils' stream: diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml index 20776992a..583540684 100644 --- a/jjb/clamp/clamp.yaml +++ b/jjb/clamp/clamp.yaml @@ -5,7 +5,6 @@ project-name: 'clamp' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java-checkstyle' - '{project-name}-{stream}-merge-properties-java': mvn_properties: @@ -31,9 +30,18 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'clamp-settings' files: '**' archive-artifacts: '' build-node: ubuntu1604-docker-8c-8g +- project: + name: clamp-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-docker-8c-8g + project: 'clamp' + project-name: 'clamp' + branch: 'master' + mvn-settings: 'clamp-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml index 1c3905289..bce873e7e 100644 --- a/jjb/cli/cli.yaml +++ b/jjb/cli/cli.yaml @@ -5,7 +5,6 @@ project-name: 'cli' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -27,3 +26,14 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: cli-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'cli' + project-name: 'cli' + branch: 'master' + mvn-settings: 'cli-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/dcaegen2/apod-analytics.yaml b/jjb/dcaegen2/apod-analytics.yaml index 4e6f2f3c6..a44f7b302 100644 --- a/jjb/dcaegen2/apod-analytics.yaml +++ b/jjb/dcaegen2/apod-analytics.yaml @@ -1,27 +1,38 @@ ----
-- project:
- name: dcaegen2-analytics-tca
-
- # job template iterators
- project-name: 'dcaegen2-analytics-tca'
- stream:
- - 'master':
- branch: 'master'
- - 'amsterdam':
- branch: 'amsterdam'
-
- # apply to all jobs
- project: 'dcaegen2/analytics/tca'
- mvn-settings: 'dcaegen2-analytics-tca-settings'
- files: '**'
- maven-deploy-properties: |
- deployAtEnd=true
- archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
-
- jobs:
- - '{project-name}-{stream}-release-version-java-daily'
- - '{project-name}-{stream}-verify-java-skip-tests':
- mvn-goals: 'clean install'
- - '{project-name}-{stream}-merge-java':
- mvn-goals: 'clean deploy'
+--- +- project: + name: dcaegen2-analytics-tca + + # job template iterators + project-name: 'dcaegen2-analytics-tca' + stream: + - 'master': + branch: 'master' + - 'amsterdam': + branch: 'amsterdam' + + # apply to all jobs + project: 'dcaegen2/analytics/tca' + mvn-settings: 'dcaegen2-analytics-tca-settings' + files: '**' + maven-deploy-properties: | + deployAtEnd=true + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g + + jobs: + - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-verify-java-skip-tests': + mvn-goals: 'clean install' + - '{project-name}-{stream}-merge-java': + mvn-goals: 'clean deploy' +- project: + name: dcaegen2-analytics-tca-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'dcaegen2/analytics/tca' + project-name: 'dcaegen2-analytics-tca' + branch: 'master' + mvn-settings: 'dcaegen2-analytics-tca-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/dcaegen2/dcaegen2-analytics.yaml b/jjb/dcaegen2/dcaegen2-analytics.yaml index 5edbd1eeb..afe2d53f6 100644 --- a/jjb/dcaegen2/dcaegen2-analytics.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics.yaml @@ -5,14 +5,12 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'dcaegen2/analytics' stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'dcaegen2-analytics-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties @@ -22,3 +20,14 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-analytics-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'dcaegen2/analytics' + project-name: 'dcaegen2-analytics' + branch: 'master' + mvn-settings: 'dcaegen2-analytics-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml index 4053148c3..57d7be548 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml @@ -5,14 +5,12 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'dcaegen2/collectors/snmptrap' stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'dcaegen2-collectors-snmptrap-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties @@ -22,3 +20,14 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-collectors-snmptrap-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'dcaegen2/collectors/snmptrap' + project-name: 'dcaegen2-collectors-snmptrap' + branch: 'master' + mvn-settings: 'dcaegen2-collectors-snmptrap-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index 4f03d9939..60b43d901 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -22,3 +22,14 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-collectors-ves-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'dcaegen2/collectors/ves' + project-name: 'dcaegen2-collectors-ves' + branch: 'master' + mvn-settings: 'dcaegen2-collectors-ves-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/dcaegen2/dcaegen2-collectors.yaml b/jjb/dcaegen2/dcaegen2-collectors.yaml index c0b39cb35..ba1782c78 100644 --- a/jjb/dcaegen2/dcaegen2-collectors.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors.yaml @@ -5,14 +5,12 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'dcaegen2/collectors' stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'dcaegen2-collectors-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties @@ -22,3 +20,14 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-collectors-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'dcaegen2/collectors' + project-name: 'dcaegen2-collectors' + branch: 'master' + mvn-settings: 'dcaegen2-collectors-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml index deaab94fd..6e4b49f3c 100644 --- a/jjb/dcaegen2/dcaegen2-deployments.yaml +++ b/jjb/dcaegen2/dcaegen2-deployments.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'dcaegen2/deployments' stream: @@ -22,3 +22,14 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-deployments-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'dcaegen2/deployments' + project-name: 'dcaegen2-deployments' + branch: 'master' + mvn-settings: 'dcaegen2-deployments-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml index ab047d53f..924ecef27 100644 --- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'dcaegen2/platform/blueprints' stream: @@ -22,3 +22,14 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-platform-blueprints-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'dcaegen2/platform/blueprints' + project-name: 'dcaegen2-platform-blueprints' + branch: 'master' + mvn-settings: 'dcaegen2-platform-blueprints-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml index ce4f8484b..d86b81fd2 100644 --- a/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'dcaegen2/platform/cdapbroker' stream: @@ -22,3 +22,14 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-platform-cdapbroker-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'dcaegen2/platform/cdapbroker' + project-name: 'dcaegen2-platform-cdapbroker' + branch: 'master' + mvn-settings: 'dcaegen2-platform-cdapbroker-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/dcaegen2/dcaegen2-platform-cli.yaml b/jjb/dcaegen2/dcaegen2-platform-cli.yaml index 19460414d..df5dff034 100644 --- a/jjb/dcaegen2/dcaegen2-platform-cli.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-cli.yaml @@ -5,14 +5,12 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'dcaegen2/platform/cli' stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'dcaegen2-platform-cli-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties @@ -22,3 +20,14 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-platform-cli-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'dcaegen2/platform/cli' + project-name: 'dcaegen2-platform-cli' + branch: 'master' + mvn-settings: 'dcaegen2-platform-cli-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml index 6109812b9..551a14b20 100644 --- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'dcaegen2/platform/configbinding' stream: @@ -22,3 +22,14 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-platform-configbinding-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'dcaegen2/platform/configbinding' + project-name: 'dcaegen2-platform-configbinding' + branch: 'master' + mvn-settings: 'dcaegen2-platform-configbinding-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml index 3c21e9b42..70b5fc59c 100644 --- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'dcaegen2/platform/deployment-handler' stream: @@ -22,3 +22,14 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-platform-deployment-handler-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'dcaegen2/platform/deployment-handler' + project-name: 'dcaegen2-platform-deployment-handler' + branch: 'master' + mvn-settings: 'dcaegen2-platform-deployment-handler-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml index 543c627b1..628e3a1fe 100644 --- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml @@ -26,3 +26,14 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-platform-inventory-api-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'dcaegen2/platform/inventory-api' + project-name: 'dcaegen2-platform-inventory-api' + branch: 'master' + mvn-settings: 'dcaegen2-platform-inventory-api-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml index 560713812..8942b5065 100644 --- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'dcaegen2/platform/plugins' stream: @@ -22,3 +22,14 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-platform-plugins-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'dcaegen2/platform/plugins' + project-name: 'dcaegen2-platform-plugins' + branch: 'master' + mvn-settings: 'dcaegen2-platform-plugins-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml index ccff1c56c..1e63696d4 100644 --- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'dcaegen2/platform/policy-handler' stream: @@ -22,3 +22,14 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-platform-policy-handler-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'dcaegen2/platform/policy-handler' + project-name: 'dcaegen2-platform-policy-handler' + branch: 'master' + mvn-settings: 'dcaegen2-platform-policy-handler-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml index e2821a90d..5183ba7f4 100644 --- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-shell-daily': mvn-goals: 'clean package docker:build -DpushImage' # No-op @@ -26,3 +26,14 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-platform-servicechange-handler-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'dcaegen2/platform/servicechange-handler' + project-name: 'dcaegen2-platform-servicechange-handler' + branch: 'master' + mvn-settings: 'dcaegen2-platform-servicechange-handler-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/dcaegen2/dcaegen2-platform.yaml b/jjb/dcaegen2/dcaegen2-platform.yaml index ce12261f5..17a2c09bc 100644 --- a/jjb/dcaegen2/dcaegen2-platform.yaml +++ b/jjb/dcaegen2/dcaegen2-platform.yaml @@ -5,14 +5,12 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'dcaegen2/platform' stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'dcaegen2-platform-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties @@ -21,3 +19,14 @@ deployAtEnd=true files: '**' archive-artifacts: '' +- project: + name: dcaegen2-platform-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'dcaegen2/platform' + project-name: 'dcaegen2-platform' + branch: 'master' + mvn-settings: 'dcaegen2-platform-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml index 3f4f16124..8e755772a 100644 --- a/jjb/dcaegen2/dcaegen2-utils.yaml +++ b/jjb/dcaegen2/dcaegen2-utils.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'dcaegen2/utils' stream: @@ -22,3 +22,14 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-utils-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'dcaegen2/utils' + project-name: 'dcaegen2-utils' + branch: 'master' + mvn-settings: 'dcaegen2-utils-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml index 6fb6fccc1..620179633 100644 --- a/jjb/dcaegen2/dcaegen2.yaml +++ b/jjb/dcaegen2/dcaegen2.yaml @@ -4,10 +4,9 @@ project-name: 'dcaegen2' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'dcaegen2' stream: @@ -24,3 +23,14 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'dcaegen2' + project-name: 'dcaegen2' + branch: 'master' + mvn-settings: 'dcaegen2-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml index cebe89552..99504c29e 100644 --- a/jjb/demo/demo.yaml +++ b/jjb/demo/demo.yaml @@ -5,10 +5,9 @@ project-name: 'demo' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'demo' stream: @@ -21,3 +20,14 @@ mvn-settings: 'demo-settings' files: '**' archive-artifacts: '' +- project: + name: demo-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'demo' + project-name: 'demo' + branch: 'master' + mvn-settings: 'demo-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml index f18d86347..9f3874b6a 100644 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ b/jjb/dmaap/dmaap-buscontroller.yaml @@ -4,7 +4,6 @@ project-name: 'dmaap-buscontroller' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -16,8 +15,17 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'dmaap-buscontroller-settings' files: '**' archive-artifacts: '' +- project: + name: dmaap-buscontroller-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'dmaap/buscontroller' + project-name: 'dmaap-buscontroller' + branch: 'master' + mvn-settings: 'dmaap-buscontroller-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml index 6ca5a0634..893fdba86 100644 --- a/jjb/dmaap/dmaap-dbcapi.yaml +++ b/jjb/dmaap/dmaap-dbcapi.yaml @@ -4,7 +4,6 @@ project-name: 'dmaap-dbcapi' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -16,8 +15,17 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'dmaap-dbcapi-settings' files: '**' archive-artifacts: '' +- project: + name: dmaap-dbcapi-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'dmaap/dbcapi' + project-name: 'dmaap-dbcapi' + branch: 'master' + mvn-settings: 'dmaap-dbcapi-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml index 19e782542..d7367ac21 100644 --- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml +++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml @@ -4,7 +4,6 @@ project-name: 'dmaap-messagerouter-dmaapclient' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -20,4 +19,15 @@ branch: 'amsterdam' mvn-settings: 'dmaap-messagerouter-dmaapclient-settings' files: '**' - archive-artifacts: ''
\ No newline at end of file + archive-artifacts: '' +- project: + name: dmaap-messagerouter-dmaapclient-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'dmaap/messagerouter/dmaapclient' + project-name: 'dmaap-messagerouter-dmaapclient' + branch: 'master' + mvn-settings: 'dmaap-messagerouter-dmaapclient-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml index 498ddba0b..22f043e9d 100644 --- a/jjb/dmaap/dmaap-messagerouter-docker.yaml +++ b/jjb/dmaap/dmaap-messagerouter-docker.yaml @@ -5,7 +5,6 @@ project-name: 'dmaap-messagerouter-docker' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml index 7dcfa2add..327b13ffa 100644 --- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml +++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml @@ -4,7 +4,6 @@ project-name: 'dmaap-messagerouter-messageservice' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -20,4 +19,15 @@ branch: 'amsterdam' mvn-settings: 'dmaap-messagerouter-messageservice-settings' files: '**' - archive-artifacts: ''
\ No newline at end of file + archive-artifacts: '' +- project: + name: dmaap-messagerouter-messageservice-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'dmaap/messagerouter/messageservice' + project-name: 'dmaap-messagerouter-messageservice' + branch: 'master' + mvn-settings: 'dmaap-messagerouter-messageservice-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml index 89b942be8..6f150f123 100644 --- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml +++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml @@ -1,23 +1,33 @@ ----
-- project:
- name: dmaap-messagerouter-mirroragent
- project-name: 'dmaap-messagerouter-mirroragent'
- jobs:
+--- +- project: + name: dmaap-messagerouter-mirroragent + project-name: 'dmaap-messagerouter-mirroragent' + jobs: - gerrit-maven-clm: - java-version: '' - - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
- - '{project-name}-{stream}-stage-site-java':
- site-pom: 'pom.xml'
- trigger-job: '{project-name}-{stream}-release-version-java-daily'
- mvn-goals: 'clean install'
- project: 'dmaap/messagerouter/mirroragent'
- stream:
- - 'master':
- branch: 'master'
+ - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-stage-site-java': + site-pom: 'pom.xml' + trigger-job: '{project-name}-{stream}-release-version-java-daily' + mvn-goals: 'clean install' + project: 'dmaap/messagerouter/mirroragent' + stream: + - 'master': + branch: 'master' - 'amsterdam': branch: 'amsterdam' - mvn-settings: 'dmaap-messagerouter-mirroragent-settings'
- files: '**'
- archive-artifacts: ''
\ No newline at end of file + mvn-settings: 'dmaap-messagerouter-mirroragent-settings' + files: '**' + archive-artifacts: '' +- project: + name: dmaap-messagerouter-mirroragent-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'dmaap/messagerouter/mirroragent' + project-name: 'dmaap-messagerouter-mirroragent' + branch: 'master' + mvn-settings: 'dmaap-messagerouter-mirroragent-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml index 748b0d515..bcb8ad7dc 100644 --- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml +++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml @@ -4,7 +4,6 @@ project-name: 'dmaap-messagerouter-msgrtr' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -20,4 +19,15 @@ branch: 'amsterdam' mvn-settings: 'dmaap-messagerouter-msgrtr-settings' files: '**' - archive-artifacts: ''
\ No newline at end of file + archive-artifacts: '' +- project: + name: dmaap-messagerouter-msgrtr-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'dmaap/messagerouter/msgrtr' + project-name: 'dmaap-messagerouter-msgrtr' + branch: 'master' + mvn-settings: 'dmaap-messagerouter-msgrtr-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/global-jjb b/jjb/global-jjb -Subproject 779110b5cd63f3eabb63598a1be79d9b9ba8546 +Subproject 8e33e6ab798cd57a383cb8871d973de3fce6340 diff --git a/jjb/global-templates-golang.yaml b/jjb/global-templates-golang.yaml new file mode 100644 index 000000000..73ebcd278 --- /dev/null +++ b/jjb/global-templates-golang.yaml @@ -0,0 +1,123 @@ +--- +- job-template: + # Job template for Golang verify jobs + # + # The purpose of this job template is to run: + # 1. make build + # + # Required Variables: + # branch: git branch (eg. stable/lithium or master) + + name: '{project-name}-{stream}-verify-golang' + path: '$WORKSPACE' + + project-type: freestyle + concurrent: true + node: '{build-node}' + + properties: + - infra-properties: + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - infra-parameters: + project: '{project}' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + + scm: + - gerrit-trigger-scm: + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + submodule-recursive: '{submodule-recursive}' + + wrappers: + - infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - gerrit-trigger-patch-submitted: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + files: '**' + + builders: + - provide-maven-settings: + global-settings-file: 'global-settings' + settings-file: '{mvn-settings}' + - shell: | + #!/bin/bash + curl -O https://dl.google.com/go/go1.9.4.linux-amd64.tar.gz + tar -zxf go1.9.4.linux-amd64.tar.gz + export GOROOT=$WORKSPACE/go + export PATH=$PATH:$GOROOT/bin + cd $WORKSPACE/{path} + make build + + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' + +- job-template: + # Job template for Golang merge jobs + # + # The purpose of this job template is to run: + # 1. make deploy + # + # Required Variables: + # branch: git branch (eg. stable/lithium or master) + + name: '{project-name}-{stream}-merge-golang' + path: $WORKSPACE + + project-type: freestyle + node: '{build-node}' + + properties: + - infra-properties: + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - infra-parameters: + project: '{project}' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + - maven-exec: + maven-version: '{maven-version}' + + scm: + - gerrit-trigger-scm: + refspec: '' + choosing-strategy: 'default' + submodule-recursive: '{submodule-recursive}' + + wrappers: + - infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - gerrit-trigger-patch-merged: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + files: '**' + + builders: + - provide-maven-settings: + global-settings-file: 'global-settings' + settings-file: '{mvn-settings}' + - shell: | + #!/bin/bash + curl -O https://dl.google.com/go/go1.9.4.linux-amd64.tar.gz + tar -zxf go1.9.4.linux-amd64.tar.gz + export GOROOT=$PWD/go + export PATH=$PATH:$GOROOT/bin + cd $WORKSPACE/{path} + make deploy + + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 61b4b0700..6ccc2b491 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -327,75 +327,7 @@ project-type: freestyle node: '{build-node}' - maven-deploy-properties: - properties: - - infra-properties: - build-days-to-keep: '{build-days-to-keep}' - - parameters: - - infra-parameters: - project: '{project}' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - maven-exec: - maven-version: '{maven-version}' - - scm: - - gerrit-trigger-scm: - refspec: '' - choosing-strategy: 'default' - submodule-recursive: '{submodule-recursive}' - - wrappers: - - infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - # 11 AM UTC - - timed: 'H 11 * * *' - - gerrit-trigger-release-manually: - server: '{server-name}' - project: '{project}' - branch: '{branch}' - - builders: - - provide-maven-settings: - global-settings-file: 'global-settings' - settings-file: '{mvn-settings}' - - - maven-target: - maven-version: '{maven-version}' - goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}} -B - -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - properties: - - '{maven-deploy-properties}' - java-opts: - - '-Xmx4096m -XX:MaxPermSize=512m' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - -- job-template: - # Job template for Java daily release jobs - # - # The purpose of this job template is to run: - # 1. maven clean deploy skipping Sonar scans - # - # This template skips Sonar scans. - # - # Required Variables: - # branch: git branch (eg. stable/lithium or master) - - name: '{project-name}-{stream}-release-java-daily-no-sonar' - - project-type: freestyle - node: '{build-node}' + disabled: false maven-deploy-properties: properties: - infra-properties: @@ -467,6 +399,7 @@ name: '{project-name}-{stream}-release-java-daily-checkstyle' project-type: freestyle node: '{build-node}' + disabled: false maven-deploy-properties: properties: - infra-properties: @@ -516,7 +449,7 @@ global-settings-type: cfp - maven-target: maven-version: '{maven-version}' - goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}} -B + goals: 'clean deploy -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' properties: '{obj:mvn_properties}' settings: '{mvn-settings}' @@ -533,169 +466,6 @@ # # The purpose of this job template is to run: # 1. maven set versions - # 2. maven clean deploy - # - # This template skips Sonar scans. - # - # Required Variables: - # branch: git branch (eg. stable/lithium or master) - - name: '{project-name}-{stream}-release-version-java-daily-no-sonar' - - project-type: freestyle - node: '{build-node}' - maven-deploy-properties: - properties: - - infra-properties: - build-days-to-keep: '{build-days-to-keep}' - - parameters: - - infra-parameters: - project: '{project}' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - maven-exec: - maven-version: '{maven-version}' - - scm: - - gerrit-trigger-scm: - refspec: '' - choosing-strategy: 'default' - submodule-recursive: '{submodule-recursive}' - - wrappers: - - infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - # 11 AM UTC - - timed: 'H H(10-17) * * *' - - gerrit-trigger-release-manually: - server: '{server-name}' - project: '{project}' - branch: '{branch}' - - builders: - - provide-maven-settings: - global-settings-file: 'global-settings' - settings-file: '{mvn-settings}' - - - inject: - properties-file: version.properties - - maven-target: - maven-version: '{maven-version}' - goals: 'versions:set versions:update-child-modules versions:commit -B' - properties: - - 'newVersion=${{release_version}}' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - - maven-target: - maven-version: '{maven-version}' - goals: 'clean deploy -B - -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - properties: - - '{maven-deploy-properties}' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - -- job-template: - # Job template for Java daily release jobs for subprojects - # - # The purpose of this job template is to run: - # 1. maven set versions - # 2. maven clean deploy - # - # This template skips Sonar scans. - # This job supports subprojects. - # - # Required Variables: - # branch: git branch (eg. stable/lithium or master) - - name: '{project-name}-{stream}-{subproject}-release-version-java-daily-no-sonar' - - project-type: freestyle - node: '{build-node}' - maven-deploy-properties: - properties: - - infra-properties: - build-days-to-keep: '{build-days-to-keep}' - - parameters: - - infra-parameters: - project: '{project}' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - maven-exec: - maven-version: '{maven-version}' - - scm: - - gerrit-trigger-scm: - refspec: '' - choosing-strategy: 'default' - submodule-recursive: '{submodule-recursive}' - - wrappers: - - infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - # 11 AM UTC - - timed: 'H H(10-17) * * *' - - gerrit-trigger-release-manually: - server: '{server-name}' - project: '{project}' - branch: '{branch}' - - builders: - - provide-maven-settings: - global-settings-file: 'global-settings' - settings-file: '{mvn-settings}' - - - inject: - properties-file: version.properties - - maven-target: - maven-version: '{maven-version}' - pom: '{pom}' - goals: 'versions:set versions:update-child-modules versions:commit -B' - properties: - - 'newVersion=${{release_version}}' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - - maven-target: - maven-version: '{maven-version}' - pom: '{pom}' - goals: 'clean deploy -B - -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - properties: - - '{maven-deploy-properties}' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - -- job-template: - # Job template for Java daily release jobs - # - # The purpose of this job template is to run: - # 1. maven set versions # 2. maven clean deploy with Sonar scans # # Required Variables: @@ -705,6 +475,7 @@ project-type: freestyle node: '{build-node}' + disabled: false maven-deploy-properties: properties: - infra-properties: @@ -756,7 +527,7 @@ - maven-target: maven-version: '{maven-version}' - goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}} -B + goals: 'clean deploy -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' properties: - '{maven-deploy-properties}' @@ -783,6 +554,7 @@ project-type: freestyle node: '{build-node}' + disabled: false maven-deploy-properties: properties: - infra-properties: @@ -834,7 +606,7 @@ - maven-target: maven-version: '{maven-version}' - goals: 'clean deploy sonar:sonar -P {mvn-profile} -Dsonar.host.url=${{SONAR}} -B + goals: 'clean deploy -P {mvn-profile} -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' properties: - '{maven-deploy-properties}' @@ -864,6 +636,7 @@ project-type: freestyle node: '{build-node}' + disabled: false maven-deploy-properties: properties: - infra-properties: @@ -904,7 +677,7 @@ - maven-target: maven-version: '{maven-version}' pom: '{pom}' - goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}} -B + goals: 'clean deploy -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' properties: - '{maven-deploy-properties}' @@ -936,6 +709,7 @@ project-type: freestyle node: '{build-node}' + disabled: false maven-deploy-properties: properties: - infra-properties: @@ -989,81 +763,10 @@ - maven-target: maven-version: '{maven-version}' pom: '{pom}' - goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}} -B - -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - properties: - - '{maven-deploy-properties}' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - -- job-template: - # Job template for Java daily release jobs with POM not at the root - # - # The purpose of this job template is to run: - # 1. maven clean deploy - # - # This job supports subprojects and skips Sonar scans. - # - # Required Variables: - # branch: git branch (eg. stable/lithium or master) - # pom: name/location of the pom.xml file relative to the workspace - - name: '{project-name}-{stream}-{subproject}-release-java-daily-no-sonar' - - project-type: freestyle - node: '{build-node}' - maven-deploy-properties: - properties: - - infra-properties: - build-days-to-keep: '{build-days-to-keep}' - - parameters: - - infra-parameters: - project: '{project}' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - maven-exec: - maven-version: '{maven-version}' - - scm: - - gerrit-trigger-scm: - refspec: '' - choosing-strategy: 'default' - submodule-recursive: '{submodule-recursive}' - - wrappers: - - infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - # 11 AM UTC - - timed: 'H 11 * * *' - - gerrit-trigger-release-manually: - server: '{server-name}' - project: '{project}' - branch: '{branch}' - - builders: - - provide-maven-settings: - global-settings-file: 'global-settings' - settings-file: '{mvn-settings}' - - - maven-target: - maven-version: '{maven-version}' - pom: '{pom}' goals: 'clean deploy -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' properties: - '{maven-deploy-properties}' - java-opts: - - '-Xmx4096m -XX:MaxPermSize=512m' settings: '{mvn-settings}' settings-type: cfp global-settings: 'global-settings' @@ -1411,7 +1114,7 @@ name: '{project-name}-{stream}-docker-java-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' - + disabled: false properties: - infra-properties: build-days-to-keep: '{build-days-to-keep}' @@ -1480,6 +1183,7 @@ name: '{project-name}-{stream}-docker-java-properties-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' + disabled: false properties: - infra-properties: build-days-to-keep: '{build-days-to-keep}' @@ -1552,7 +1256,7 @@ name: '{project-name}-{stream}-docker-java-shell-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' - + disabled: false properties: - infra-properties: build-days-to-keep: '{build-days-to-keep}' @@ -1621,7 +1325,7 @@ name: '{project-name}-{stream}-docker-java-version-shell-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' - + disabled: false properties: - infra-properties: build-days-to-keep: '{build-days-to-keep}' @@ -1705,7 +1409,7 @@ name: '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' - + disabled: false properties: - infra-properties: build-days-to-keep: '{build-days-to-keep}' @@ -1790,7 +1494,7 @@ name: '{project-name}-{stream}-docker-version-java-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' - + disabled: false properties: - infra-properties: build-days-to-keep: '{build-days-to-keep}' @@ -1871,7 +1575,7 @@ name: '{project-name}-{stream}-{subproject}-docker-version-java-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' - + disabled: false properties: - infra-properties: build-days-to-keep: '{build-days-to-keep}' @@ -1953,7 +1657,7 @@ project-type: freestyle node: 'ubuntu1604-docker-8c-8g' docker-image-name: '' - + disabled: false properties: - infra-properties: build-days-to-keep: '{build-days-to-keep}' @@ -2041,6 +1745,7 @@ name: '{project-name}-{stream}-{subproject}-aai-docker-java-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' + disabled: false docker-image-name: '' properties: @@ -2121,7 +1826,6 @@ # 2. change version in all POM files to the release version specified # in version.properties. This is done using a script instread of # the mvn version plugin that assumes some specific parent structure - # 3. runs maven clean deploy sonar # # The POM files are required to use the Maven staging plugin so the deploy # does not deploy directly to the release repo. @@ -2133,6 +1837,7 @@ project-type: freestyle node: '{build-node}' + disabled: false maven-deploy-properties: properties: - infra-properties: @@ -2179,8 +1884,7 @@ - maven-target: maven-version: '{maven-version}' - goals: 'clean deploy sonar:sonar site:site site:stage-deploy - -Dsonar.host.url=${{SONAR}} -B + goals: 'clean deploy site:site site:stage-deploy -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' properties: - '{maven-deploy-properties}' @@ -2201,7 +1905,6 @@ # 2. change version in all POM files to the release version specified # in version.properties. This is done using a script instread of # the mvn version plugin that assumes some specific parent structure - # 3. runs maven clean deploy sonar # # The POM files are required to use the Maven staging plugin so the deploy # does not deploy directly to the release repo. @@ -2216,6 +1919,7 @@ project-type: freestyle node: '{build-node}' + disabled: false maven-deploy-properties: properties: - infra-properties: @@ -2264,8 +1968,7 @@ - maven-target: maven-version: '{maven-version}' pom: '{pom}' - goals: 'clean deploy sonar:sonar site:site site:stage-deploy - -Dsonar.host.url=${{SONAR}} -B + goals: 'clean deploy site:site site:stage-deploy -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' properties: - '{maven-deploy-properties}' @@ -2287,7 +1990,6 @@ # in version.properties. This is done using a script instread of # the mvn version plugin that assumes some specific parent structure # This version does NOT change the version within the <parent> tag - # 3. runs maven clean deploy sonar # # The POM files are required to use the Maven staging plugin so the deploy # does not deploy directly to the release repo. @@ -2302,6 +2004,7 @@ project-type: freestyle node: '{build-node}' + disabled: false maven-deploy-properties: properties: - infra-properties: @@ -2350,8 +2053,7 @@ - maven-target: maven-version: '{maven-version}' pom: '{pom}' - goals: 'clean deploy sonar:sonar site:site site:stage-deploy - -Dsonar.host.url=${{SONAR}} -B + goals: 'clean deploy site:site site:stage-deploy -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' properties: - '{maven-deploy-properties}' @@ -2520,7 +2222,7 @@ name: '{project-name}-{stream}-aai-docker-java-version-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' - + disabled: false properties: - infra-properties: build-days-to-keep: '{build-days-to-keep}' diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml index 9e1a46a8f..44ba32368 100644 --- a/jjb/holmes/holmes-common.yaml +++ b/jjb/holmes/holmes-common.yaml @@ -4,7 +4,6 @@ project-name: 'holmes-common' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -19,3 +18,14 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: holmes-common-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'holmes/common' + project-name: 'holmes-common' + branch: 'master' + mvn-settings: 'holmes-common-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/holmes/holmes-dsa.yaml b/jjb/holmes/holmes-dsa.yaml index 8f99cce1b..dd5c3ea3d 100644 --- a/jjb/holmes/holmes-dsa.yaml +++ b/jjb/holmes/holmes-dsa.yaml @@ -4,7 +4,6 @@ project-name: 'holmes-dsa' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -22,3 +21,14 @@ docker-pom: 'pom.xml' mvn-profile: docker build-node: ubuntu1604-basebuild-4c-4g +- project: + name: holmes-dsa-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'holmes/dsa' + project-name: 'holmes-dsa' + branch: 'master' + mvn-settings: 'holmes-dsa-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml index 9a05cde6b..59df64c44 100644 --- a/jjb/holmes/holmes-engine-mgt.yaml +++ b/jjb/holmes/holmes-engine-mgt.yaml @@ -4,7 +4,6 @@ project-name: 'holmes-engine-management' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -22,3 +21,14 @@ docker-pom: 'pom.xml' mvn-profile: docker build-node: ubuntu1604-basebuild-4c-4g +- project: + name: holmes-engine-management-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'holmes/engine-management' + project-name: 'holmes-engine-management' + branch: 'master' + mvn-settings: 'holmes-engine-management-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml index 5b28e2e4b..0778c9a40 100644 --- a/jjb/holmes/holmes-rule-mgt.yaml +++ b/jjb/holmes/holmes-rule-mgt.yaml @@ -4,7 +4,6 @@ project-name: 'holmes-rule-management' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -22,3 +21,14 @@ docker-pom: 'pom.xml' mvn-profile: docker build-node: ubuntu1604-basebuild-4c-4g +- project: + name: holmes-rule-management-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'holmes/rule-management' + project-name: 'holmes-rule-management' + branch: 'master' + mvn-settings: 'holmes-rule-management-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/lab/lab-templates.yaml b/jjb/lab/lab-templates.yaml index 6d37da5e0..b35344083 100644 --- a/jjb/lab/lab-templates.yaml +++ b/jjb/lab/lab-templates.yaml @@ -1,10 +1,10 @@ --- - job-template: - name: 'lab-{lab-name}-{env-name}-{job-name}' + name: 'lab-{job-name}' + description: '{job-desc}' disabled: false project-type: freestyle build-node: ubuntu1604-basebuild-2c-1g - auth-token: lab properties: - lf-infra-properties: @@ -31,6 +31,6 @@ publishers: - integration-robot: - unstable-if: 0.0 + unstable-if: 75.0 pass-if: 100.0 - lf-infra-publish diff --git a/jjb/lab/lab.yaml b/jjb/lab/lab.yaml index 550c2e780..a06339ed1 100644 --- a/jjb/lab/lab.yaml +++ b/jjb/lab/lab.yaml @@ -2,12 +2,15 @@ - project: name: lab jobs: - - 'lab-{lab-name}-{env-name}-{job-name}' - lab-name: - - "windriver" - env-name: - - "beijing-heat" - - "beijing-oom" + - 'lab-{job-name}' job-name: - - "deploy" - - "healthcheck" + - "windriver-beijing-heat-deploy": + job-desc: "Heat-based deployment into Wind River lab Integration-Stable tenant" + - "windriver-beijing-oom-deploy": + job-desc: "OOM-based deployment into Wind River lab Integration-Jenkins tenant" + - "tlab-beijing-heat-deploy": + job-desc: "Heat-based deployment into AT&T TLAB Integration-HEAT-Test tenant" + - "tlab-beijing-oom-deploy": + job-desc: "OOM-based deployment into AT&T TLAB Integration-OOM-Test tenant" + - "aws-beijing-oom-deploy": + job-desc: "OOM-based deployment into AWS" diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml index 8459ad195..f5c1f589c 100644 --- a/jjb/logging-analytics/logging-analytics.yaml +++ b/jjb/logging-analytics/logging-analytics.yaml @@ -4,7 +4,6 @@ project-name: 'logging-analytics' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -19,9 +18,18 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'logging-analytics-settings' files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: logging-analytics-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'logging-analytics' + project-name: 'logging-analytics' + branch: 'master' + mvn-settings: 'logging-analytics-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml index 2b7696859..deac61839 100644 --- a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml +++ b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml @@ -25,3 +25,15 @@ skip.docker.build=false skip.docker.tag=false skip.docker.push=false +- project: + name: modeling-toscaparsers-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'modeling/toscaparsers' + project-name: 'modeling-toscaparsers' + branch: 'master' + mvn-params: '-f javatoscachecker/pom.xml' + mvn-settings: 'modeling-toscaparsers-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml index 1140c2e56..920e47857 100644 --- a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml +++ b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml @@ -19,8 +19,7 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-python' - gerrit-maven-clm: - java-version: '' mvn-params: '-f nfvparser/pom.xml' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-{subproject}-release-version-java-daily' diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml index dce818193..0ff0a668f 100644 --- a/jjb/msb/msb-apigateway.yaml +++ b/jjb/msb/msb-apigateway.yaml @@ -4,7 +4,6 @@ project-name: 'msb-apigateway' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -24,3 +23,14 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: msb-apigateway-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'msb/apigateway' + project-name: 'msb-apigateway' + branch: 'master' + mvn-settings: 'msb-apigateway-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml index a3cc0d947..1ae0b3a2e 100644 --- a/jjb/msb/msb-discovery.yaml +++ b/jjb/msb/msb-discovery.yaml @@ -4,7 +4,6 @@ project-name: 'msb-discovery' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -23,3 +22,14 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: msb-discovery-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'msb/discovery' + project-name: 'msb-discovery' + branch: 'master' + mvn-settings: 'msb-discovery-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml index b036e8150..3cb496ba3 100644 --- a/jjb/msb/msb-java-sdk.yaml +++ b/jjb/msb/msb-java-sdk.yaml @@ -4,7 +4,6 @@ project-name: 'msb-java-sdk' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -18,3 +17,14 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: msb-java-sdk-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'msb/java-sdk' + project-name: 'msb-java-sdk' + branch: 'master' + mvn-settings: 'msb-java-sdk-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml index fbae343fd..b74baca8e 100644 --- a/jjb/msb/msb-swagger-sdk.yaml +++ b/jjb/msb/msb-swagger-sdk.yaml @@ -4,7 +4,6 @@ project-name: 'msb-swagger-sdk' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -22,3 +21,14 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: msb-swagger-sdk-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'msb/swagger-sdk' + project-name: 'msb-swagger-sdk' + branch: 'master' + mvn-settings: 'msb-swagger-sdk-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml index ab979e636..0d2e7320d 100644 --- a/jjb/multicloud/multicloud-framework-java.yaml +++ b/jjb/multicloud/multicloud-framework-java.yaml @@ -16,7 +16,7 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' @@ -25,3 +25,14 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: multicloud-framework-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'multicloud/framework' + project-name: 'multicloud-framework' + branch: 'master' + mvn-settings: 'multicloud-framework-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml index 4fea8c5f1..af2debe23 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml @@ -16,7 +16,7 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-{subproject}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' @@ -25,3 +25,14 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: multicloud-openstack-vmware-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'multicloud/openstack/vmware' + project-name: 'multicloud-openstack-vmware' + branch: 'master' + mvn-settings: 'multicloud-openstack-vmware-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index 410fd75e6..795175ffc 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -30,7 +30,7 @@ - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-{subproject}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' @@ -39,3 +39,14 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-memcached-4c-4g' +- project: + name: multicloud-openstack-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'multicloud/openstack' + project-name: 'multicloud-openstack' + branch: 'master' + mvn-settings: 'multicloud-openstack-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/music/music-distributed-kv-store.yaml b/jjb/music/music-distributed-kv-store.yaml new file mode 100644 index 000000000..e6518b9b7 --- /dev/null +++ b/jjb/music/music-distributed-kv-store.yaml @@ -0,0 +1,16 @@ +--- +- project: + name: music-distributed-kv-store + project-name: 'music-distributed-kv-store' + path: 'src/dkv' + jobs: + - '{project-name}-{stream}-verify-golang' + - '{project-name}-{stream}-merge-golang' + project: 'music/distributed-kv-store' + stream: + - 'master': + branch: 'master' + mvn-settings: 'music-distributed-kv-store-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml new file mode 100644 index 000000000..ae49cd00c --- /dev/null +++ b/jjb/music/music.yaml @@ -0,0 +1,38 @@ +--- +- project: + name: music + project-name: 'music' + jobs: + - gerrit-maven-clm: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-docker-version-java-daily': + docker-pom: 'pom.xml' + mvn-profile: docker + - '{project-name}-{stream}-stage-site-java': + site-pom: 'pom.xml' + trigger-job: '{project-name}-{stream}-release-version-java-daily' + build-node: 'ubuntu1604-basebuild-8c-8g' + + project: 'music' + stream: + - 'master': + branch: 'master' + mvn-settings: 'music-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g + +- project: + name: music-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'music' + project-name: 'music' + branch: 'master' + mvn-settings: 'music-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml index 3f2088cd2..efb7112dd 100644 --- a/jjb/oom/oom-registrator.yaml +++ b/jjb/oom/oom-registrator.yaml @@ -4,7 +4,6 @@ project-name: 'oom-registrator' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -21,3 +20,14 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: oom-registrator-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'oom/registrator' + project-name: 'oom-registrator' + branch: 'master' + mvn-settings: 'oom-registrator-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml index ff6c9dc72..8506b8c7c 100644 --- a/jjb/oparent/oparent.yaml +++ b/jjb/oparent/oparent.yaml @@ -12,7 +12,7 @@ - '{project-name}-{stream}-{subproject}-release-version3-java-daily' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'oparent' stream: - 'master': @@ -23,3 +23,14 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: oparent-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'oparent' + project-name: 'oparent' + branch: 'master' + mvn-settings: 'oparent-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/optf/optf-has-python.yaml b/jjb/optf/optf-has-python.yaml new file mode 100644 index 000000000..81b215d67 --- /dev/null +++ b/jjb/optf/optf-has-python.yaml @@ -0,0 +1,16 @@ +--- +- project: + name: optf-has + project-name: 'optf-has' + project: 'optf/has' + stream: + - 'master': + branch: 'master' + mvn-settings: 'optf-has-settings' + build-node: 'ubuntu1604-basebuild-4c-4g' + subproject: + - 'conductor': + path: 'conductor' + pattern: 'conductor/**' + jobs: + - '{project-name}-{stream}-{subproject}-verify-python' diff --git a/jjb/optf/optf-osdf-python.yaml b/jjb/optf/optf-osdf-python.yaml new file mode 100644 index 000000000..9d4f1e239 --- /dev/null +++ b/jjb/optf/optf-osdf-python.yaml @@ -0,0 +1,33 @@ +--- +- project: + name: optf-osdf + project-name: 'optf-osdf' + project: 'optf/osdf' + stream: + - 'master': + branch: 'master' + mvn-settings: 'optf-osdf-settings' + subproject: + - 'osdf': + path: '.' + pattern: '**' + pom: 'pom.xml' + jobs: + - '{project-name}-{stream}-{subproject}-verify-python' + - '{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: optf-osdf-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'optf/osdf' + project-name: 'optf-osdf' + branch: 'master' + mvn-settings: 'optf-osdf-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml deleted file mode 100644 index 131695e6f..000000000 --- a/jjb/policy/policy-api.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -- project: - name: policy-api - project-name: 'policy-api' - jobs: - - gerrit-maven-clm: - java-version: '' - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily-no-sonar' - - project: 'policy/api' - stream: - - 'master': - branch: 'master' - mvn-settings: 'policy-api-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index a844d05e9..1aa1c34c7 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -4,7 +4,6 @@ project-name: 'policy-common' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -21,23 +20,13 @@ archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g - project: - name: policy-common-release-1.0.0 - project-name: 'policy-common' + name: policy-common-sonar jobs: - - '{project-name}-{stream}-verify-java-skip-tests' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g project: 'policy/common' - stream: - - 'release-1.0.0': - branch: 'release-1.0.0' - - 'amsterdam': - branch: 'amsterdam' + project-name: 'policy-common' + branch: 'master' mvn-settings: 'policy-common-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-basebuild-4c-4g + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/policy/policy-docker.yaml b/jjb/policy/policy-docker.yaml index f2b19e4a0..0ee0c854f 100644 --- a/jjb/policy/policy-docker.yaml +++ b/jjb/policy/policy-docker.yaml @@ -16,16 +16,11 @@ mvn-goals: 'prepare-package' script: !include-raw-escape: 'include-raw-docker-release.sh' - - '{project-name}-docker-image-blessing' project: 'policy/docker' stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'policy-docker-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index f463a2cef..2ccb209ff 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -4,7 +4,6 @@ project-name: 'policy-drools-applications' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -21,23 +20,13 @@ archive-artifacts: '' build-node: 'ubuntu1604-basebuild-4c-4g' - project: - name: policy-drools-applications-release-1.0.0 - project-name: 'policy-drools-applications' + name: policy-drools-applications-sonar jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g project: 'policy/drools-applications' - stream: - - 'release-1.0.0': - branch: 'release-1.0.0' - - 'amsterdam': - branch: 'amsterdam' + project-name: 'policy-drools-applications' + branch: 'master' mvn-settings: 'policy-drools-applications-settings' - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1604-basebuild-4c-4g' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index ada359f0f..5f48486b7 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -4,7 +4,6 @@ project-name: 'policy-drools-pdp' jobs: - gerrit-maven-clm: - java-version: '' mvn-params: '-DskipTests' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -22,23 +21,13 @@ archive-artifacts: '' build-node: 'ubuntu1604-basebuild-4c-4g' - project: - name: policy-drools-pdp-release-1.0.0 - project-name: 'policy-drools-pdp' + name: policy-drools-pdp-sonar jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g project: 'policy/drools-pdp' - stream: - - 'release-1.0.0': - branch: 'release-1.0.0' - - 'amsterdam': - branch: 'amsterdam' + project-name: 'policy-drools-pdp' + branch: 'master' mvn-settings: 'policy-drools-pdp-settings' - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1604-basebuild-4c-4g' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index ceb228eca..af0eed839 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -4,7 +4,6 @@ project-name: 'policy-engine' jobs: - gerrit-maven-clm: - java-version: '' build-timeout: 30 - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -22,23 +21,13 @@ archive-artifacts: '' build-node: 'ubuntu1604-basebuild-4c-4g' - project: - name: policy-engine-release-1.0.0 - project-name: 'policy-engine' + name: policy-engine-sonar jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g project: 'policy/engine' - stream: - - 'release-1.0.0': - branch: 'release-1.0.0' - - 'amsterdam': - branch: 'amsterdam' + project-name: 'policy-engine' + branch: 'master' mvn-settings: 'policy-engine-settings' - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1604-basebuild-4c-4g' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml deleted file mode 100644 index fb3206a4a..000000000 --- a/jjb/policy/policy-gui.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -- project: - name: policy-gui - project-name: 'policy-gui' - jobs: - - gerrit-maven-clm: - java-version: '' - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily-no-sonar' - - project: 'policy/gui' - stream: - - 'master': - branch: 'master' - mvn-settings: 'policy-gui-settings' - files: '**' - archive-artifacts: '' diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml deleted file mode 100644 index c0407e965..000000000 --- a/jjb/policy/policy-pap.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -- project: - name: policy-pap - project-name: 'policy-pap' - jobs: - - gerrit-maven-clm: - java-version: '' - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily-no-sonar' - - project: 'policy/pap' - stream: - - 'master': - branch: 'master' - mvn-settings: 'policy-pap-settings' - files: '**' - archive-artifacts: '' diff --git a/jjb/policy/policy-pdp.yaml b/jjb/policy/policy-pdp.yaml deleted file mode 100644 index 31c7b5bff..000000000 --- a/jjb/policy/policy-pdp.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -- project: - name: policy-pdp - project-name: 'policy-pdp' - jobs: - - gerrit-maven-clm: - java-version: '' - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily-no-sonar' - - project: 'policy/pdp' - stream: - - 'master': - branch: 'master' - mvn-settings: 'policy-pdp-settings' - files: '**' - archive-artifacts: '' diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml index 1653a7571..6f53e330b 100644 --- a/jjb/portal-sdk/portal-sdk.yaml +++ b/jjb/portal-sdk/portal-sdk.yaml @@ -27,7 +27,21 @@ branch: 'release-1.3.1' - 'release-1.3.2': branch: 'release-1.3.2' + - 'release-2.1.0': + branch: 'release-2.1.0' mvn-settings: 'portal-sdk-settings' files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: portal-sdk-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'portal/sdk' + project-name: 'portal-sdk' + branch: 'master' + mvn-params: '-f ecomp-sdk/pom.xml' + mvn-settings: 'portal-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml index 6d125fcfe..10b1a1fc9 100644 --- a/jjb/portal/portal.yaml +++ b/jjb/portal/portal.yaml @@ -4,7 +4,6 @@ project-name: 'portal' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-release-java-daily' - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' @@ -20,3 +19,14 @@ archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g maven-deploy-properties: -Dbuild.number=$BUILD_NUMBER +- project: + name: portal-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'portal' + project-name: 'portal' + branch: 'master' + mvn-settings: 'portal-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml index 15401d619..217a410bf 100644 --- a/jjb/sdc/sdc-jtosca.yaml +++ b/jjb/sdc/sdc-jtosca.yaml @@ -5,7 +5,6 @@ project-name: 'sdc-jtosca' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' @@ -23,3 +22,14 @@ files: '**' archive-artifacts: '' build-timeout: 60 +- project: + name: sdc-jtosca-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'sdc/jtosca' + project-name: 'sdc-jtosca' + branch: 'master' + mvn-settings: 'sdc-jtosca-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml index 946eaf90a..30ccc79f8 100644 --- a/jjb/sdc/sdc-sdc-distribution-client.yaml +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -5,7 +5,6 @@ project-name: 'sdc-sdc-distribution-client' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' @@ -23,3 +22,14 @@ files: '**' archive-artifacts: '' build-timeout: 60 +- project: + name: sdc-sdc-distribution-client-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'sdc/sdc-distribution-client' + project-name: 'sdc-sdc-distribution-client' + branch: 'master' + mvn-settings: 'sdc-sdc-distribution-client-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/sdc/sdc-sdc-titan-cassandra.yaml b/jjb/sdc/sdc-sdc-titan-cassandra.yaml index b78cde1a9..4d510f687 100644 --- a/jjb/sdc/sdc-sdc-titan-cassandra.yaml +++ b/jjb/sdc/sdc-sdc-titan-cassandra.yaml @@ -5,7 +5,6 @@ project-name: 'sdc-sdc-titan-cassandra' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' @@ -23,3 +22,14 @@ files: '**' archive-artifacts: '' build-timeout: 60 +- project: + name: sdc-sdc-titan-cassandra-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'sdc/sdc-titan-cassandra' + project-name: 'sdc-sdc-titan-cassandra' + branch: 'master' + mvn-settings: 'sdc-sdc-titan-cassandra-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml index e1f75ac36..4f5c00502 100644 --- a/jjb/sdc/sdc-sdc-tosca.yaml +++ b/jjb/sdc/sdc-sdc-tosca.yaml @@ -5,7 +5,6 @@ project-name: 'sdc-sdc-tosca' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' @@ -23,3 +22,14 @@ files: '**' archive-artifacts: '' build-timeout: 60 +- project: + name: sdc-sdc-tosca-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'sdc/sdc-tosca' + project-name: 'sdc-sdc-tosca' + branch: 'master' + mvn-settings: 'sdc-sdc-tosca-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml index 139ac95fa..f2efde2da 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -4,7 +4,6 @@ project-name: 'sdc-sdc-workflow-designer' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -23,3 +22,14 @@ docker-pom: 'pom.xml' mvn-profile: docker build-node: ubuntu1604-basebuild-4c-4g +- project: + name: sdc-sdc-workflow-designer-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'sdc/sdc-workflow-designer' + project-name: 'sdc-sdc-workflow-designer' + branch: 'master' + mvn-settings: 'sdc-sdc-workflow-designer-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 7b66263b4..9c22b7d72 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -25,3 +25,14 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-8c-8g +- project: + name: sdc-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'sdc' + project-name: 'sdc' + branch: 'master' + mvn-settings: 'sdc-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/sdnc/sdnc-adaptors.yaml b/jjb/sdnc/sdnc-adaptors.yaml deleted file mode 100644 index 3a8b5b5c5..000000000 --- a/jjb/sdnc/sdnc-adaptors.yaml +++ /dev/null @@ -1,24 +0,0 @@ ---- -- project: - name: sdnc-adaptors - project-name: 'sdnc-adaptors' - jobs: - - gerrit-maven-clm: - java-version: '' - - '{project-name}-{stream}-verify-java-skip-tests' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' - - project: 'sdnc/adaptors' - stream: - - 'master': - branch: 'master' - mvn-settings: 'sdnc-adaptors-settings' - - # due to a strange macro / variable translation problem this needs to be - # passed as a string block to properly get the properties correctly defined - # in the job - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' diff --git a/jjb/sdnc/sdnc-core.yaml b/jjb/sdnc/sdnc-core.yaml deleted file mode 100644 index 17ee14fd2..000000000 --- a/jjb/sdnc/sdnc-core.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -- project: - name: sdnc-core - project-name: 'sdnc-core' - subproject: - - 'rootpom': - pom: 'rootpom/pom.xml' - pattern: 'rootpom/**' - jobs: - - gerrit-maven-clm: - java-version: '' - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-java-daily-no-sonar' - - '{project-name}-{stream}-verify-java-skip-tests' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' - - project: 'sdnc/core' - stream: - - 'master': - branch: 'master' - mvn-settings: 'sdnc-core-settings' - - # due to a strange macro / variable translation problem this needs to be - # passed as a string block to properly get the properties correctly defined - # in the job - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-basebuild-4c-2g diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index 24ceeb55c..9f0dc404c 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -4,7 +4,6 @@ project-name: 'sdnc-northbound' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -23,3 +22,14 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: sdnc-northbound-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'sdnc/northbound' + project-name: 'sdnc-northbound' + branch: 'master' + mvn-settings: 'sdnc-northbound-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index 4f8a83f8d..7c098d72f 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -5,10 +5,9 @@ project-name: 'sdnc-oam' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-daily': docker-pom: 'pom.xml' mvn-profile: 'docker' @@ -21,3 +20,14 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: sdnc-oam-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'sdnc/oam' + project-name: 'sdnc-oam' + branch: 'master' + mvn-settings: 'sdnc-oam-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/sdnc/sdnc-plugins.yaml b/jjb/sdnc/sdnc-plugins.yaml index 1e62e70cd..3ce4e12e8 100644 --- a/jjb/sdnc/sdnc-plugins.yaml +++ b/jjb/sdnc/sdnc-plugins.yaml @@ -4,10 +4,9 @@ project-name: 'sdnc-plugins' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java-skip-tests' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'sdnc/plugins' stream: diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index a21dd29d4..37d649d59 100644 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@ -4,7 +4,6 @@ project-name: 'so-libs' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -26,3 +25,14 @@ deployAtEnd=true files: '**' archive-artifacts: '' +- project: + name: so-libs-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'so/libs' + project-name: 'so-libs' + branch: 'master' + mvn-settings: 'so-libs-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index dbc4f2185..8b1eded2a 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -33,3 +33,14 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: so-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'so' + project-name: 'so' + branch: 'master' + mvn-settings: 'so-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/ui/ui-dmaapbc.yaml b/jjb/ui/ui-dmaapbc.yaml index 9f7d0f785..fbe187d03 100644 --- a/jjb/ui/ui-dmaapbc.yaml +++ b/jjb/ui/ui-dmaapbc.yaml @@ -5,7 +5,6 @@ jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -23,3 +22,14 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: ui-dmaapbc-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'ui/dmaapbc' + project-name: 'ui-dmaapbc' + branch: 'master' + mvn-settings: 'ui-dmaapbc-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml index 55e851bb4..b6715d88b 100644 --- a/jjb/usecaseui/usecase-ui-server.yaml +++ b/jjb/usecaseui/usecase-ui-server.yaml @@ -20,3 +20,14 @@ docker-pom: 'pom.xml' mvn-profile: docker build-node: ubuntu1604-basebuild-4c-4g +- project: + name: usecase-ui-server-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'usecase-ui/server' + project-name: 'usecase-ui-server' + branch: 'master' + mvn-settings: 'usecase-ui-server-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml index 3bb7d1fb3..82beb1339 100644 --- a/jjb/usecaseui/usecase-ui.yaml +++ b/jjb/usecaseui/usecase-ui.yaml @@ -13,10 +13,21 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-daily' files: '**' archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: docker build-node: ubuntu1604-basebuild-4c-4g +- project: + name: usecase-ui-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-8c-8g + project: 'usecase-ui' + project-name: 'usecase-ui' + branch: 'master' + mvn-settings: 'usecase-ui-settings' + 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 db1b504a0..eb7961ed4 100755 --- a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh +++ b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh @@ -12,4 +12,5 @@ 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 +./nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh + diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml index 0d39d877c..08c6a0ee6 100644 --- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml @@ -16,10 +16,9 @@ pattern: 'lcm/**' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' @@ -28,3 +27,14 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: vfc-gvnfm-vnflcm-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'vfc/gvnfm/vnflcm' + project-name: 'vfc-gvnfm-vnflcm' + branch: 'master' + mvn-settings: 'vfc-gvnfm-vnflcm-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml index d3dbdd0e5..99b6c3e49 100644 --- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml @@ -15,10 +15,9 @@ pattern: 'mgr/**' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' @@ -27,3 +26,14 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: vfc-gvnfm-vnfmgr-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'vfc/gvnfm/vnfmgr' + project-name: 'vfc-gvnfm-vnfmgr' + branch: 'master' + mvn-settings: 'vfc-gvnfm-vnfmgr-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml index bc84f2c9f..b8580e33e 100644 --- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml @@ -16,10 +16,9 @@ pattern: 'res/**' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' @@ -28,3 +27,14 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: vfc-gvnfm-vnfres-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'vfc/gvnfm/vnfres' + project-name: 'vfc-gvnfm-vnfres' + branch: 'master' + mvn-settings: 'vfc-gvnfm-vnfres-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml index 8de899203..50a0cf0b4 100644 --- a/jjb/vfc/vfc-nfvo-catalog.yaml +++ b/jjb/vfc/vfc-nfvo-catalog.yaml @@ -16,11 +16,10 @@ pattern: '**' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' @@ -29,3 +28,14 @@ files: '**' archive-artifacts: '' build-node: centos7-redis-4c-4g +- project: + name: vfc-nfvo-catalog-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'vfc/nfvo/catalog' + project-name: 'vfc-nfvo-catalog' + branch: 'master' + mvn-settings: 'vfc-nfvo-catalog-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml index fb0f5046f..b22bcf94d 100644 --- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml @@ -1,30 +1,40 @@ ----
-
-- project:
- name: vfc-nfvo-driver-ems-java
- project-name: 'vfc-nfvo-driver-ems'
- project: 'vfc/nfvo/driver/ems'
- stream:
- - 'master':
- branch: 'master'
+--- + +- project: + name: vfc-nfvo-driver-ems-java + project-name: 'vfc-nfvo-driver-ems' + project: 'vfc/nfvo/driver/ems' + stream: + - 'master': + branch: 'master' - 'amsterdam': branch: 'amsterdam' - mvn-settings: 'vfc-nfvo-driver-ems-settings'
- subproject:
- - 'drv-ems-boco':
- pom: 'ems/pom.xml'
- pattern: 'ems/**'
- jobs:
+ mvn-settings: 'vfc-nfvo-driver-ems-settings' + subproject: + - 'drv-ems-boco': + pom: 'ems/pom.xml' + pattern: 'ems/**' + jobs: - gerrit-maven-clm: - java-version: '' - - '{project-name}-{stream}-{subproject}-verify-java'
- - '{project-name}-{stream}-{subproject}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
- - '{project-name}-{stream}-docker-java-version-shell-daily':
- docker-pom: 'pom.xml'
- mvn-goals: 'install'
- script:
- !include-raw-escape: 'build-driver-ems-docker-image.sh'
- files: '**'
- archive-artifacts: ''
+ - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-docker-java-version-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'install' + script: + !include-raw-escape: 'build-driver-ems-docker-image.sh' + files: '**' + archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: vfc-nfvo-driver-ems-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'vfc/nfvo/driver/ems' + project-name: 'vfc-nfvo-driver-ems' + branch: 'master' + mvn-settings: 'vfc-nfvo-driver-ems-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml index a7fa3a849..bb1bd6b6b 100644 --- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml +++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml @@ -15,7 +15,6 @@ pattern: 'zte/sfc-driver/**' 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' @@ -27,3 +26,15 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: vfc-nfvo-driver-sfc-sonar + jobs: + - gerrit-maven-sonar + mvn-params: '-f zte/sfc-driver/pom.xml' + build-node: ubuntu1604-basebuild-4c-4g + project: 'vfc/nfvo/driver/sfc' + project-name: 'vfc-nfvo-driver-sfc' + branch: 'master' + mvn-settings: 'vfc-nfvo-driver-sfc-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml index 71941e82e..207382cb0 100644 --- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml +++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml @@ -20,3 +20,15 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: vfc-nfvo-driver-svnfm-huawei-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + mvn-params: '-f huawei/pom.xml' + project: 'vfc/nfvo/driver/vnfm/svnfm' + project-name: 'vfc-nfvo-driver-svnfm-huawei' + branch: 'master' + mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml index d91e4d854..94655151a 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml @@ -16,10 +16,9 @@ pattern: 'gvnfmadapter/**' 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-no-sonar' + - '{project-name}-{stream}-{subproject}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' @@ -28,3 +27,14 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: vfc-nfvo-driver-vnfm-gvnfm-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'vfc/nfvo/driver/vnfm/gvnfm' + project-name: 'vfc-nfvo-driver-vnfm-gvnfm' + branch: 'master' + mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml index b6bf8321a..1ebf20771 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml @@ -19,3 +19,15 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: vfc-nfvo-driver-vnfm-svnfm-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'vfc/nfvo/driver/vnfm/svnfm' + project-name: 'vfc-nfvo-driver-vnfm-svnfm' + branch: 'master' + mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml index e0f66f946..c08037344 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml @@ -11,14 +11,25 @@ mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' subproject: - 'drv-vnfm-nokia': - pom: 'nokia/vnfmdriver/pom.xml' + pom: 'nokia/vnfmdirver/pom.xml' pattern: 'nokia/vnfmdriver/**' 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-nokia-sonar + jobs: + - gerrit-maven-sonar + 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' + branch: 'master' + mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml index 2e3642fd9..5a32657a8 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml @@ -16,10 +16,21 @@ pattern: 'zte/vmanager/**' 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-no-sonar' + - '{project-name}-{stream}-{subproject}-release-version-java-daily' files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: vfc-nfvo-driver-vnfm-svnfm-zte-sonar + jobs: + - gerrit-maven-sonar + mvn-params: '-f zte/vmanager/pom.xml' + build-node: ubuntu1604-basebuild-4c-4g + project: 'vfc/nfvo/driver/vnfm/svnfm' + project-name: 'vfc-nfvo-driver-vnfm-svnfm-zte' + branch: 'master' + mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml index 85812b0cc..a93040b86 100644 --- a/jjb/vfc/vfc-nfvo-lcm-java.yaml +++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml @@ -12,10 +12,9 @@ mvn-settings: 'vfc-nfvo-lcm-settings' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' @@ -24,3 +23,14 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: vfc-nfvo-lcm-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'vfc/nfvo/lcm' + project-name: 'vfc-nfvo-lcm' + branch: 'master' + mvn-settings: 'vfc-nfvo-lcm-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml index b690f50da..c05cadd10 100644 --- a/jjb/vfc/vfc-nfvo-resmanagement.yaml +++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml @@ -13,7 +13,6 @@ build-node: ubuntu1604-basebuild-4c-4g jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -22,3 +21,14 @@ mvn-goals: 'install' script: !include-raw-escape: 'build-nfvo-resmanagement-docker-image.sh' +- project: + name: vfc-nfvo-resmanagement-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'vfc/nfvo/resmanagement' + project-name: 'vfc-nfvo-resmanagement' + branch: 'master' + mvn-settings: 'vfc-nfvo-resmanagement-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml index fb48ce0c3..2086e3daf 100644 --- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml +++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml @@ -23,7 +23,6 @@ !include-raw-escape: 'build-nfvo-wfengine-engine-activiti-extension-docker-image.sh' 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' @@ -32,3 +31,14 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: vfc-nfvo-wfengine-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'vfc/nfvo/wfengine' + project-name: 'vfc-nfvo-wfengine' + branch: 'master' + mvn-settings: 'vfc-nfvo-wfengine-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml index 4af5f3e88..e3f588c03 100644 --- a/jjb/vid/vid.yaml +++ b/jjb/vid/vid.yaml @@ -4,7 +4,6 @@ project-name: 'vid' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -20,9 +19,18 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'vid-settings' files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: vid-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'vid' + project-name: 'vid' + branch: 'master' + mvn-settings: 'vid-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/vnfsdk/vnfsdk-compliance-csit.yaml b/jjb/vnfsdk/vnfsdk-compliance-csit.yaml deleted file mode 100644 index 6ed6fef66..000000000 --- a/jjb/vnfsdk/vnfsdk-compliance-csit.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- project: - name: vnfsdk-compliance-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'vnfsdk-compliance' - stream: 'master' - functionality: - - 'sanity-check': - trigger_jobs: - - '{project-name}-{stream}-merge-java' - robot-options: '' - branch: 'master' diff --git a/jjb/vnfsdk/vnfsdk-compliance.yaml b/jjb/vnfsdk/vnfsdk-compliance.yaml deleted file mode 100644 index f61ab6e60..000000000 --- a/jjb/vnfsdk/vnfsdk-compliance.yaml +++ /dev/null @@ -1,31 +0,0 @@ ---- -- project: - name: vnfsdk-compliance - project-name: 'vnfsdk-compliance' - jobs: - - gerrit-maven-clm: - java-version: '' - mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml' - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-aai-docker-java-daily': - pom: 'veslibrary/ves_javalibrary/evel_javalib2/pom.xml' - mvn-goals: 'docker:build' - docker-image-name: 'onap/compliance' - - '{project-name}-{stream}-docker-version-java-daily': - docker-pom: 'veslibrary/ves_javalibrary/evel_javalib2/pom.xml' - mvn-profile: 'docker' - - project: 'vnfsdk/compliance' - subproject: - - 'veslibrary': - pom: 'veslibrary/ves_javalibrary/evel_javalib2/pom.xml' - pattern: 'veslibrary/**' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vnfsdk-compliance-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml index 6ff0a587a..848871617 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml @@ -4,7 +4,6 @@ project-name: 'vnfsdk-refrepo' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -20,9 +19,18 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'vnfsdk-refrepo-settings' files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: vnfsdk-refrepo-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'vnfsdk/refrepo' + project-name: 'vnfsdk-refrepo' + branch: 'master' + mvn-settings: 'vnfsdk-refrepo-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml index 1d2855631..1bf4d9e52 100644 --- a/jjb/vnfsdk/vnfsdk-validation.yaml +++ b/jjb/vnfsdk/vnfsdk-validation.yaml @@ -4,7 +4,6 @@ project-name: 'vnfsdk-validation' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -17,3 +16,14 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g +- project: + name: vnfsdk-validation-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'vnfsdk/validation' + project-name: 'vnfsdk-validation' + branch: 'master' + mvn-settings: 'vnfsdk-validation-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/vvp/vvp-jenkins.yaml b/jjb/vvp/vvp-jenkins.yaml index db77aa094..3e72058d0 100644 --- a/jjb/vvp/vvp-jenkins.yaml +++ b/jjb/vvp/vvp-jenkins.yaml @@ -15,8 +15,18 @@ build-node: ubuntu1604-basebuild-4c-4g jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-docker-java-daily' docker-pom: 'pom.xml' mvn-profile: 'default' +- project: + name: vvp-jenkins-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'vvp/jenkins' + project-name: 'vvp-jenkins' + branch: 'master' + mvn-settings: 'vvp-jenkins-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file |