Merge "Chore: Automation adds aiml-fw/aihp/tps/kserve-adapter config files"

[ci-management.git] / jjb / nonrtric-plt-rappcatalogue / nonrtric-plt-rappcatalogue.yaml

diff --git a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
index 14c579f..b0a111d 100644 (file)
--- 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,12 +66,12 @@
 - 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