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=14c579f4d3897f2fb343d2b76c60d91091ead7f9;hpb=c1e15774a2e3efb482a09f0f34607f183fc42d26;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 14c579f4..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
@@ -34,27 +26,39 @@
     stream:
       - 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:r-app-catalogue
-# Maven artifacts for r-app-catalogue
+# nonrtric:rappcatalogue
+# Maven artifacts for rappcatalogue
 - project:
     <<: *rappcatalogue_jdk_common
     name: nonrtric-plt-rappcatalogue
-    project-name: '{name}'
-    mvn-opts: '-Ddocker.skip=true'
-    mvn-params: '-f r-app-catalogue'
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'r-app-catalogue/.*'
+    project-name: "{name}"
+    mvn-opts: "-Ddocker.skip=true"
     build-node: ubuntu1804-builder-4c-4g
     jobs:
-      - gerrit-maven-verify
-      - gerrit-maven-merge
       - gerrit-maven-stage
       - gerrit-maven-clm
     stream:
       - 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
@@ -63,18 +67,57 @@
     # 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: '{name}'
-    # 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'
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    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:
+      - h-release:
+          branch: h-release
+      - i-release:
+          branch: i-release
+      - j-release:
+          branch: j-release
     jobs:
-      - gerrit-maven-sonar
+      - 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
+      - h-release:
+          branch: h-release
+      - i-release:
+          branch: i-release
+      - j-release:
+          branch: j-release
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"