X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric-plt-rappcatalogue%2Fnonrtric-plt-rappcatalogue.yaml;h=1008f6ea546fcf54922fce74387d8fc1f5e75f53;hb=b6e58a20a995b3821161a24b176ee69982170d92;hp=e1fcfaaa91f1e2117e9d6334fde8f6732f023774;hpb=7f36a6631964769c5f9e3d861be37bcdc68f8da3;p=ci-management.git

diff --git a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
index e1fcfaaa..1008f6ea 100644
--- a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
+++ b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
@@ -36,6 +36,8 @@
           branch: master
       - f-release:
           branch: f-release
+      - g-release:
+          branch: g-release
 
 # nonrtric:rappcatalogue
 # Maven artifacts for rappcatalogue
@@ -53,6 +55,8 @@
           branch: master
       - f-release:
           branch: f-release
+      - g-release:
+          branch: g-release
 
 - project:
     <<: *rappcatalogue_jdk_common
@@ -78,7 +82,8 @@
 
 - project:
     <<: *rappcatalogue_jdk_common
-    name: nonrtric-plt-enhanced-rappcatalogue-verify
+    name: nonrtric-plt-rappcatalogue-enhanced-verify
+    project-name: nonrtric-plt-rappcatalogue-enhanced
     # the install script assumes an ubuntu image
     build-node: ubuntu1804-builder-2c-2g
     python-version: python3.8
@@ -90,16 +95,17 @@
       - compare-type: REG_EXP
         pattern: 'catalogue-enhanced/.*'
     stream:
-      # run verify on all branches
-      # the ANT pattern is **/{branch}, we are exploiting that.
-      - all:
-          branch: '*'
+      - master:
+          branch: master
+      - g-release:
+          branch: g-release
     jobs:
       - gerrit-tox-verify
 
 - project:
     <<: *rappcatalogue_jdk_common
-    name: nonrtric-plt-rappcatalogue-enhanced-docker
+    name: nonrtric-plt-rappcatalogue-enhanced
+    project-name: nonrtric-plt-rappcatalogue-enhanced
     # image name
     docker-name: 'o-ran-sc/nonrtric-plt-rappcatalogue-enhanced'
     # source of docker tag
@@ -116,13 +122,17 @@
     stream:
       - master:
           branch: master
+      - g-release:
+          branch: g-release
     jobs:
       - '{project-name}-gerrit-docker-jobs'
 
 - project:
     <<: *rappcatalogue_jdk_common
     name: nonrtric-plt-rappcatalogue-enhanced-sonarqube
+    project-name: nonrtric-plt-rappcatalogue-enhanced
     python-version: python3
+    tox-dir: catalogue-enhanced
     # the install script assumes an ubuntu image
     build-node: ubuntu1804-builder-2c-2g
     # do not trigger on changes in docs, releases
@@ -138,5 +148,7 @@
         sonar.build.sourceEncoding=UTF-8
         sonar.sources=catalogue-enhanced/
         sonar.python.coverage.reportPaths=catalogue-enhanced/coverage.xml
+        sonar.inclusions=catalogue-enhanced/src/**.py
+        sonar.exclusions=catalogue-enhanced/tests/**.py
     jobs:
       - gerrit-tox-sonarqube