X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric-plt-rappcatalogue%2Fnonrtric-plt-rappcatalogue.yaml;h=2e194f1e33d5aa0cc4916c692795bb8a19a2266c;hb=f4513e8c98516a90eef57b1bd44f9129e873ce59;hp=7451d7aed19e1d3d79f4374e11f34859422172a1;hpb=e2d64fba911cad748127778e3101ef2237bc70a8;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 7451d7ae..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
@@ -34,6 +34,12 @@
     stream:
       - 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
@@ -49,6 +55,12 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          java-version: openjdk11
+          branch: f-release
+      - g-release:
+          java-version: openjdk11
+          branch: g-release
 
 - project:
     <<: *rappcatalogue_jdk_common
@@ -62,13 +74,85 @@
 - project:
     <<: *rappcatalogue_jdk_common
     name: nonrtric-plt-rappcatalogue-sonar
-    project-name: '{name}'
+    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: '{sonarcloud_project_organization}_nonrtric_plt_rappcatalogue'
+    sonarcloud-project-key: 'nonrtric_plt_rappcatalogue'
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     jobs:
       - gerrit-maven-sonar
 
+- project:
+    <<: *rappcatalogue_jdk_common
+    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
+    # skip docs on verify
+    tox-envs: code
+    tox-dir: catalogue-enhanced
+    # do not trigger on changes in docs, releases
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'catalogue-enhanced/.*'
+    stream:
+      - master:
+          branch: master
+      - g-release:
+          branch: g-release
+    jobs:
+      - gerrit-tox-verify
+
+- project:
+    <<: *rappcatalogue_jdk_common
+    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
+    container-tag-method: yaml-file
+    # use host network
+    docker-build-args: '--network=host'
+    # Directory with Dockerfile
+    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/.*'
+    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
+    jobs:
+      - gerrit-tox-sonarqube