X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric-plt-rappcatalogue%2Fnonrtric-plt-rappcatalogue.yaml;h=d64985204a26d6502ef12b506252cc942fd5e62a;hb=317cfbfd9d3fceb12c82d478235e5f304d144fe7;hp=e1fcfaaa91f1e2117e9d6334fde8f6732f023774;hpb=9430f9078265309a1a2faab449df535e30301d5f;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..d6498520 100644
--- a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
+++ b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- rappcatalogue_jdk_common: &rappcatalogue_jdk_common
+- _rappcatalogue_jdk_common: &rappcatalogue_jdk_common
     name: rappcatalogue-jdk-common
     # git repo
     project: nonrtric/plt/rappcatalogue
@@ -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,15 +35,22 @@
       - master:
           branch: master
       - f-release:
+          # will keep f release for now since that is the previous release
+          java-version: openjdk11
           branch: f-release
+      - g-release:
+          java-version: openjdk11
+          branch: g-release
+      - h-release:
+          branch: h-release
 
 # nonrtric:rappcatalogue
 # Maven artifacts for rappcatalogue
 - project:
     <<: *rappcatalogue_jdk_common
     name: nonrtric-plt-rappcatalogue
-    project-name: '{name}'
-    mvn-opts: '-Ddocker.skip=true'
+    project-name: "{name}"
+    mvn-opts: "-Ddocker.skip=true"
     build-node: ubuntu1804-builder-4c-4g
     jobs:
       - gerrit-maven-stage
@@ -52,7 +59,14 @@
       - master:
           branch: master
       - f-release:
+          # will keep f release for now since that is the previous release
+          java-version: openjdk11
           branch: f-release
+      - g-release:
+          java-version: openjdk11
+          branch: g-release
+      - h-release:
+          branch: h-release
 
 - project:
     <<: *rappcatalogue_jdk_common
@@ -61,24 +75,25 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 
 - project:
     <<: *rappcatalogue_jdk_common
     name: nonrtric-plt-rappcatalogue-sonar
     project-name: nonrtric-plt-rappcatalogue
     # template goal install builds docker image unnecessarily
-    mvn-params: '-Ddocker.skip=true'
+    mvn-params: "-Ddocker.skip=true"
     sonarcloud: true
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: 'nonrtric_plt_rappcatalogue'
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "nonrtric_plt_rappcatalogue"
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
     jobs:
       - gerrit-maven-sonar
 
 - 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
@@ -88,55 +103,66 @@
     # do not trigger on changes in docs, releases
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'catalogue-enhanced/.*'
+        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
+      - h-release:
+          branch: h-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'
+    docker-name: "o-ran-sc/nonrtric-plt-rappcatalogue-enhanced"
     # source of docker tag
     container-tag-method: yaml-file
     # use host network
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # Directory with Dockerfile
-    docker-root: 'catalogue-enhanced'
+    docker-root: "catalogue-enhanced"
     build-node: ubuntu1804-docker-4c-4g
     # do not trigger on changes in docs, releases
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'catalogue-enhanced/.*'
+        pattern: "catalogue-enhanced/.*"
     stream:
       - master:
           branch: master
+      - g-release:
+          branch: g-release
+      - h-release:
+          branch: h-release
     jobs:
-      - '{project-name}-gerrit-docker-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
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'catalogue-enhanced/.*'
+        pattern: "catalogue-enhanced/.*"
     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=catalogue-enhanced/
-        sonar.python.coverage.reportPaths=catalogue-enhanced/coverage.xml
+      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=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