From b2955abf7928a5c7453ea7fe420a49661b84c5a9 Mon Sep 17 00:00:00 2001 From: "Lott, Christopher (cl778h)" Date: Thu, 5 Mar 2020 05:59:00 -0500 Subject: [PATCH] Switch xapp-frame-py to gerrit-tox-sonarqube template Stop using the deprecated gerrit-tox-sonar template Signed-off-by: Lott, Christopher (cl778h) Change-Id: Ie32c2ba78b6525a8c2f26a2ad38a27d7ff459df7 --- .../ric-plt-xapp-frame-py.yaml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/jjb/ric-plt-xapp-frame-py/ric-plt-xapp-frame-py.yaml b/jjb/ric-plt-xapp-frame-py/ric-plt-xapp-frame-py.yaml index e48fbf11..e7061dc2 100644 --- a/jjb/ric-plt-xapp-frame-py/ric-plt-xapp-frame-py.yaml +++ b/jjb/ric-plt-xapp-frame-py/ric-plt-xapp-frame-py.yaml @@ -27,7 +27,6 @@ pre-build-script: !include-raw-escape: - ../shell/install-deb-nng-rmr.sh -# verify distribution and publish to test.pypi.org - project: name: ric-plt-xapp-frame-py-pypi <<: *py_common @@ -37,7 +36,6 @@ - master: branch: master -# promote distribution from test.pypi.org to pypi.org - project: name: ric-plt-xapp-frame-py-release <<: *py_common @@ -46,13 +44,18 @@ jobs: - '{project-name}-gerrit-pypi-release-jobs' -# analyze unit test coverage - project: - name: ric-plt-xapp-frame-py-sonar + name: ric-plt-xapp-frame-py-sonarqube <<: *py_common - sonarcloud: true - sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonar-project-file: "" + sonar-properties: | + sonar.login={sonarcloud_api_token} + sonar.projectKey={sonarcloud_project_organization}_{project-name} + sonar.projectName={project-name} + sonar.organization={sonarcloud_project_organization} + sonar.build.sourceEncoding=UTF-8 + sonar.sources=ricxappframe + sonar.exclusions=setup.py,tests/*.py + sonar.python.coverage.reportPaths=coverage.xml jobs: - - gerrit-tox-sonar + - gerrit-tox-sonarqube -- 2.16.6