From aae63a99ce36b166e0019bdbc783a0b2f42b7434 Mon Sep 17 00:00:00 2001 From: Christina Tempelaar-Lietz Date: Tue, 26 Nov 2019 17:27:50 +0000 Subject: [PATCH] Updated SonarCloud properties/token and README status widgets. Signed-off-by: Christina Tempelaar-Lietz --- README.md | 4 ++-- azure-pipelines.yml | 5 ++++- share/ci/templates/build_sonar.yml | 4 +--- sonar-project.properties | 8 ++++---- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 7566204c1c..17ca4a71c5 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![License](https://img.shields.io/badge/License-BSD%203%20Clause-blue.svg)](LICENSE.md) [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/2799/badge)](https://bestpractices.coreinfrastructure.org/projects/2799) -[![Build Status](https://dev.azure.com/openexr/OpenEXR/_apis/build/status/openexr.openexr?branchName=master)](https://dev.azure.com/openexr/OpenEXR/_build/latest?definitionId=1&branchName=master) -[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=openexr_openexr&metric=alert_status)](https://sonarcloud.io/dashboard?id=openexr_openexr) +[![Build Status](https://dev.azure.com/academysoftwarefoundation/Academy%20Software%20Foundation/_apis/build/status/academysoftwarefoundation.openexr)](https://dev.azure.com/academysoftwarefoundation/Academy%20Software%20Foundation/_build?definitionId=4&_a=summary) +[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=AcademySoftwareFoundation_openexr&metric=alert_status)](https://sonarcloud.io/dashboard?id=AcademySoftwareFoundation_openexr) # OpenEXR diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 391e311b6f..8226eff0a5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -22,6 +22,9 @@ schedules: - master always: true +variables: + - group: sonar + jobs: # ------------------------------------------------------------------------------ # Linux @@ -83,7 +86,7 @@ jobs: # ------------------------------------------------------------------------------ - job: SonarCloud displayName: SonarCloud Ubuntu 16.04 VFX CY2019 - condition: in(variables['Build.Reason'], 'Manual', 'Schedule') + condition: in(variables['Build.Reason'], 'Manual', 'Schedule', 'PullRequest') timeoutInMinutes: 360 pool: vmImage: 'ubuntu-16.04' diff --git a/share/ci/templates/build_sonar.yml b/share/ci/templates/build_sonar.yml index 5af711187a..1094f18541 100644 --- a/share/ci/templates/build_sonar.yml +++ b/share/ci/templates/build_sonar.yml @@ -25,7 +25,5 @@ steps: - bash: share/ci/scripts/linux/run_gcov.sh displayName: Generate code coverage report -- bash: sonar-scanner -X -Dsonar.login=$SONAR_TOKEN - env: - SONAR_TOKEN: $(tokens.sonarCloud) +- bash: sonar-scanner -X -Dsonar.login=$(SONAR_TOKEN) displayName: Run sonar-scanner diff --git a/sonar-project.properties b/sonar-project.properties index 40c0747ce3..9e44b93e2b 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -4,14 +4,14 @@ sonar.host.url=https://sonarcloud.io # Required metadata -sonar.organization=openexr-github -sonar.projectKey=openexr_openexr +sonar.organization=academysoftwarefoundation +sonar.projectKey=AcademySoftwareFoundation_openexr sonar.projectName=OpenEXR -sonar.projectVersion=2.3 +sonar.projectVersion=2.4 # Project links sonar.links.homepage=http://openexr.com -sonar.links.ci=https://dev.azure.com/OpenEXR/_build +sonar.links.ci=https://dev.azure.com/academysoftwarefoundation/Academy%20Software%20Foundation/_build?definitionId=4&_a=summary sonar.links.scm=https://github.com/AcademySoftwareFoundation/openexr sonar.links.issue=https://github.com/AcademySoftwareFoundation/openexr/issues