From: Eric Ball <eball@linuxfoundation.org>
Date: Wed, 8 Apr 2020 15:22:46 +0000 (+0000)
Subject: Merge "Migrate ric-plt/xapp-frame-cpp build to global-jjb"
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=b8bf678b6b604cbfdca47e9220b32db2f21396ef;hp=f145ecaa1327de112709cee0c88f86956cb19524;p=ci-management.git

Merge "Migrate ric-plt/xapp-frame-cpp build to global-jjb"
---

diff --git a/global-jjb b/global-jjb
index 5c0ab82a..58776ad5 160000
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 5c0ab82a3e6479cf0ac2a34e97503a0af4c19fde
+Subproject commit 58776ad5961580fcdc1cc56a9309e9da52e7673c
diff --git a/jjb/ci-management/ci-jobs.yaml b/jjb/ci-management/ci-jobs.yaml
index cf380e3a..42fd7a9f 100644
--- a/jjb/ci-management/ci-jobs.yaml
+++ b/jjb/ci-management/ci-jobs.yaml
@@ -9,6 +9,9 @@
 
 - project:
     name: ci-jobs
+    # configure the gerrit-jjb-verify job
+    build-node-label-check: true
+    build-node-label-list: ""
 
     jobs:
       - '{project-name}-ci-jobs'
diff --git a/jjb/it-dev/it-dev.yaml b/jjb/it-dev/it-dev.yaml
index 6d9ccd66..4dcbb964 100644
--- a/jjb/it-dev/it-dev.yaml
+++ b/jjb/it-dev/it-dev.yaml
@@ -71,8 +71,8 @@
         sonar.organization={sonarcloud_project_organization}
         sonar.build.sourceEncoding=UTF-8
         sonar.sources=xapp_onboarder
-        sonar.exclusions=setup.py,tests/*.py
-        sonar.python.coverage.reportPaths=coverage.xml
+        sonar.exclusions=setup.py,xapp_onboarder/tests/*.py
+        sonar.python.coverage.reportPaths=xapp_onboarder/coverage.xml
     jobs:
       - gerrit-tox-sonarqube
 
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 02cd0be7..32444868 100644
--- a/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
+++ b/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
@@ -1,6 +1,4 @@
-# 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
+# C shared library published as deb/rpm to PackageCloud.io
 ---
 - project:
     name: ric-plt-lib-rmr-project-view
@@ -23,8 +21,6 @@
     # maven settings file has credentials to archive artifacts
     mvn-settings: ric-plt-lib-rmr-settings
 
-### RMR C LIBRARY ###
-
 - rmr_c_common: &rmr_c_common
     name: rmr-c-common
     # jenkins job name prefix
@@ -117,68 +113,3 @@
         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-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 py changes on every branch
-- project:
-    <<: *rmr_common
-    <<: *rmr_py_common
-    name: ric-plt-lib-rmr-py-verify
-    stream:
-      - all:
-          branch: '*'
-    jobs:
-      - gerrit-pypi-verify
-
-# build and publish distributions to test.pypi.org from master
-- project:
-    <<: *rmr_common
-    <<: *rmr_py_common
-    name: ric-plt-lib-rmr-py-merge
-    stream:
-      - master:
-          branch: master
-    jobs:
-      - gerrit-pypi-merge
-
-# promote package from test.pypi.org to pypi.org
-- project:
-    <<: *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_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-tox-sonarqube