diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-collectors-ves.yaml | 1 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-services-sdk.yaml | 3 | ||||
| -rw-r--r-- | jjb/music/music.yaml | 5 | ||||
| -rw-r--r-- | jjb/optf/optf-cmso.yaml | 5 | ||||
| -rw-r--r-- | jjb/optf/optf-fgps.yaml | 5 | ||||
| -rw-r--r-- | jjb/optf/optf-has.yaml | 5 | ||||
| -rw-r--r-- | jjb/optf/optf-osdf.yaml | 5 | ||||
| -rw-r--r-- | jjb/policy/policy-docker-base-common.yaml | 18 |
8 files changed, 27 insertions, 20 deletions
diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index 4f51f2bf7..fc12da490 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -2,6 +2,7 @@ - project: name: dcaegen2-collectors-ves project-name: 'dcaegen2-collectors-ves' + java-version: openjdk11 jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml index 0da5dd2b1..b2c091ff7 100644 --- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml +++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml @@ -35,8 +35,7 @@ - 'master': branch: 'master' mvn-settings: 'dcaegen2-services-sdk-settings' - mvn-goals: 'clean install' - mvn-opts: ' -P integration-pairwise' + mvn-params: ' -P integration-pairwise' - project: name: dcaegen2-services-sdk-sonar diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml index 5bbaae3ca..a4ac621f6 100644 --- a/jjb/music/music.yaml +++ b/jjb/music/music.yaml @@ -38,6 +38,11 @@ name: music-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'music' diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml index caf4de5a4..3bee2b146 100644 --- a/jjb/optf/optf-cmso.yaml +++ b/jjb/optf/optf-cmso.yaml @@ -45,6 +45,11 @@ jobs: - gerrit-maven-sonar: mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001 -DskipIntegrationTests=false' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: 'H 11 * * *' build-node: ubuntu1604-docker-8c-8g project: 'optf/cmso' diff --git a/jjb/optf/optf-fgps.yaml b/jjb/optf/optf-fgps.yaml index 6367d62bc..7c5718abb 100644 --- a/jjb/optf/optf-fgps.yaml +++ b/jjb/optf/optf-fgps.yaml @@ -85,6 +85,11 @@ name: optf-fgps-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'optf/fgps' diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml index 902539815..f08d7f997 100644 --- a/jjb/optf/optf-has.yaml +++ b/jjb/optf/optf-has.yaml @@ -73,6 +73,11 @@ name: optf-has-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'optf/has' diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml index a9463ffbd..d5bcf23e4 100644 --- a/jjb/optf/optf-osdf.yaml +++ b/jjb/optf/optf-osdf.yaml @@ -71,6 +71,11 @@ name: optf-osdf-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'optf/osdf' diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml index df914f71c..63daef949 100644 --- a/jjb/policy/policy-docker-base-common.yaml +++ b/jjb/policy/policy-docker-base-common.yaml @@ -85,24 +85,6 @@ build-node: ubuntu1604-builder-4c-4g - project: - name: policy-docker-sonar - jobs: - - gerrit-maven-sonar - sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" - cron: '@daily' - build-node: ubuntu1604-builder-4c-4g - project: 'policy/docker' - project-name: 'policy-docker' - branch: 'master' - mvn-settings: 'policy-docker-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: name: policy-docker-clm jobs: - gerrit-maven-clm |