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=ff3fae16e0924965de2a0114eb3c822b072e302b;hb=a357a7638100cfb0c3cea8a244a01dd807003d8b;hp=260090e8bd666ee209b43b5e22e39a2b56db1c4c;hpb=4bd789a0f55872b473293167999b35c322968853;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 260090e8..ff3fae16 100644
--- a/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
+++ b/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
@@ -1,3 +1,6 @@
+# The ric-plt/lib/rmr repository contains two projects:
+# 1) C shared library published as deb/rpm to PackageCloud.io
+# 2) Python bindings published as package to PyPI.org
 ---
 - project:
     name: ric-plt-lib-rmr-project-view
@@ -17,63 +20,124 @@
     name: rmr-common
     # git repo
     project: ric-plt/lib/rmr
-    # jenkins job name prefix
-    project-name: ric-plt-lib-rmr
-    # maven settings file has credentials
+    # maven settings file has credentials to archive artifacts
     mvn-settings: ric-plt-lib-rmr-settings
-    # image is not pushed, use trivial tag
-    container-tag-method: latest
-    # image name
-    docker-name: '{name}'
-    # use host network for network resources
-    docker-build-args: '--network=host -f ci/Dockerfile'
-    # exclude changes in the bindings subdirectory
+
+### RMR C LIBRARY ###
+
+- rmr_c_common: &rmr_c_common
+    name: rmr-c-common
+    # jenkins job name prefix
+    project-name: ric-plt-lib-rmr-c
+    # test scripts depend on this name
+    build-dir: $WORKSPACE/.build
+    # Use ubuntu base for cmake v3
+    # Use docker variant for packagecloud ruby gem
+    build-node: ubuntu1804-docker-4c-4g
+    # install alien package to build RPMS on ubuntu
+    pre-build: !include-raw-escape:
+      - ../shell/install-deb-alien.sh
+    # exclude irrelevant changes
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: '^((?!src/bindings|\/COMMIT_MSG).)*$'
 
-# verify RMR changes targeted at any branch
+# verify every commit
 - project:
     <<: *rmr_common
-    name: ric-plt-lib-rmr-verify
+    <<: *rmr_c_common
+    name: ric-plt-lib-rmr-c-verify
+    project-name: ric-plt-lib-rmr-c
+    cmake-opts: -DDEV_PKG=1
+    make-opts: package test ARGS=-V
     jobs:
-      - gerrit-docker-verify
+      - gerrit-cmake-verify
     stream:
-      - all:
-          branch: '*'
+      - master:
+          branch: master
 
-# build RMR and publish to PackageCloud.io on merge to master branch
+# development library - package and publish
 - project:
     <<: *rmr_common
-    name: ric-plt-lib-rmr-merge
+    <<: *rmr_c_common
+    name: ric-plt-lib-rmr-c-dev
+    project-name: ric-plt-lib-rmr-c-dev
+    cmake-opts: -DDEV_PKG=1
+    make-opts: package ARGS=-V
+    install-prefix: /usr/local
     jobs:
-      - oran-gerrit-docker-ci-pc-merge
+      - oran-gerrit-cmake-pc-stage
     stream:
       - master:
           branch: master
 
-- rmr_python_common: &rmr_python_common
-    name: rmr-python-common
-    # git repo
-    project: ric-plt/lib/rmr
+# runtime library - package and publish
+- project:
+    <<: *rmr_common
+    <<: *rmr_c_common
+    name: ric-plt-lib-rmr-c-rt
+    project-name: ric-plt-lib-rmr-c-rt
+    cmake-opts: -DDEV_PKG=0
+    make-opts: package ARGS=-V
+    install-prefix: /usr/local
+    jobs:
+      - oran-gerrit-cmake-pc-stage
+    stream:
+      - master:
+          branch: master
+
+# promote deb/rpm from staging to release at PackageCloud.io
+- project:
+    <<: *rmr_common
+    <<: *rmr_c_common
+    name: ric-plt-lib-rmr-c-release
+    # release uses sigul which requires centos
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-packagecloud-release-verify
+      - gerrit-packagecloud-release-merge
+
+# analyze C code and test coverage
+- project:
+    name: ric-plt-lib-rmr-c-sonarqube
+    <<: *rmr_common
+    <<: *rmr_c_common
+    make-opts: test ARGS=-V
+    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=src/rmr
+        sonar.cfamily.build-wrapper-output=$WORKSPACE/bw-output
+        sonar.cfamily.gcov.reportsPath=test
+    jobs:
+      - gerrit-cmake-sonarqube
+
+### RMR PYTHON PACKAGE ###
+
+- rmr_py_common: &rmr_py_common
+    name: rmr-py-common
     # 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
+    project-name: ric-plt-lib-rmr-py
+    # the pre-build-script installs RHEL packages
     build-node: centos7-builder-1c-1g
     # install prereqs
     pre-build-script: !include-raw-escape: ../shell/install-rpm-nng-rmr.sh
+    python-version: python3.6
     # bindings live in a subdirectory
     tox-dir: src/bindings/rmr-python
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: 'src/bindings/rmr-python/.*'
 
-# verify binding changes targeted at any branch
+# verify py changes on every branch
 - project:
-    <<: *rmr_python_common
-    name: ric-plt-lib-rmr-python-pypi-verify
+    <<: *rmr_common
+    <<: *rmr_py_common
+    name: ric-plt-lib-rmr-py-verify
     stream:
       - all:
           branch: '*'
@@ -82,52 +146,37 @@
 
 # build and publish distributions to test.pypi.org from master
 - project:
-    <<: *rmr_python_common
-    name: ric-plt-lib-rmr-python-pypi-merge
+    <<: *rmr_common
+    <<: *rmr_py_common
+    name: ric-plt-lib-rmr-py-merge
     stream:
       - master:
           branch: master
     jobs:
       - gerrit-pypi-merge
 
-# promote distributions from test to pypi.org
+# promote package from test.pypi.org to pypi.org
 - project:
-    <<: *rmr_python_common
-    name: ric-plt-lib-rmr-python-pypi-release
+    <<: *rmr_common
+    <<: *rmr_py_common
+    name: ric-plt-lib-rmr-py-release
     jobs:
       - '{project-name}-gerrit-pypi-release-jobs'
 
+# analyze Py code and test coverage
 - 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-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
-
-- 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
+    <<: *rmr_common
+    <<: *rmr_py_common
+    name: ric-plt-lib-rmr-py-sonarqube
+    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=src/bindings/rmr-python
+        sonar.exclusions=setup.py,tests/*.py
+        sonar.python.coverage.reportPaths=coverage.xml
     jobs:
-      - gerrit-packagecloud-release-merge
+      - gerrit-tox-sonarqube