diff options
Diffstat (limited to 'jjb')
74 files changed, 174 insertions, 424 deletions
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 4ae6b5a57..4c836f9e5 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -28,10 +28,10 @@ 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: diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml index 2cbee5737..9cafe0b50 100644 --- a/jjb/aai/aai-data-router.yaml +++ b/jjb/aai/aai-data-router.yaml @@ -26,7 +26,7 @@ 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-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml index 856045e38..3ed17b874 100644 --- a/jjb/aai/aai-esr-gui.yaml +++ b/jjb/aai/aai-esr-gui.yaml @@ -7,7 +7,7 @@ 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' diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml index b5247c525..c39514e31 100644 --- a/jjb/aai/aai-esr-server.yaml +++ b/jjb/aai/aai-esr-server.yaml @@ -28,7 +28,7 @@ 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' diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml new file mode 100644 index 000000000..92110f0ec --- /dev/null +++ b/jjb/aai/aai-event-client.yaml @@ -0,0 +1,17 @@ +--- +- project: + 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: 'aai/event-client' + stream: + - 'master': + branch: 'master' + mvn-settings: 'aai-event-client-settings' + files: '**' + 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 1717455ef..8d6ff0f7b 100644 --- a/jjb/aai/aai-logging-service.yaml +++ b/jjb/aai/aai-logging-service.yaml @@ -23,7 +23,7 @@ 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': diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index 2a6b6ee73..eafe2502c 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -27,7 +27,7 @@ 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-resources.yaml b/jjb/aai/aai-resources.yaml index 0895c2849..19c5e3f97 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -31,10 +31,10 @@ 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' diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index 1024d4f53..37c2084a2 100644 --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@ -23,7 +23,7 @@ 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': diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml index bbf1d7a20..73a6d3a3e 100644 --- a/jjb/aai/aai-router-core-service.yaml +++ b/jjb/aai/aai-router-core-service.yaml @@ -23,7 +23,7 @@ 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': diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml index 05c43015c..b9cceb808 100644 --- a/jjb/aai/aai-search-data-service.yaml +++ b/jjb/aai/aai-search-data-service.yaml @@ -26,7 +26,7 @@ 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 44eaf133e..87724f400 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -26,7 +26,7 @@ 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-fe.yaml b/jjb/aai/aai-sparky-fe.yaml index 67cf8b0ac..5c20d259e 100644 --- a/jjb/aai/aai-sparky-fe.yaml +++ b/jjb/aai/aai-sparky-fe.yaml @@ -8,7 +8,7 @@ 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': diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index d2581fee6..892cba12c 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -31,10 +31,10 @@ 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' diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml index c181833c6..49670d468 100644 --- a/jjb/appc/appc-deployment.yaml +++ b/jjb/appc/appc-deployment.yaml @@ -8,7 +8,7 @@ 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 fbc8b314b..35cd86c04 100644 --- a/jjb/appc/appc-master.yaml +++ b/jjb/appc/appc-master.yaml @@ -25,7 +25,7 @@ name: appc-sonar jobs: - gerrit-maven-sonar - build-node: ubuntu1604-basebuild-4c-4g + build-node: ubuntu1604-basebuild-8c-8g java-version: '' project: 'appc' project-name: 'appc' diff --git a/jjb/appc/appc-release.yaml b/jjb/appc/appc-release.yaml index d343a15d0..b65b3d8e5 100644 --- a/jjb/appc/appc-release.yaml +++ b/jjb/appc/appc-release.yaml @@ -9,7 +9,7 @@ build-timeout: 30 - '{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: 'appc' stream: diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index e983989bb..fe4a84037 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -7,7 +7,7 @@ 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' diff --git a/jjb/ccsdk/platform-nbapi.yaml b/jjb/ccsdk/platform-nbapi.yaml index c6c38e34b..405daa63d 100644 --- a/jjb/ccsdk/platform-nbapi.yaml +++ b/jjb/ccsdk/platform-nbapi.yaml @@ -7,7 +7,7 @@ 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: diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml index b86f43386..846340988 100644 --- a/jjb/ccsdk/platform-plugins.yaml +++ b/jjb/ccsdk/platform-plugins.yaml @@ -7,7 +7,7 @@ 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: diff --git a/jjb/ccsdk/storage-pgaas.yaml b/jjb/ccsdk/storage-pgaas.yaml index 24c98ef52..a5c06f137 100644 --- a/jjb/ccsdk/storage-pgaas.yaml +++ b/jjb/ccsdk/storage-pgaas.yaml @@ -7,7 +7,7 @@ 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: diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml index 3d5f3eb45..f8203ac26 100644 --- a/jjb/ccsdk/utils.yaml +++ b/jjb/ccsdk/utils.yaml @@ -7,7 +7,7 @@ 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/dcaegen2/dcaegen2-analytics.yaml b/jjb/dcaegen2/dcaegen2-analytics.yaml index b3bdb43b5..5049193c1 100644 --- a/jjb/dcaegen2/dcaegen2-analytics.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics.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/analytics' stream: diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml index d2487e3b1..add42386a 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.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/collectors/snmptrap' stream: diff --git a/jjb/dcaegen2/dcaegen2-collectors.yaml b/jjb/dcaegen2/dcaegen2-collectors.yaml index 99a10e46a..0a55b032e 100644 --- a/jjb/dcaegen2/dcaegen2-collectors.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors.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/collectors' stream: diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml index 087a5c0cb..0e413875c 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: diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml index 63dea7dcc..296c49aa8 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: diff --git a/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml index a1a875cdd..70cd7a9a5 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: diff --git a/jjb/dcaegen2/dcaegen2-platform-cli.yaml b/jjb/dcaegen2/dcaegen2-platform-cli.yaml index 6013813f4..e7e824124 100644 --- a/jjb/dcaegen2/dcaegen2-platform-cli.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-cli.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/cli' stream: diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml index a15b5479d..f9c9a714a 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: diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml index 3f49960d3..13db8951d 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: diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml index 2c8ef2131..96287ad81 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: diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml index 27e5845e5..35a13513e 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: diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml index 43d348d53..faa561c08 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 diff --git a/jjb/dcaegen2/dcaegen2-platform.yaml b/jjb/dcaegen2/dcaegen2-platform.yaml index 5631a62f5..cb7fd466f 100644 --- a/jjb/dcaegen2/dcaegen2-platform.yaml +++ b/jjb/dcaegen2/dcaegen2-platform.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' stream: diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml index a52155079..2f0fe32ca 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: diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml index a3e6ea5c3..67f89298a 100644 --- a/jjb/dcaegen2/dcaegen2.yaml +++ b/jjb/dcaegen2/dcaegen2.yaml @@ -7,7 +7,7 @@ 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: diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml index 4c83b73d7..ccfb7aead 100644 --- a/jjb/demo/demo.yaml +++ b/jjb/demo/demo.yaml @@ -8,7 +8,7 @@ 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: diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index fc13a15ba..0c82e70c2 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -382,75 +382,6 @@ 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}' - 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 -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 running checkstyle at the end # When checkstyle will be fully incorporated, it is meant to replace # '{project-name}-{stream}-release-java-daily' @@ -533,169 +464,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: @@ -1003,77 +771,6 @@ 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' - global-settings-type: cfp - - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - -- job-template: # Job template for Java merge jobs # # The purpose of this job template is to run: diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml index 617fa34a6..816c006c9 100644 --- a/jjb/integration/integration.yaml +++ b/jjb/integration/integration.yaml @@ -20,15 +20,3 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g -- project: - name: integration-sonar - jobs: - - gerrit-maven-sonar - build-node: ubuntu1604-basebuild-4c-4g - java-version: '' - project: 'integration' - project-name: 'integration' - branch: 'master' - mvn-settings: 'integration-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/lab/lab.yaml b/jjb/lab/lab.yaml index 33feae4bc..a06339ed1 100644 --- a/jjb/lab/lab.yaml +++ b/jjb/lab/lab.yaml @@ -8,5 +8,9 @@ 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/modeling/modeling-toscaparsers-javatoscachecker.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml index 87acac215..f548c956f 100644 --- a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml +++ b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml @@ -34,6 +34,7 @@ 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'
\ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml index 1140c2e56..eff116850 100644 --- a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml +++ b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml @@ -23,4 +23,4 @@ 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/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml index 488aceed8..780a62ab2 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' diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml index 45161772e..d07bdb7ab 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' diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index dd9414533..4677b1d7b 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' diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml new file mode 100644 index 000000000..d5a29c137 --- /dev/null +++ b/jjb/music/music.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: music-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + java-version: '' + 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/oparent/oparent.yaml b/jjb/oparent/oparent.yaml index 8402baede..bb674dd76 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': diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index 0273f2d74..c92d6d499 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -7,10 +7,10 @@ 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: 'policy/api' stream: diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index e8883e882..779dbcec2 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -26,7 +26,7 @@ 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}-release-version-java-daily' - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index cc4b7a006..93d277e25 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -26,7 +26,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}-stage-site-java': site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index 43ee57c1b..ddf6fd1ca 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -27,7 +27,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}-stage-site-java': site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index fcfe6aa8b..a66e006fc 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -27,7 +27,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}-stage-site-java': site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml index bf8cf337c..b72be3613 100644 --- a/jjb/policy/policy-gui.yaml +++ b/jjb/policy/policy-gui.yaml @@ -7,10 +7,10 @@ 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: 'policy/gui' stream: diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index 974a15e17..6f6d3a158 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -7,10 +7,10 @@ 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: 'policy/pap' stream: diff --git a/jjb/policy/policy-pdp.yaml b/jjb/policy/policy-pdp.yaml index 918de5f27..1c7338966 100644 --- a/jjb/policy/policy-pdp.yaml +++ b/jjb/policy/policy-pdp.yaml @@ -7,10 +7,10 @@ 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: 'policy/pdp' stream: diff --git a/jjb/sdnc/sdnc-adaptors.yaml b/jjb/sdnc/sdnc-adaptors.yaml index d1e2d7efe..991ed9390 100644 --- a/jjb/sdnc/sdnc-adaptors.yaml +++ b/jjb/sdnc/sdnc-adaptors.yaml @@ -7,7 +7,7 @@ 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/adaptors' stream: @@ -23,14 +23,14 @@ files: '**' archive-artifacts: '' - project: - name: sdc-adaptors-sonar + name: sdnc-adaptors-sonar jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g java-version: '' - project: 'sdc/adaptors' - project-name: 'sdc-adaptors' + project: 'sdnc/adaptors' + project-name: 'sdnc-adaptors' branch: 'master' - mvn-settings: 'sdc-adaptors-settings' + mvn-settings: 'sdnc-adaptors-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/sdnc/sdnc-core.yaml b/jjb/sdnc/sdnc-core.yaml index 57a3c322e..090ea6b50 100644 --- a/jjb/sdnc/sdnc-core.yaml +++ b/jjb/sdnc/sdnc-core.yaml @@ -11,10 +11,10 @@ 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}-{subproject}-release-java-daily' - '{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/core' stream: @@ -31,14 +31,14 @@ archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-2g - project: - name: sdc-core-sonar + name: sdnc-core-sonar jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g java-version: '' - project: 'sdc/core' - project-name: 'sdc-core' + project: 'sdnc/core' + project-name: 'sdnc-core' branch: 'master' - mvn-settings: 'sdc-core-settings' + mvn-settings: 'sdnc-core-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index 844a675c7..3e1ec1cc4 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -26,14 +26,14 @@ archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g - project: - name: sdc-northbound-sonar + name: sdnc-northbound-sonar jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g java-version: '' - project: 'sdc/northbound' - project-name: 'sdc-northbound' + project: 'sdnc/northbound' + project-name: 'sdnc-northbound' branch: 'master' - mvn-settings: 'sdc-northbound-settings' + mvn-settings: 'sdnc-northbound-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index ea088fce6..c5cc0fdd4 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -8,7 +8,7 @@ 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' @@ -24,14 +24,14 @@ archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g - project: - name: sdc-oam-sonar + name: sdnc-oam-sonar jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g java-version: '' - project: 'sdc/oam' - project-name: 'sdc-oam' + project: 'sdnc/oam' + project-name: 'sdnc-oam' branch: 'master' - mvn-settings: 'sdc-oam-settings' + mvn-settings: 'sdnc-oam-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/sdnc/sdnc-plugins.yaml b/jjb/sdnc/sdnc-plugins.yaml index 864845fd0..06774de23 100644 --- a/jjb/sdnc/sdnc-plugins.yaml +++ b/jjb/sdnc/sdnc-plugins.yaml @@ -7,7 +7,7 @@ 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: @@ -23,14 +23,14 @@ files: '**' archive-artifacts: '' - project: - name: sdc-plugins-sonar + name: sdnc-plugins-sonar jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g java-version: '' - project: 'sdc/plugins' - project-name: 'sdc-plugins' + project: 'sdnc/plugins' + project-name: 'sdnc-plugins' branch: 'master' - mvn-settings: 'sdc-plugins-settings' + mvn-settings: 'sdnc-plugins-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml index 29a66bfdf..749cf2b1c 100644 --- a/jjb/usecaseui/usecase-ui.yaml +++ b/jjb/usecaseui/usecase-ui.yaml @@ -13,7 +13,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-daily' files: '**' archive-artifacts: '' @@ -24,11 +24,11 @@ name: usecase-ui-sonar jobs: - gerrit-maven-sonar - build-node: ubuntu1604-basebuild-4c-4g + build-node: ubuntu1604-basebuild-8c-8g java-version: '' project: 'usecase-ui' project-name: 'usecase-ui' branch: 'master' mvn-settings: 'usecase-ui-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml index 29ba9c1b6..da2c2341e 100644 --- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml @@ -19,7 +19,7 @@ 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' diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml index 28768aef6..3f5455c03 100644 --- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml @@ -18,7 +18,7 @@ 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' diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml index 4a218e36c..5460d2693 100644 --- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml @@ -19,7 +19,7 @@ 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' diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml index 6a2de98ce..0e23d1ff9 100644 --- a/jjb/vfc/vfc-nfvo-catalog.yaml +++ b/jjb/vfc/vfc-nfvo-catalog.yaml @@ -20,7 +20,7 @@ - '{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' diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml index 230dda76a..c7e827ef6 100644 --- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml +++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml @@ -21,14 +21,15 @@ archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g - project: - name: vfc-nfvo-driver-svnfm-sonar + name: vfc-nfvo-driver-svnfm-huawei-sonar jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g + mvn-params: '-f huawei/pom.xml' java-version: '' - project: 'vfc/nfvo/driver/svnfm' - project-name: 'vfc-nfvo-driver-svnfm' + project: 'vfc/nfvo/driver/vnfm/svnfm' + project-name: 'vfc-nfvo-driver-svnfm-huawei' branch: 'master' - mvn-settings: 'vfc-nfvo-driver-svnfm-settings' + mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file + 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 d5ffed53f..215c10aeb 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml @@ -19,7 +19,7 @@ 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' 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..544dcb691 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,16 @@ 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 + java-version: '' + 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..f030e1ba4 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml @@ -22,3 +22,16 @@ 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 + java-version: '' + 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 887eea52b..880e976fb 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml @@ -19,19 +19,20 @@ 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-sonar + 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 java-version: '' project: 'vfc/nfvo/driver/vnfm/svnfm' - project-name: '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'
\ No newline at end of file + 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 f6c7cc9ea..488f42db5 100644 --- a/jjb/vfc/vfc-nfvo-lcm-java.yaml +++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml @@ -15,7 +15,7 @@ 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' diff --git a/jjb/vid/vid-asdcclient.yaml b/jjb/vid/vid-asdcclient.yaml index f8d008583..3b9935c62 100644 --- a/jjb/vid/vid-asdcclient.yaml +++ b/jjb/vid/vid-asdcclient.yaml @@ -27,6 +27,6 @@ project: 'vid/asdcclient' project-name: 'vid-asdcclient' branch: 'master' - mvn-settings: 'vid-asdcclient-settings' + mvn-settings: 'vid-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vnfsdk/vnfsdk-compliance.yaml b/jjb/vnfsdk/vnfsdk-compliance.yaml index 9cc570073..94f647139 100644 --- a/jjb/vnfsdk/vnfsdk-compliance.yaml +++ b/jjb/vnfsdk/vnfsdk-compliance.yaml @@ -38,6 +38,7 @@ project: 'vnfsdk/compliance' project-name: 'vnfsdk-compliance' branch: 'master' + mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml' mvn-settings: 'vnfsdk-compliance-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' |