X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric%2Fnonrtric.yaml;h=987335d92a3e2fd3a9268fe06c6b3f7a0922f972;hb=6b91a1d1073cab863a9bf081f275dcbf5e32b28b;hp=1d69409ab40365416c5e86c79c804b8d024ed503;hpb=ba9bee2b417123113a6dd550c35d2cfd63339e6c;p=ci-management.git

diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index 1d69409a..987335d9 100644
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -22,19 +22,10 @@
     # 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
@@ -43,11 +34,13 @@
     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'
@@ -64,17 +57,43 @@
     stream:
       - master:
           branch: master
+      - cherry:
+          branch: cherry
+
+# nonrtric:sdnc-a1-controller
+# Maven artifacts for nonrtric-sdnc-a1-controller
+- project:
+    <<: *nonrtric_jdk_common
+    name: nonrtric-sdnc-a1-controller
+    project-name: '{name}'
+    mvn-opts: '-Ddocker.skip=true'
+    mvn-params: '-f sdnc-a1-controller/northbound'
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'sdnc-a1-controller/northbound/.*'
+    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:sdnc-a1-controller-model
-# Maven artifacts for nonrtric-sdnc-a1-controller-model
+# nonrtric:enrichment-coordinator-service
+# Maven artifacts for nonrtric-enrichment-coordinator-service
 - project:
-    <<: *nonrtric_jdk8
-    name: nonrtric-sdnc-a1-controller-model
+    <<: *nonrtric_jdk_common
+    name: nonrtric-enrichment-coordinator-service
     project-name: '{name}'
-    mvn-params: '-f sdnc-a1-controller/northbound/nonrt-ric-api/model'
+    mvn-opts: '-Ddocker.skip=true'
+    mvn-params: '-f enrichment-coordinator-service'
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'sdnc-a1-controller/northbound/nonrt-ric-api/model/.*'
+        pattern: 'enrichment-coordinator-service/.*'
     build-node: ubuntu1804-builder-4c-4g
     jobs:
       - gerrit-maven-verify
@@ -84,17 +103,20 @@
     stream:
       - master:
           branch: master
+      - cherry:
+          branch: cherry
 
-# nonrtric:sdnc-a1-controller-provider
-# Maven artifacts for nonrtric-sdnc-a1-controller-provider
+# nonrtric:r-app-catalogue
+# Maven artifacts for r-app-catalogue
 - project:
-    <<: *nonrtric_jdk8
-    name: nonrtric-sdnc-a1-controller-provider
+    <<: *nonrtric_jdk_common
+    name: nonrtric-r-app-catalogue
     project-name: '{name}'
-    mvn-params: '-f sdnc-a1-controller/northbound/nonrt-ric-api/provider'
+    mvn-opts: '-Ddocker.skip=true'
+    mvn-params: '-f r-app-catalogue'
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'sdnc-a1-controller/northbound/nonrt-ric-api/provider/.*'
+        pattern: 'r-app-catalogue/.*'
     build-node: ubuntu1804-builder-4c-4g
     jobs:
       - gerrit-maven-verify
@@ -104,11 +126,36 @@
     stream:
       - master:
           branch: master
+      - cherry:
+          branch: cherry
 
 - project:
-    <<: *nonrtric_jdk11
+    <<: *nonrtric_jdk_common
+    name: nonrtric-o-ru-closed-loop-recovery
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/nonrtric-o-ru-closed-loop-recovery'
+    # get tag from YAML
+    container-tag-method: yaml-file
+    # use host network to clone from our gerrit
+    docker-build-args: '--network=host'
+    # Directory with Dockerfile
+    docker-root: 'test/usecases/oruclosedlooprecovery/scriptversion/app'
+    # Limit build trigger to appropriate files
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'test/usecases/oruclosedlooprecovery/scriptversion/app/.*'
+    build-node: ubuntu1804-docker-4c-4g
+    # Includes verify and merge jobs
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"
+    stream:
+      - master:
+          branch: master
+
+- 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
@@ -116,10 +163,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
+    mvn-params: '-Ddocker.skip=true'
     sonarcloud: true
     sonarcloud-api-token: '{sonarcloud_api_token}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'