X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fric-plt-lib-rmr%2Fric-plt-lib-rmr.yaml;h=718b9fd3071027fd1cc43d7c2df4407c7476b4c0;hb=6dade7025af5e74f1d89cac7bf253b5b4ba13e64;hp=aa7bcdce8a13b3527e7e7178efbc05865cfdd8df;hpb=f99dc5b5ac8c0c24c14a9a45426408bb6b01c974;p=ci-management.git

diff --git a/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml b/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
index aa7bcdce..718b9fd3 100644
--- a/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
+++ b/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
@@ -21,11 +21,6 @@
     project-name: ric-plt-lib-rmr
     # maven settings file has credentials
     mvn-settings: ric-plt-lib-rmr-settings
-
-# build and publish packages to PackageCloud.io
-- project:
-    <<: *rmr_common
-    name: ric-plt-lib-rmr
     # image is not pushed, use trivial tag
     container-tag-method: latest
     # image name
@@ -36,18 +31,35 @@
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: '^((?!src/bindings|\/COMMIT_MSG).)*$'
+
+# verify RMR changes targeted at any branch
+- project:
+    <<: *rmr_common
+    name: ric-plt-lib-rmr-verify
     jobs:
       - gerrit-docker-verify
+    stream:
+      - all:
+          branch: '*'
+
+# build RMR and publish to PackageCloud.io on merge to master branch
+- project:
+    <<: *rmr_common
+    name: ric-plt-lib-rmr-merge
+    jobs:
       - oran-gerrit-docker-ci-pc-merge
     stream:
       - master:
           branch: master
 
-# build and publish distributions to PyPI
-- project:
-    <<: *rmr_common
-    name: ric-plt-lib-rmr-python
-    project-name: '{name}'
+- rmr_python_common: &rmr_python_common
+    name: rmr-python-common
+    # git repo
+    project: ric-plt/lib/rmr
+    # jenkins job name prefix
+    project-name: ric-plt-lib-rmr-python
+    # maven settings file has credentials
+    mvn-settings: ric-plt-lib-rmr-settings
     # sigul requires centos
     build-node: centos7-builder-1c-1g
     # install prereqs
@@ -57,28 +69,65 @@
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: 'src/bindings/rmr-python/.*'
+
+# verify binding changes targeted at any branch
+- project:
+    <<: *rmr_python_common
+    name: ric-plt-lib-rmr-python-pypi-verify
+    stream:
+      - all:
+          branch: '*'
+    jobs:
+      - gerrit-pypi-verify
+
+# build and publish distributions to test.pypi.org from master
+- project:
+    <<: *rmr_python_common
+    name: ric-plt-lib-rmr-python-pypi-merge
     stream:
       - master:
           branch: master
     jobs:
       - gerrit-pypi-verify
-      - gerrit-pypi-merge:
-          pypi-repo: pypi-test
 
-# Temporary workaround to avoid overriding
-# gerrit_trigger_file_paths on release jobs
+# promote distributions from test to pypi.org
 - project:
-    <<: *rmr_common
-    name: ric-plt-lib-rmr-python-workaround
-    project-name: ric-plt-lib-rmr-python
-    # sigul requires centos
-    build-node: centos7-builder-1c-1g
+    <<: *rmr_python_common
+    name: ric-plt-lib-rmr-python-pypi-release
+    jobs:
+      - '{project-name}-gerrit-pypi-release-jobs'
+
+- project:
+    <<: *rmr_python_common
+    name: ric-plt-lib-rmr-python-sonar
+    branch: master
+    python-version: python3
+    # the pre-build-script installs debian packages
+    build-node: ubuntu1804-builder-2c-2g
     # install prereqs
-    pre-build-script: !include-raw-escape: ../shell/install-rpm-nng-rmr.sh
+    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}'
     tox-dir: src/bindings/rmr-python
-    stream:
-      - master:
-          branch: master
     jobs:
-      - gerrit-pypi-release-verify
-      - gerrit-pypi-release-merge
+      - gerrit-tox-sonar
+
+- project:
+    project: ric-plt/lib/rmr
+    project-name: ric-plt-lib-rmr
+    name: ric-plt-lib-rmr-release-verify
+    branch: master
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-packagecloud-release-verify
+
+- project:
+    project: ric-plt/lib/rmr
+    project-name: ric-plt-lib-rmr
+    name: ric-plt-lib-rmr-release-merge
+    branch: master
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-packagecloud-release-merge