From 883808bac339128f61e1a169078786c8717348b5 Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Thu, 9 Jan 2020 10:54:25 -0800 Subject: [PATCH] Simplify sonar variables Globalize sonar_mvn_goal Issue-ID: CIMAN-33 Signed-off-by: Jessica Wagantall Change-Id: Ia46696394bfbde621b861e662e6a512f5f6df967 --- jjb/aaf/aaf-authz.yaml | 2 +- jjb/aaf/aaf-cadi.yaml | 6 +++--- jjb/aai/aai-aai-common.yaml | 2 +- jjb/aai/aai-babel.yaml | 2 +- jjb/aai/aai-cacher.yaml | 2 +- jjb/aai/aai-data-router.yaml | 2 +- jjb/aai/aai-esr-server.yaml | 2 +- jjb/aai/aai-event-client.yaml | 2 +- jjb/aai/aai-graphadmin.yaml | 2 +- jjb/aai/aai-graphgraph.yaml | 2 +- jjb/aai/aai-logging-service.yaml | 2 +- jjb/aai/aai-model-loader.yaml | 2 +- jjb/aai/aai-resources.yaml | 2 +- jjb/aai/aai-rest-client.yaml | 2 +- jjb/aai/aai-router-core-service.yaml | 2 +- jjb/aai/aai-schema-service.yaml | 2 +- jjb/aai/aai-search-data-service.yaml | 2 +- jjb/aai/aai-sparky-be.yaml | 2 +- jjb/aai/aai-sparky-fe.yaml | 2 +- jjb/aai/aai-traversal.yaml | 2 +- jjb/aai/aai-validation.yaml | 2 +- jjb/appc/appc-master.yaml | 2 +- jjb/ccsdk/apps.yaml | 2 +- jjb/ccsdk/cds.yaml | 2 +- jjb/ccsdk/dashboard.yaml | 2 +- jjb/ccsdk/features.yaml | 2 +- jjb/ccsdk/platform-plugins.yaml | 2 +- jjb/ccsdk/sli-adaptors.yaml | 2 +- jjb/ccsdk/sli-core.yaml | 2 +- jjb/ccsdk/sli-northbound.yaml | 2 +- jjb/ccsdk/sli-plugins.yaml | 2 +- jjb/clamp/clamp.yaml | 2 +- jjb/cli/cli.yaml | 2 +- jjb/demo/demo.yaml | 2 +- jjb/externalapi/externalapi-nbi.yaml | 2 +- jjb/global-defaults.yaml | 1 + jjb/msb/msb-apigateway.yaml | 2 +- jjb/msb/msb-discovery.yaml | 2 +- jjb/msb/msb-java-sdk.yaml | 2 +- jjb/msb/msb-swagger-sdk.yaml | 2 +- jjb/multicloud/multicloud-azure-java.yaml | 2 +- jjb/multicloud/multicloud-framework-java.yaml | 4 ++-- jjb/multicloud/multicloud-openstack-vmware-java.yaml | 2 +- jjb/multicloud/multicloud-openstack.yaml | 12 ++++++------ jjb/music/music.yaml | 2 +- jjb/optf/optf-cmso.yaml | 2 +- jjb/optf/optf-fgps.yaml | 2 +- jjb/optf/optf-has.yaml | 2 +- jjb/optf/optf-osdf.yaml | 2 +- jjb/policy/policy-apex-pdp.yaml | 2 +- jjb/policy/policy-api.yaml | 2 +- jjb/policy/policy-common.yaml | 2 +- jjb/policy/policy-distribution.yaml | 2 +- jjb/policy/policy-drools-applications.yaml | 2 +- jjb/policy/policy-drools-pdp.yaml | 2 +- jjb/policy/policy-engine.yaml | 2 +- jjb/policy/policy-models.yaml | 2 +- jjb/policy/policy-pap.yaml | 2 +- jjb/policy/policy-xacml-pdp.yaml | 2 +- jjb/portal-sdk/portal-sdk.yaml | 2 +- jjb/portal/portal.yaml | 2 +- jjb/sdnc/sdnc-apps.yaml | 2 +- jjb/sdnc/sdnc-northbound.yaml | 2 +- jjb/so/so-libs.yaml | 2 +- jjb/so/so.yaml | 2 +- jjb/vid/vid.yaml | 2 +- jjb/vnfsdk/vnfsdk-functest.yaml | 2 +- jjb/vnfsdk/vnfsdk-refrepo.yaml | 2 +- jjb/vnfsdk/vnfsdk-validation.yaml | 2 +- jjb/vnfsdk/vnfsdk-ves-agent.yaml | 2 +- 70 files changed, 78 insertions(+), 77 deletions(-) diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml index fb5c8a702..380160fef 100644 --- a/jjb/aaf/aaf-authz.yaml +++ b/jjb/aaf/aaf-authz.yaml @@ -64,7 +64,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aaf/authz' diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml index 8ce051273..4f37c5249 100644 --- a/jjb/aaf/aaf-cadi.yaml +++ b/jjb/aaf/aaf-cadi.yaml @@ -25,7 +25,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aaf/cadi' @@ -61,7 +61,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aaf/cadi' @@ -97,7 +97,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aaf/cadi' diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index ff9c5f887..debd153e6 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -37,7 +37,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/aai-common' diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index 1b9fd761a..e90f24cdb 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -41,7 +41,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/babel' diff --git a/jjb/aai/aai-cacher.yaml b/jjb/aai/aai-cacher.yaml index 599563476..693a83130 100644 --- a/jjb/aai/aai-cacher.yaml +++ b/jjb/aai/aai-cacher.yaml @@ -36,7 +36,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/cacher' diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml index 8f5ff60dd..9fa165e5c 100644 --- a/jjb/aai/aai-data-router.yaml +++ b/jjb/aai/aai-data-router.yaml @@ -40,7 +40,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/data-router' diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml index 016c80471..d8d10b6f9 100644 --- a/jjb/aai/aai-esr-server.yaml +++ b/jjb/aai/aai-esr-server.yaml @@ -43,7 +43,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/esr-server' diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml index db026cf62..7b2e39e45 100644 --- a/jjb/aai/aai-event-client.yaml +++ b/jjb/aai/aai-event-client.yaml @@ -35,7 +35,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/event-client' diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml index 2accf9930..55f289f20 100644 --- a/jjb/aai/aai-graphadmin.yaml +++ b/jjb/aai/aai-graphadmin.yaml @@ -42,7 +42,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/graphadmin' diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml index 67b3b9454..373cab94d 100644 --- a/jjb/aai/aai-graphgraph.yaml +++ b/jjb/aai/aai-graphgraph.yaml @@ -48,7 +48,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/graphgraph' diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml index 22a6628e7..77c6eddfa 100644 --- a/jjb/aai/aai-logging-service.yaml +++ b/jjb/aai/aai-logging-service.yaml @@ -35,7 +35,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/logging-service' diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index e6eca29d3..9c608dc0b 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -41,7 +41,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/model-loader' diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index 9dac98eb1..f59bceae2 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -42,7 +42,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/resources' diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index b7ee32972..5263c7868 100644 --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@ -35,7 +35,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/rest-client' diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml index e4eaab9a3..0e7019c0b 100644 --- a/jjb/aai/aai-router-core-service.yaml +++ b/jjb/aai/aai-router-core-service.yaml @@ -35,7 +35,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/router-core' diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml index 0361dbb78..0270474ee 100644 --- a/jjb/aai/aai-schema-service.yaml +++ b/jjb/aai/aai-schema-service.yaml @@ -42,7 +42,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/schema-service' diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml index b8d335312..663b97fbf 100644 --- a/jjb/aai/aai-search-data-service.yaml +++ b/jjb/aai/aai-search-data-service.yaml @@ -59,7 +59,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/search-data-service' diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index 140873392..53bec6b81 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -40,7 +40,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/sparky-be' diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml index 9283edf9d..d7d10b015 100644 --- a/jjb/aai/aai-sparky-fe.yaml +++ b/jjb/aai/aai-sparky-fe.yaml @@ -37,7 +37,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/sparky-fe' diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index cd58d6a73..997ba1167 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -42,7 +42,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/traversal' diff --git a/jjb/aai/aai-validation.yaml b/jjb/aai/aai-validation.yaml index db0ec41fa..05980372a 100644 --- a/jjb/aai/aai-validation.yaml +++ b/jjb/aai/aai-validation.yaml @@ -41,7 +41,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/validation' diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml index 1730afd8b..687579446 100644 --- a/jjb/appc/appc-master.yaml +++ b/jjb/appc/appc-master.yaml @@ -38,7 +38,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-8c-8g project: 'appc' diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index c69c670e0..4cc9ce9a1 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -52,7 +52,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'ccsdk/apps' diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index 410485950..8fabb3bd3 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -49,7 +49,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'ccsdk/cds' diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml index 727b6eef2..5c1d995af 100644 --- a/jjb/ccsdk/dashboard.yaml +++ b/jjb/ccsdk/dashboard.yaml @@ -38,7 +38,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: centos7-redis-4c-4g project: 'ccsdk/dashboard' diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index 90837d7d1..ea2624d7c 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -43,7 +43,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'ccsdk/features' diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml index 3dcb72965..e2933c14b 100644 --- a/jjb/ccsdk/platform-plugins.yaml +++ b/jjb/ccsdk/platform-plugins.yaml @@ -39,7 +39,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: centos7-redis-4c-4g project: 'ccsdk/platform/plugins' diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml index 343051609..6c721b0f2 100644 --- a/jjb/ccsdk/sli-adaptors.yaml +++ b/jjb/ccsdk/sli-adaptors.yaml @@ -42,7 +42,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'ccsdk/sli/adaptors' diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml index 868151aa9..199a380f0 100644 --- a/jjb/ccsdk/sli-core.yaml +++ b/jjb/ccsdk/sli-core.yaml @@ -42,7 +42,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'ccsdk/sli/core' diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml index 73ea82386..bc279605a 100644 --- a/jjb/ccsdk/sli-northbound.yaml +++ b/jjb/ccsdk/sli-northbound.yaml @@ -42,7 +42,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'ccsdk/sli/northbound' diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml index 71ce51b60..214fc0641 100644 --- a/jjb/ccsdk/sli-plugins.yaml +++ b/jjb/ccsdk/sli-plugins.yaml @@ -42,7 +42,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'ccsdk/sli/plugins' diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml index b3dae54ef..ca4ad1c04 100644 --- a/jjb/clamp/clamp.yaml +++ b/jjb/clamp/clamp.yaml @@ -48,7 +48,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-docker-8c-8g project: 'clamp' diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml index 25b06a889..a38a16b27 100644 --- a/jjb/cli/cli.yaml +++ b/jjb/cli/cli.yaml @@ -64,7 +64,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'cli' diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml index fffa81d26..3d1bf460f 100644 --- a/jjb/demo/demo.yaml +++ b/jjb/demo/demo.yaml @@ -36,7 +36,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'demo' diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml index 47fcf39e6..85e5b9ca9 100644 --- a/jjb/externalapi/externalapi-nbi.yaml +++ b/jjb/externalapi/externalapi-nbi.yaml @@ -71,7 +71,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'externalapi/nbi' diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml index 7698bf594..1590d0134 100644 --- a/jjb/global-defaults.yaml +++ b/jjb/global-defaults.yaml @@ -56,6 +56,7 @@ # SonarCloud sonarcloud_project_organization: onap sonarcloud_api_token: da97604dfdc36ec82488a97ebea96ad01f7b10ff + sonar_mvn_goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar" # Nexus3 docker registries container-public-registry: nexus3.onap.org:10001 diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml index 6a51fc5a3..909e731ef 100644 --- a/jjb/msb/msb-apigateway.yaml +++ b/jjb/msb/msb-apigateway.yaml @@ -58,7 +58,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'msb/apigateway' diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml index 149238e1e..8f3fd9561 100644 --- a/jjb/msb/msb-discovery.yaml +++ b/jjb/msb/msb-discovery.yaml @@ -51,7 +51,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'msb/discovery' diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml index 579f4635b..ea6d77e94 100644 --- a/jjb/msb/msb-java-sdk.yaml +++ b/jjb/msb/msb-java-sdk.yaml @@ -26,7 +26,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'msb/java-sdk' diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml index 09426a2a9..4acc81023 100644 --- a/jjb/msb/msb-swagger-sdk.yaml +++ b/jjb/msb/msb-swagger-sdk.yaml @@ -26,7 +26,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'msb/swagger-sdk' diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml index b8bf8a1a4..ae3a455b2 100644 --- a/jjb/multicloud/multicloud-azure-java.yaml +++ b/jjb/multicloud/multicloud-azure-java.yaml @@ -61,7 +61,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'multicloud/azure' diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml index d5e24d205..1883da9a4 100644 --- a/jjb/multicloud/multicloud-framework-java.yaml +++ b/jjb/multicloud/multicloud-framework-java.yaml @@ -66,7 +66,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'multicloud/framework' @@ -96,7 +96,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'multicloud/framework' diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml index 205d374a1..ba481aae8 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml @@ -63,7 +63,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'multicloud/openstack/vmware' diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index 1df9046d3..38cdf7182 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -104,7 +104,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'multicloud/openstack' @@ -123,7 +123,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'multicloud/openstack' @@ -142,7 +142,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'multicloud/openstack' @@ -172,7 +172,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'multicloud/openstack' @@ -191,7 +191,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' # cron: '@daily' # build-node: ubuntu1604-builder-4c-4g # project: 'multicloud/openstack' @@ -210,7 +210,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'multicloud/openstack' diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml index a4ac621f6..ce1e469c3 100644 --- a/jjb/music/music.yaml +++ b/jjb/music/music.yaml @@ -42,7 +42,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' 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 3bee2b146..ca36e13ef 100644 --- a/jjb/optf/optf-cmso.yaml +++ b/jjb/optf/optf-cmso.yaml @@ -49,7 +49,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' 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 7c5718abb..b8fab36b9 100644 --- a/jjb/optf/optf-fgps.yaml +++ b/jjb/optf/optf-fgps.yaml @@ -89,7 +89,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' 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 f08d7f997..bc9ff6386 100644 --- a/jjb/optf/optf-has.yaml +++ b/jjb/optf/optf-has.yaml @@ -77,7 +77,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' 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 d5bcf23e4..4174a930f 100644 --- a/jjb/optf/optf-osdf.yaml +++ b/jjb/optf/optf-osdf.yaml @@ -75,7 +75,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'optf/osdf' diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml index 67d3474dd..f5c454eff 100644 --- a/jjb/policy/policy-apex-pdp.yaml +++ b/jjb/policy/policy-apex-pdp.yaml @@ -44,7 +44,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'policy/apex-pdp' diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index 538f1170d..2ec6ba07a 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -38,7 +38,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'policy/api' diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index ec7d7834d..cfc2cd0f6 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -30,7 +30,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'policy/common' diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml index c4ae3aa24..f8a4b1c27 100644 --- a/jjb/policy/policy-distribution.yaml +++ b/jjb/policy/policy-distribution.yaml @@ -38,7 +38,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'policy/distribution' diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index 905958d69..4c488e892 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -38,7 +38,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'policy/drools-applications' diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index 93002e186..b4f97a5bc 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -38,7 +38,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'policy/drools-pdp' diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index d1d113e16..d73d97c9d 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -38,7 +38,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'policy/engine' diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml index 1325ddb74..1be61d2c7 100644 --- a/jjb/policy/policy-models.yaml +++ b/jjb/policy/policy-models.yaml @@ -29,7 +29,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'policy/models' diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index 4f0358525..290076e09 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -38,7 +38,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'policy/pap' diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml index 7c376b77b..6690876cc 100644 --- a/jjb/policy/policy-xacml-pdp.yaml +++ b/jjb/policy/policy-xacml-pdp.yaml @@ -38,7 +38,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'policy/xacml-pdp' diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml index c01fd31b6..722e6e696 100644 --- a/jjb/portal-sdk/portal-sdk.yaml +++ b/jjb/portal-sdk/portal-sdk.yaml @@ -39,7 +39,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'portal/sdk' diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml index 5bc1697d7..c5d16d184 100644 --- a/jjb/portal/portal.yaml +++ b/jjb/portal/portal.yaml @@ -32,7 +32,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'portal' diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index 882796ad2..ae024d0c5 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -56,7 +56,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'sdnc/apps' diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index 20665a3a0..10dcf1c65 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -43,7 +43,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'sdnc/northbound' diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index acc45f14d..6422a061c 100644 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@ -34,7 +34,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'so/libs' diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index 4b63bf417..3701b5305 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -42,7 +42,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' max-git-repo-age-hours: 48 build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml index bc4b64d23..45c9a063a 100644 --- a/jjb/vid/vid.yaml +++ b/jjb/vid/vid.yaml @@ -58,7 +58,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'vid' diff --git a/jjb/vnfsdk/vnfsdk-functest.yaml b/jjb/vnfsdk/vnfsdk-functest.yaml index 583b7b670..1a02b8e11 100644 --- a/jjb/vnfsdk/vnfsdk-functest.yaml +++ b/jjb/vnfsdk/vnfsdk-functest.yaml @@ -27,7 +27,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'vnfsdk/functest' diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml index 53efe1788..0e0396871 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml @@ -61,7 +61,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'vnfsdk/refrepo' diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml index b3a664f20..4acfeb040 100644 --- a/jjb/vnfsdk/vnfsdk-validation.yaml +++ b/jjb/vnfsdk/vnfsdk-validation.yaml @@ -26,7 +26,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'vnfsdk/validation' diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml index 52751aace..8470e0b5a 100644 --- a/jjb/vnfsdk/vnfsdk-ves-agent.yaml +++ b/jjb/vnfsdk/vnfsdk-ves-agent.yaml @@ -52,7 +52,7 @@ 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" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'vnfsdk/ves-agent' -- 2.16.6