X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fric-plt-lib-rmr%2Fric-plt-lib-rmr.yaml;h=1571395620a995bb6d21761e632527b9d571e7cb;hb=74e158df966da29da37c486e047572dc369b6d67;hp=735e81d5810bda701d76a3fd14ced37039fe21ca;hpb=3461818220b0569da687ab9b9c9e6728e505e571;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 735e81d5..15713956 100644
--- a/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
+++ b/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
@@ -13,25 +13,29 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- rmr_docker_common: &rmr_docker_common
-    # values apply to all RMR docker projects
-    name: rmr-docker-common
+- rmr_common: &rmr_common
+    name: rmr-common
     # git repo
     project: ric-plt/lib/rmr
     # jenkins job name prefix
     project-name: ric-plt-lib-rmr
-    # maven settings file has docker credentials
+    # maven settings file has credentials
     mvn-settings: ric-plt-lib-rmr-settings
 
+# build and publish packages to PackageCloud.io
 - project:
-    <<: *rmr_docker_common
+    <<: *rmr_common
     name: ric-plt-lib-rmr
+    # image is not pushed, use trivial tag
+    container-tag-method: latest
     # image name
     docker-name: '{name}'
-    # use host network to clone from our gerrit
+    # use host network for network resources
     docker-build-args: '--network=host -f ci/Dockerfile'
-    # image tag; use a fixed value
-    container-tag-method: latest
+    # exclude changes in the bindings subdirectory
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: '^((?!src/bindings|\/COMMIT_MSG).)*$'
     jobs:
       - gerrit-docker-verify
       - oran-gerrit-docker-ci-pc-merge
@@ -39,21 +43,60 @@
       - master:
           branch: master
 
-# runs tox tests on verify only
+# build and publish distributions to PyPI
 - project:
-    <<: *rmr_docker_common
-    name: ric-plt-lib-rmr-python-test
+    <<: *rmr_common
+    name: ric-plt-lib-rmr-python
     project-name: '{name}'
-    # image name, but is never pushed
-    docker-name: '{name}'
-    # source of docker tag
-    container-tag-method: latest
-    # subdirectory
-    docker-root: src/bindings/rmr-python
-    # Dockerfile
-    docker-build-args: '-f Dockerfile-Unit-Test'
+    # sigul requires centos
+    build-node: centos7-builder-1c-1g
+    # install prereqs
+    pre-build-script: !include-raw-escape: ../shell/install-rpm-nng-rmr.sh
+    # bindings live in a subdirectory
+    tox-dir: src/bindings/rmr-python
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'src/bindings/rmr-python/.*'
     stream:
       - master:
           branch: master
     jobs:
-      - gerrit-docker-verify
+      - gerrit-pypi-verify
+      - gerrit-pypi-merge:
+          pypi-repo: pypi-test
+
+# Temporary workaround to avoid overriding
+# gerrit_trigger_file_paths on release jobs
+- 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
+    # install prereqs
+    pre-build-script: !include-raw-escape: ../shell/install-rpm-nng-rmr.sh
+    tox-dir: src/bindings/rmr-python
+    stream:
+      - master:
+          branch: master
+    jobs:
+      - gerrit-pypi-release-verify
+      - gerrit-pypi-release-merge
+
+- project:
+    <<: *rmr_common
+    name: ric-plt-lib-rmr-python-sonar
+    project-name: ric-plt-lib-rmr-python
+    branch: master
+    python-version: python3
+    # the pre-build-script installs debian packages
+    build-node: ubuntu1804-builder-2c-2ga
+    # install prereqs
+    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
+    jobs:
+      - gerrit-tox-sonar