X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric-plt-rappcatalogue%2Fnonrtric-plt-rappcatalogue.yaml;h=bb932e68d77fbdf0e1a349700429a62325e74883;hb=refs%2Fheads%2Fmaster;hp=1008f6ea546fcf54922fce74387d8fc1f5e75f53;hpb=8f1d09faf32933259dc1c0760cab7edc8b9aaaeb;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 1008f6ea..bb932e68 100644
--- a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
+++ b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
@@ -5,15 +5,7 @@
     views:
       - project-view
 
-- project:
-    name: nonrtric-plt-rappcatalogue-info
-    project: nonrtric/plt/rappcatalogue
-    project-name: nonrtric-plt-rappcatalogue
-    build-node: centos7-builder-1c-1g
-    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 +14,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,17 +27,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
@@ -54,9 +51,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
@@ -65,20 +67,7 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     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'
-    sonarcloud: true
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: 'nonrtric_plt_rappcatalogue'
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    jobs:
-      - gerrit-maven-sonar
+      - "{project-name}-gerrit-release-jobs"
 
 - project:
     <<: *rappcatalogue_jdk_common
@@ -93,12 +82,14 @@
     # 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
+      - i-release:
+          branch: i-release
+      - j-release:
+          branch: j-release
     jobs:
       - gerrit-tox-verify
 
@@ -107,48 +98,26 @@
     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
-    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/.*'
-    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.inclusions=catalogue-enhanced/src/**.py
-        sonar.exclusions=catalogue-enhanced/tests/**.py
+      - h-release:
+          branch: h-release
+      - i-release:
+          branch: i-release
+      - j-release:
+          branch: j-release
     jobs:
-      - gerrit-tox-sonarqube
+      - "{project-name}-gerrit-docker-jobs"