X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric%2Fnonrtric.yaml;h=4c2c89e47a5b9326ab23e4b7852839d9a4b0dbc6;hb=refs%2Fchanges%2F50%2F7650%2F2;hp=2c3051195037539ebfad96f34de3ad2903fbe323;hpb=0e790381f37554287834a633880c9d4e33e3eca6;p=ci-management.git

diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index 2c305119..4c2c89e4 100644
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -38,6 +38,8 @@
           branch: cherry
       - dawn:
           branch: dawn
+      - e-release:
+          branch: e-release
 
 # nonrtric:a1-policy-management-service/
 # Maven artifacts for nonrtric-a1-policy-management-service/
@@ -59,6 +61,8 @@
     stream:
       - master:
           branch: master
+      - e-release:
+          branch: e-release
 
 # nonrtric:policy-agent/
 # Maven artifacts for nonrtric-policy-agent/
@@ -107,6 +111,8 @@
           branch: cherry
       - dawn:
           branch: dawn
+      - e-release:
+          branch: e-release
 
 # nonrtric:information-coordinator-service
 # Maven artifacts for nonrtric-information-coordinator-service
@@ -128,6 +134,8 @@
     stream:
       - master:
           branch: master
+      - e-release:
+          branch: e-release
 
 # nonrtric:enrichment-coordinator-service
 # Maven artifacts for nonrtric-enrichment-coordinator-service
@@ -176,11 +184,42 @@
           branch: cherry
       - dawn:
           branch: dawn
+      - e-release:
+          branch: e-release
+
+- project:
+    <<: *nonrtric_jdk_common
+    name: nonrtric-dmaap-mediator-producer
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/nonrtric-dmaap-mediator-producer'
+    # 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: 'dmaap-mediator-producer'
+    # Directory where go test should be run
+    go-root: 'dmaap-mediator-producer'
+    # Limit build trigger to appropriate files
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'dmaap-mediator-producer/.*'
+    build-node: ubuntu1804-docker-4c-4g
+    # Includes verify and merge jobs
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"
+      - gerrit-go-verify
+    stream:
+      - master:
+          branch: master
+      - e-release:
+          branch: e-release
 
 - project:
     <<: *nonrtric_jdk_common
     name: nonrtric-dmaap-mediator-producer-sonar
-    project-name: nonrtric-dmaap-mediator-producer-sonar
+    project-name: nonrtric-dmaap-mediator-producer
     # prescan script requires ubuntu
     # golang is only on docker-enabled nodes
     build-node: ubuntu1804-docker-4c-4g
@@ -188,23 +227,7 @@
     sonar-project-file: ""
     java-version: openjdk11
     # use sonarcloud values from defaults.yaml
-    sonar-properties: |
-        # Required metadata
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_nonrtric-dmaap-mediator-producer
-        sonar.organization={sonarcloud_project_organization}
-        # Encoding
-        sonar.build.sourceEncoding=UTF-8
-        # Language
-        sonar.language=go
-        # Source
-        sonar.sources=.
-        # Unit tests
-        sonar.go.coverage.reportPaths=dmaap-mediator-producer/coverage.txt
-        # Inclusions
-        sonar.inclusions=dmaap-mediator-producer/internal/**/**.go
-        # Exclusions
-        sonar.exclusions=dmaap-mediator-producer/main.go,dmaap-mediator-producer/mocks/**.go,dmaap-mediator-producer/stub/**.go,dmaap-mediator-producer/internal/**/**_test.go
+    sonar-properties: !include-raw: sonar-project.properties
     jobs:
       - gerrit-sonar-prescan-script
 
@@ -256,6 +279,66 @@
           branch: master
       - dawn:
           branch: dawn
+      - e-release:
+          branch: e-release
+
+- project:
+    <<: *nonrtric_jdk_common
+    name: nonrtric-o-ru-closed-loop-consumer
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/nonrtric-o-ru-closed-loop-consumer'
+    # 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/goversion'
+    # Directory where go test should be run
+    go-root: 'test/usecases/oruclosedlooprecovery/goversion'
+    # Limit build trigger to appropriate files
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'test/usecases/oruclosedlooprecovery/goversion/.*'
+    build-node: ubuntu1804-docker-4c-4g
+    # Includes verify and merge jobs
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"
+      - gerrit-go-verify
+    stream:
+      - master:
+          branch: master
+      - e-release:
+          branch: e-release
+
+- project:
+    <<: *nonrtric_jdk_common
+    name: nonrtric-o-du-slice-assurance
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/nonrtric-o-du-slice-assurance'
+    # 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/odusliceassurance/goversion'
+    # Directory where go test should be run
+    go-root: 'test/usecases/odusliceassurance/goversion'
+    # Limit build trigger to appropriate files
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'test/usecases/odusliceassurance/goversion/.*'
+    build-node: ubuntu1804-docker-4c-4g
+    # Includes verify and merge jobs
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"
+      - gerrit-go-verify
+    stream:
+      - master:
+          branch: master
+      - e-release:
+          branch: e-release
 
 - project:
     <<: *nonrtric_jdk_common
@@ -287,4 +370,3 @@
         sonar.exclusions=test/usecases/oruclosedlooprecovery/goversion/mocks/**.go,test/usecases/oruclosedlooprecovery/goversion/internal/**/**_test.go,test/usecases/oruclosedlooprecovery/goversion/**_test.go,test/usecases/oruclosedlooprecovery/goversion/simulator/**.go
     jobs:
       - gerrit-sonar-prescan-script
-