X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric-plt-rappcatalogue%2Fnonrtric-plt-rappcatalogue.yaml;h=a203db59a2a8357c859c6ada891ae4eb0598e154;hb=a6f4d8507103324c39e7244cf78f2efc51bb7b5e;hp=14c579f4d3897f2fb343d2b76c60d91091ead7f9;hpb=352485f95ad7f801af0ef1854905eae094132a73;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..a203db59 100644
--- a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
+++ b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
@@ -34,27 +34,25 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-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/.*'
     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:
+          branch: f-release
 
 - project:
     <<: *rappcatalogue_jdk_common
@@ -68,13 +66,33 @@
 - 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'
+    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
+    # 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:
+      # run verify on all branches
+      # the ANT pattern is **/{branch}, we are exploiting that.
+      - all:
+          branch: '*'
+    jobs:
+      - gerrit-tox-verify