X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fric-plt-xapp-frame-py%2Fric-plt-xapp-frame-py.yaml;h=da5f48f0769fd435e97e24fff08d51ba1d0b26c1;hb=746adf307579bbb5929f8b4f6976e58b526cad66;hp=951360456d261277e27701a588497d40dab89944;hpb=05c2d65ed3c7961d5424a960abfdf4dcb2c6a18e;p=ci-management.git

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 95136045..da5f48f0 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
@@ -21,39 +21,42 @@
     project-name: ric-plt-xapp-frame-py
     # maven settings file has credentials
     mvn-settings: ric-plt-xapp-frame-py-settings
+    # dont run docs on verify
+    tox-envs: code,flake8
+    build-node: ubuntu1804-builder-2c-2g
+    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
-    build-node: ubuntu1804-builder-2c-2g
-    pre-build-script: !include-raw-escape:
-      - ../shell/install-deb-nng-rmr.sh
     jobs:
-      - '{project-name}-gerrit-pypi-jobs'
+      - gerrit-pypi-verify
+      - gerrit-pypi-stage
     stream:
       - master:
           branch: master
 
-# promote distribution from test.pypi.org to pypi.org
 - project:
     name: ric-plt-xapp-frame-py-release
     <<: *py_common
-    # maven release requires sigul which requires centos
+    # release requires sigul which requires centos
     build-node: centos7-builder-1c-1g
     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
-    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=ricxappframe
+        sonar.exclusions=setup.py,tests/*.py
+        sonar.python.coverage.reportPaths=coverage.xml
     jobs:
-      - gerrit-tox-sonar
+      - gerrit-tox-sonarqube