From 529fba22bf02d80bb44c35f00e818704dd8d854b Mon Sep 17 00:00:00 2001 From: elinuxhenrik Date: Tue, 20 Sep 2022 11:07:30 +0200 Subject: [PATCH] Align project names in Sonar for nonrtric projects Issue-ID: NONRTRIC-651 Signed-off-by: elinuxhenrik Change-Id: Id3453ab140bc7dde5939933e229bd7f4c1c8ed76 --- jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml | 4 ++-- .../nonrtric-plt-informationcoordinatorservice.yaml | 4 ++-- jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml | 4 ++-- jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml | 4 ++-- jjb/nonrtric-rapp-ransliceassurance/sonar-project.properties | 2 +- jjb/nonrtric/sonar-project.properties | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml b/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml index 1d644f85..e6ed20f4 100644 --- a/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml +++ b/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml @@ -66,12 +66,12 @@ - project: <<: *dmaapadapter_jdk_common name: nonrtric-plt-dmaapadapter-sonar - project-name: '{name}' + project-name: nonrtric-plt-dmaapadapter # template goal install builds docker image unnecessarily mvn-params: '-Ddocker.skip=true' sonarcloud: true sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_nonrtric-plt-dmaapadapter' + sonarcloud-project-key: 'nonrtric-plt-dmaapadapter' sonarcloud-project-organization: '{sonarcloud_project_organization}' jobs: - gerrit-maven-sonar diff --git a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml index 602ee421..d46b50fb 100644 --- a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml +++ b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml @@ -66,12 +66,12 @@ - project: <<: *informationcoordinatorservice_jdk_common name: nonrtric-plt-informationcoordinatorservice-sonar - project-name: '{name}' + project-name: nonrtric-plt-informationcoordinatorservice # template goal install builds docker image unnecessarily mvn-params: '-Ddocker.skip=true' sonarcloud: true sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_nonrtric-plt-informationcoordinatorservice' + sonarcloud-project-key: 'nonrtric-plt-informationcoordinatorservice' sonarcloud-project-organization: '{sonarcloud_project_organization}' jobs: - gerrit-maven-sonar diff --git a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml index 63402d29..b0a111d8 100644 --- a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml +++ b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml @@ -66,12 +66,12 @@ - project: <<: *rappcatalogue_jdk_common name: nonrtric-plt-rappcatalogue-sonar - project-name: '{name}' + project-name: nonrtric-plt-rappcatalogue # template goal install builds docker image unnecessarily mvn-params: '-Ddocker.skip=true' sonarcloud: true sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_nonrtric_plt_rappcatalogue' + sonarcloud-project-key: 'nonrtric_plt_rappcatalogue' sonarcloud-project-organization: '{sonarcloud_project_organization}' jobs: - gerrit-maven-sonar diff --git a/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml b/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml index b995a3f0..53eeff0e 100644 --- a/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml +++ b/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml @@ -84,7 +84,7 @@ - project: <<: *orufhrecovery_common name: nonrtric-rapp-orufhrecovery-consumer-sonar - project-name: '{name}' + project-name: 'nonrtric-rapp-orufhrecovery-consumer' # prescan script requires ubuntu # golang is only on docker-enabled nodes build-node: ubuntu1804-docker-4c-4g @@ -95,7 +95,7 @@ sonar-properties: | # Required metadata sonar.login={sonarcloud_api_token} - sonar.projectKey={sonarcloud_project_organization}_nonrtric-rapp-orufhrecovery-consumer + sonar.projectKey=nonrtric-rapp-orufhrecovery-consumer sonar.organization={sonarcloud_project_organization} # Encoding sonar.build.sourceEncoding=UTF-8 diff --git a/jjb/nonrtric-rapp-ransliceassurance/sonar-project.properties b/jjb/nonrtric-rapp-ransliceassurance/sonar-project.properties index 253b108c..1c0543c4 100644 --- a/jjb/nonrtric-rapp-ransliceassurance/sonar-project.properties +++ b/jjb/nonrtric-rapp-ransliceassurance/sonar-project.properties @@ -1,6 +1,6 @@ # Required metadata sonar.login={sonarcloud_api_token} -sonar.projectKey={sonarcloud_project_organization}_{project-name} +sonar.projectKey={project-name} sonar.organization={sonarcloud_project_organization} # Encoding sonar.build.sourceEncoding=UTF-8 diff --git a/jjb/nonrtric/sonar-project.properties b/jjb/nonrtric/sonar-project.properties index 36f8b511..d2df8a1d 100644 --- a/jjb/nonrtric/sonar-project.properties +++ b/jjb/nonrtric/sonar-project.properties @@ -1,6 +1,6 @@ # Required metadata sonar.login={sonarcloud_api_token} -sonar.projectKey={sonarcloud_project_organization}_{project-name} +sonar.projectKey={project-name} sonar.organization={sonarcloud_project_organization} # Encoding sonar.build.sourceEncoding=UTF-8 -- 2.16.6