X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric%2Fnonrtric.yaml;h=573836a21e0fe010214640c83639c8204c74629a;hb=fa49e29f39a4d8186fe074157fb2b25c53d9d04a;hp=56e0a1b694b461133bf527a1a7383b596840b43c;hpb=014d57f38aaba51a8dbaca4fb3f39bf85a16cc30;p=ci-management.git

diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index 56e0a1b6..573836a2 100644
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -22,36 +22,28 @@
     # maven settings file has docker credentials
     mvn-settings: nonrtric-settings
     mvn-version: mvn36
-
-- nonrtric_jdk11: &nonrtric_jdk11
-    <<: *nonrtric_jdk_common
-    name: nonrtric-jdk11
     java-version: openjdk11
 
-- nonrtric_jdk8: &nonrtric_jdk8
-    <<: *nonrtric_jdk_common
-    name: nonrtric-jdk8
-    java-version: openjdk8
-
 - project:
-    <<: *nonrtric_jdk11
+    <<: *nonrtric_jdk_common
     mvn-params: -Dbuild.number=${{BUILD_NUMBER}}
     jobs:
-      - gerrit-maven-docker-verify:
-          mvn-opts: -Dexec.skip=false
+      - gerrit-maven-docker-verify
       - gerrit-maven-docker-merge
       - gerrit-maven-docker-stage
     stream:
       - master:
           branch: master
+      - cherry:
+          branch: cherry
 
 # nonrtric:policy-agent
 # Maven artifacts for nonrtric-policy-agent
 - project:
-    <<: *nonrtric_jdk11
+    <<: *nonrtric_jdk_common
     name: nonrtric-policy-agent
     project-name: '{name}'
-    mvn-opts: '-Ddocker.skip=true -Dexec.skip=true'
+    mvn-opts: '-Ddocker.skip=true'
     mvn-params: '-f policy-agent'
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
@@ -65,14 +57,16 @@
     stream:
       - master:
           branch: master
+      - cherry:
+          branch: cherry
 
 # nonrtric:sdnc-a1-controller
 # Maven artifacts for nonrtric-sdnc-a1-controller
 - project:
-    <<: *nonrtric_jdk8
+    <<: *nonrtric_jdk_common
     name: nonrtric-sdnc-a1-controller
     project-name: '{name}'
-    mvn-opts: '-Ddocker.skip=true -Dexec.skip=true'
+    mvn-opts: '-Ddocker.skip=true'
     mvn-params: '-f sdnc-a1-controller/northbound'
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
@@ -86,11 +80,58 @@
     stream:
       - master:
           branch: master
+      - cherry:
+          branch: cherry
 
+# nonrtric:enrichment-coordinator-service
+# Maven artifacts for nonrtric-enrichment-coordinator-service
 - project:
-    <<: *nonrtric_jdk11
+    <<: *nonrtric_jdk_common
+    name: nonrtric-enrichment-coordinator-service
+    project-name: '{name}'
+    mvn-opts: '-Ddocker.skip=true'
+    mvn-params: '-f enrichment-coordinator-service'
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'enrichment-coordinator-service/.*'
+    build-node: ubuntu1804-builder-4c-4g
+    jobs:
+      - gerrit-maven-verify
+      - gerrit-maven-merge
+      - gerrit-maven-stage
+      - gerrit-maven-clm
+    stream:
+      - master:
+          branch: master
+      - cherry:
+          branch: cherry
+
+# nonrtric:r-app-catalogue
+# Maven artifacts for r-app-catalogue
+- project:
+    <<: *nonrtric_jdk_common
+    name: nonrtric-r-app-catalogue
+    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
+      - cherry:
+          branch: cherry
+
+- project:
+    <<: *nonrtric_jdk_common
     name: nonrtric-release
-    branch: master
     # maven release requires sigul which requires centos
     # container release requires docker
     build-node: centos7-docker-2c-8g
@@ -98,10 +139,10 @@
       - '{project-name}-gerrit-release-jobs'
 
 - project:
-    <<: *nonrtric_jdk11
+    <<: *nonrtric_jdk_common
     name: nonrtric-sonar
     # template goal install builds docker image unnecessarily
-    mvn-params: '-Ddocker.skip=true -Dexec.skip=true'
+    mvn-params: '-Ddocker.skip=true'
     sonarcloud: true
     sonarcloud-api-token: '{sonarcloud_api_token}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'