Merge "Drop Python jobs for ric-plt/lib/rmr"

diff --git a/global-jjb b/global-jjb
index d315b07..58776ad 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit d315b074b6c0f82c83c50344103651c9411c4ce9
+Subproject commit 58776ad5961580fcdc1cc56a9309e9da52e7673c

diff --git a/jjb/ci-management/ci-jobs.yaml b/jjb/ci-management/ci-jobs.yaml
index cf380e3..42fd7a9 100644 (file)
--- 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 6d9ccd6..4dcbb96 100644 (file)
--- 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 0479c27..3244486 100644 (file)
--- a/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
+++ b/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
@@ -44,7 +44,9 @@
     <<: *rmr_c_common
     name: ric-plt-lib-rmr-c-verify
     project-name: ric-plt-lib-rmr-c
-    cmake-opts: -DDEV_PKG=1
+    cmake-opts: -DDEV_PKG=1 -DBUILD_DOC=1
+    # skip install in cmake-build.sh
+    install: false
     make-opts: package test ARGS=-V
     jobs:
       - gerrit-cmake-verify
@@ -62,7 +64,7 @@
     make-opts: package ARGS=-V
     install-prefix: /usr/local
     jobs:
-      - oran-gerrit-cmake-pc-stage
+      - gerrit-cmake-packagecloud-stage
     stream:
       - master:
           branch: master
@@ -77,7 +79,7 @@
     make-opts: package ARGS=-V
     install-prefix: /usr/local
     jobs:
-      - oran-gerrit-cmake-pc-stage
+      - gerrit-cmake-packagecloud-stage
     stream:
       - master:
           branch: master