From a53794cf2320a67680d7f45666044791661b2ff5 Mon Sep 17 00:00:00 2001 From: "Lott, Christopher (cl778h)" Date: Thu, 5 Mar 2020 05:38:20 -0500 Subject: [PATCH] Switch ric-plt/a1 to gerrit-tox-sonarqube template Stop using the deprecated gerrit-tox-sonar template Signed-off-by: Lott, Christopher (cl778h) Change-Id: I5283c99d8dce86bd7316051606861f7cf58ea1e7 --- jjb/ric-plt-a1/ric-plt-a1.yaml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/jjb/ric-plt-a1/ric-plt-a1.yaml b/jjb/ric-plt-a1/ric-plt-a1.yaml index 80a9262b..dc2de48d 100644 --- a/jjb/ric-plt-a1/ric-plt-a1.yaml +++ b/jjb/ric-plt-a1/ric-plt-a1.yaml @@ -25,7 +25,7 @@ - project: <<: *a1_common - name: ric-plt-a1 + name: ric-plt-a1-docker # image name docker-name: 'o-ran-sc/{name}' # source of docker tag @@ -57,22 +57,27 @@ - project: <<: *a1_common - name: ric-plt-a1-sonar + name: ric-plt-a1-sonarqube python-version: python3 # the install script assumes an ubuntu image build-node: ubuntu1804-builder-2c-2g pre-build-script: !include-raw-escape: - ../shell/install-deb-nng-rmr.sh - 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=a1 + sonar.python.coverage.reportPaths=coverage.xml jobs: - - gerrit-tox-sonar + - gerrit-tox-sonarqube - project: <<: *a1_common - name: ricc-plt-a1-release + name: ric-plt-a1-release branch: master # maven release requires sigul which requires centos # container release requires docker -- 2.16.6