From b0e72cde3f152280c58f83fb81e53384ae70c2ec Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Mon, 29 Jan 2018 16:07:22 -0800 Subject: Move projects to gerrit-maven-sonar The current Sonar goal in release-version-java-daily has a lot of issues when running for projects in more than one branch. Remove sonar task from release-version-java-daily and use global-jjb gerrit-maven-sonar job instead. Change-Id: I9a20b68f4539e227ceab4063edb2df429cf60afb Issue-ID: CIMAN-126 Signed-off-by: Jessica Wagantall --- jjb/dcaegen2/apod-analytics.yaml | 65 +++++++++++++--------- jjb/dcaegen2/dcaegen2-analytics.yaml | 11 ++++ jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml | 11 ++++ jjb/dcaegen2/dcaegen2-collectors-ves.yaml | 11 ++++ jjb/dcaegen2/dcaegen2-collectors.yaml | 11 ++++ jjb/dcaegen2/dcaegen2-deployments.yaml | 11 ++++ jjb/dcaegen2/dcaegen2-platform-blueprints.yaml | 11 ++++ jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml | 11 ++++ jjb/dcaegen2/dcaegen2-platform-cli.yaml | 11 ++++ jjb/dcaegen2/dcaegen2-platform-configbinding.yaml | 11 ++++ .../dcaegen2-platform-deployment-handler.yaml | 11 ++++ jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml | 11 ++++ jjb/dcaegen2/dcaegen2-platform-plugins.yaml | 11 ++++ jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml | 11 ++++ .../dcaegen2-platform-servicechange-handler.yaml | 11 ++++ jjb/dcaegen2/dcaegen2-platform.yaml | 11 ++++ jjb/dcaegen2/dcaegen2-utils.yaml | 11 ++++ jjb/dcaegen2/dcaegen2.yaml | 11 ++++ 18 files changed, 225 insertions(+), 27 deletions(-) (limited to 'jjb/dcaegen2') diff --git a/jjb/dcaegen2/apod-analytics.yaml b/jjb/dcaegen2/apod-analytics.yaml index 4e6f2f3c6..99c68dcf3 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 + java-version: '' + 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..30ed1d0bf 100644 --- a/jjb/dcaegen2/dcaegen2-analytics.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics.yaml @@ -22,3 +22,14 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-analytics-sonar + jobs: + - gerrit-maven-sonar + java-version: '' + 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..74e707075 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml @@ -22,3 +22,14 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-collectors-snmptrap-sonar + jobs: + - gerrit-maven-sonar + java-version: '' + 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..b1b319d36 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 + java-version: '' + 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..a13ebae6a 100644 --- a/jjb/dcaegen2/dcaegen2-collectors.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors.yaml @@ -22,3 +22,14 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-collectors-sonar + jobs: + - gerrit-maven-sonar + java-version: '' + 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..38623d0cd 100644 --- a/jjb/dcaegen2/dcaegen2-deployments.yaml +++ b/jjb/dcaegen2/dcaegen2-deployments.yaml @@ -22,3 +22,14 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-deployments-sonar + jobs: + - gerrit-maven-sonar + java-version: '' + 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..b55b73c5f 100644 --- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml @@ -22,3 +22,14 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-platform-blueprints-sonar + jobs: + - gerrit-maven-sonar + java-version: '' + 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..40c415e99 100644 --- a/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml @@ -22,3 +22,14 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-platform-cdapbroker-sonar + jobs: + - gerrit-maven-sonar + java-version: '' + 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..e81d0745e 100644 --- a/jjb/dcaegen2/dcaegen2-platform-cli.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-cli.yaml @@ -22,3 +22,14 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-platform-cli-sonar + jobs: + - gerrit-maven-sonar + java-version: '' + 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..064592ee4 100644 --- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml @@ -22,3 +22,14 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-platform-configbinding-sonar + jobs: + - gerrit-maven-sonar + java-version: '' + 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..ef7b58bcf 100644 --- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml @@ -22,3 +22,14 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-platform-deployment-handler-sonar + jobs: + - gerrit-maven-sonar + java-version: '' + 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..aa3447d50 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 + java-version: '' + 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..7bb5a3908 100644 --- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml @@ -22,3 +22,14 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-platform-plugins-sonar + jobs: + - gerrit-maven-sonar + java-version: '' + 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..326d111fd 100644 --- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml @@ -22,3 +22,14 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-platform-policy-handler-sonar + jobs: + - gerrit-maven-sonar + java-version: '' + 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..188fd8994 100644 --- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml @@ -26,3 +26,14 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-platform-servicechange-handler-sonar + jobs: + - gerrit-maven-sonar + java-version: '' + 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..3a2103670 100644 --- a/jjb/dcaegen2/dcaegen2-platform.yaml +++ b/jjb/dcaegen2/dcaegen2-platform.yaml @@ -21,3 +21,14 @@ deployAtEnd=true files: '**' archive-artifacts: '' +- project: + name: dcaegen2-platform-sonar + jobs: + - gerrit-maven-sonar + java-version: '' + 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..418cff4f9 100644 --- a/jjb/dcaegen2/dcaegen2-utils.yaml +++ b/jjb/dcaegen2/dcaegen2-utils.yaml @@ -22,3 +22,14 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-utils-sonar + jobs: + - gerrit-maven-sonar + java-version: '' + 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..2087553a1 100644 --- a/jjb/dcaegen2/dcaegen2.yaml +++ b/jjb/dcaegen2/dcaegen2.yaml @@ -24,3 +24,14 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-sonar + jobs: + - gerrit-maven-sonar + java-version: '' + 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 -- cgit 1.2.3-korg