X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fnonrtric-plt-rappcatalogue%2Fnonrtric-plt-rappcatalogue.yaml;h=2e194f1e33d5aa0cc4916c692795bb8a19a2266c;hb=f4513e8c98516a90eef57b1bd44f9129e873ce59;hp=443c8519efa7407f63b2299b6cd2187c259ab2a3;hpb=1aced1e789b05fc8b8da84f9cede4843f9650a8b;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 443c8519..2e194f1e 100644
--- a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
+++ b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
@@ -22,7 +22,7 @@
     # maven settings file has docker credentials
     mvn-settings: nonrtric-plt-rappcatalogue-settings
     mvn-version: mvn36
-    java-version: openjdk11
+    java-version: openjdk17
 
 - project:
     <<: *rappcatalogue_jdk_common
@@ -35,7 +35,11 @@
       - master:
           branch: master
       - f-release:
+          java-version: openjdk11
           branch: f-release
+      - g-release:
+          java-version: openjdk11
+          branch: g-release
 
 # nonrtric:rappcatalogue
 # Maven artifacts for rappcatalogue
@@ -52,7 +56,11 @@
       - master:
           branch: master
       - f-release:
+          java-version: openjdk11
           branch: f-release
+      - g-release:
+          java-version: openjdk11
+          branch: g-release
 
 - project:
     <<: *rappcatalogue_jdk_common
@@ -78,7 +86,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 +99,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,12 +126,15 @@
     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
@@ -139,5 +152,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