Added sonar props

Signed-off-by: Aloys Baillet <[email protected]>
AcademySoftwareFoundation · Jun 12, 2020 · bd5a7af · bd5a7af
1 parent 3d8f903
commit bd5a7af
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 20 deletions.
diff --git a/.github/workflows/docker-builds.yml b/.github/workflows/docker-builds.yml
@@ -27,52 +27,52 @@ jobs:
             type: PACKAGE
             name: common
             version: 1
-            tests: common
+            test: common
           - group: pkg-common-2
             type: PACKAGE
             name: common
             version: 2
-            tests: common
+            test: common
           - group: img-common-v1
             type: IMAGE
             name: common
             version: 1
-            tests: common
+            test: common
           - group: img-common-v2
             type: IMAGE
             name: common
             version: 2
-            tests: common
+            test: common
           - group: img-base-2021
             type: IMAGE
             name: base
             common_version: 2
             version: 2021
-            tests: base
+            test: base
           - group: img-vfx1-2021
             type: IMAGE
             name: vfx1
             common_version: 2
             version: 2021
-            tests: openvdb
+            test: openvdb
           - group: img-vfx2-2021
             type: IMAGE
             name: vfx2
             common_version: 2
             version: 2021
-            tests: ""
+            test: ""
           - group: img-usd-2021
             type: IMAGE
             name: usd
             common_version: 2
             version: 2021
-            tests: ""
+            test: ""
           - group: img-vfxall-2021
             type: IMAGE
             name: vfxall
             common_version: 2
             version: 2021
-            tests: ""
+            test: ""
 
     steps:
     - uses: actions/checkout@v2
@@ -114,11 +114,11 @@ jobs:
           --source-branch $GITHUB_REF \
           --verbose \
           build \
-          --ci-image-type ${{ matrix.type }} \
+          --ci-image-type IMAGE \
           --group common \
           --version ${{ matrix.common_version }}
-      name: Optionally build local ci-common Docker Image
-      if: ${{ matrix.name != 'common' }}
+      name: Optionally build local ci-common Docker Image for downstream images
+      if: ${{ matrix.name != 'common' && matrix.type == 'IMAGE' }}
 
     - run: |
         set -ex
@@ -136,7 +136,7 @@ jobs:
     - run: |
         set -ex
         export DOCKER_ORG=`aswfdocker --repo-uri $GITHUB_REPOSITORY --source-branch $GITHUB_REF getdockerorg`
-        test_script=scripts/tests/${{ matrix.version }}/test_${{ matrix.test }}.sh
+        test_script=scripts/test/${{ matrix.version }}/test_${{ matrix.test }}.sh
         if [ -f $test_script ]
         then
           echo "Going to run ${test_script}"

diff --git a/.gitignore b/.gitignore
@@ -9,5 +9,6 @@ build/
 dist/
 *.log
 test-*-results.xml
-cov.xml
+cov*.xml
 .coverage
+.scannerwork
diff --git a/README.md b/README.md
@@ -1,10 +1,5 @@
 # Docker Images for the Academy Software Foundation
-[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) ![pytest coverage](https://img.shields.io/azure-devops/coverage/academysoftwarefoundation/Academy%20Software%20Foundation/2/master)
-
-| Docker Images | Build Status |
-| ---:         |     :---      |
-| `aswf/ci-*`        | [![Build Status - aswf](https://dev.azure.com/academysoftwarefoundation/Academy%20Software%20Foundation/_apis/build/status/AZP%20aswf-docker?branchName=master)](https://dev.azure.com/academysoftwarefoundation/Academy%20Software%20Foundation/_build/latest?definitionId=2&branchName=master)
-| `aswftesting/ci-*` | [![Build Status - aswf](https://dev.azure.com/academysoftwarefoundation/Academy%20Software%20Foundation/_apis/build/status/AZP%20aswf-docker?branchName=testing)](https://dev.azure.com/academysoftwarefoundation/Academy%20Software%20Foundation/_build/latest?definitionId=2&branchName=testing)
+[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=aswf-docker&metric=coverage)](https://sonarcloud.io/dashboard?id=aswf-docker) [![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=aswf-docker&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=aswf-docker) ![Test Python aswfdocker Library](https://github.com/aloysbaillet/aswf-docker/workflows/Test%20Python%20aswfdocker%20Library/badge.svg) ![Test Build Docker Images](https://github.com/aloysbaillet/aswf-docker/workflows/Test%20Build%20Docker%20Images/badge.svg)
 
 
 More information:

diff --git a/sonar-project.properties b/sonar-project.properties
@@ -1,3 +1,6 @@
 sonar.organization=aloysbaillet-github
 sonar.projectKey=aswf-docker
 sonar.sources=.
+sonar.python.coverage.reportPaths=coverage.xml
+sonar.python.pylint.reportPath=test-prospector-results.xml
+sonar.python.xunit.reportPath=test-pytest-results.xml