X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric%2Fnonrtric.yaml;h=064ad0adab67d9ab164432ea9dfa40c32295c343;hb=refs%2Fheads%2Fmaster;hp=687cbeaac25b96deeb29cc9a4faa468a2b43af32;hpb=29e455f3a87e13d21f2493f3d902894218416354;p=ci-management.git

diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index 687cbeaa..0353ea84 100644
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -62,21 +62,6 @@
       - i-release:
           branch: i-release
 
-- project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-plt-auth-token-fetch-sonar
-    project-name: nonrtric-plt-auth-token-fetch
-    # prescan script requires ubuntu
-    # golang is only on docker-enabled nodes
-    build-node: ubuntu1804-docker-4c-4g
-    sonar-prescan-script: !include-raw-escape: prescan-nonrtric-auth-token-fetch-ubuntu.sh
-    sonar-project-file: ""
-    java-version: openjdk11
-    # use sonarcloud values from defaults.yaml
-    sonar-properties: !include-raw-escape: sonar-project.properties
-    jobs:
-      - gerrit-sonar-prescan-script
-
 # Jobs to verify / build sample uService images
 - project:
     <<: *nonrtric_docker_common
@@ -103,7 +88,7 @@
     name: nonrtric-sample-helloworld
     project-name: "{name}"
     # image name
-    docker-name: "o-ranc-sc/nonrtric-sample-helloworld"
+    docker-name: "o-ran-sc/nonrtric-sample-helloworld"
     # Directory with Dockerfile
     docker-root: "sample-services/hello-world"
     # Limit build trigger to appropriate files
@@ -118,6 +103,50 @@
       - master:
           branch: master
 
+- project:
+    <<: *nonrtric_docker_common
+    name: nonrtric-sample-icsproducer
+    project-name: "{name}"
+    # image name
+    docker-name: "o-ran-sc/nonrtric-sample-icsproducer"
+    # Directory with Dockerfile
+    docker-root: "sample-services/ics-producer-consumer/producer"
+    # Limit build trigger to appropriate files
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: "sample-services/ics-producer-consumer/producer/.*"
+    build-node: ubuntu1804-docker-4c-4g
+    post_docker_build_script: !include-raw-escape:
+      - ics-producer-consumer-tests.sh
+    # Includes verify and merge jobs
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"
+    stream:
+      - master:
+          branch: master
+
+- project:
+    <<: *nonrtric_docker_common
+    name: nonrtric-sample-icsconsumer
+    project-name: "{name}"
+    # image name
+    docker-name: "o-ran-sc/nonrtric-sample-icsconsumer"
+    # Directory with Dockerfile
+    docker-root: "sample-services/ics-producer-consumer/consumer"
+    # Limit build trigger to appropriate files
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: "sample-services/ics-producer-consumer/consumer/.*"
+    build-node: ubuntu1804-docker-4c-4g
+    post_docker_build_script: !include-raw-escape:
+      - ics-producer-consumer-tests.sh
+    # Includes verify and merge jobs
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"
+    stream:
+      - master:
+          branch: master
+
 # Jobs to verify / build images for testing
 - project:
     <<: *nonrtric_docker_common
@@ -134,7 +163,7 @@
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
-      - "{project-name}-gerrit-docker-jobs"
+      - gerrit-docker-verify
     stream:
       - master:
           branch: master
@@ -144,7 +173,7 @@
     name: nonrtric-test-http-https-proxy
     project-name: "{name}"
     # image name
-    docker-name: "http-https-proxy"
+    docker-name: "nodejs-kube-proxy"
     # Directory with Dockerfile
     docker-root: "test/http-https-proxy"
     # Limit build trigger to appropriate files
@@ -154,7 +183,7 @@
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
-      - "{project-name}-gerrit-docker-jobs"
+      - gerrit-docker-verify
     stream:
       - master:
           branch: master
@@ -164,7 +193,7 @@
     name: nonrtric-test-cr
     project-name: "{name}"
     # image name
-    docker-name: "cr"
+    docker-name: "callback-receiver"
     # Directory with Dockerfile
     docker-root: "test/cr"
     # Limit build trigger to appropriate files
@@ -174,7 +203,7 @@
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
-      - "{project-name}-gerrit-docker-jobs"
+      - gerrit-docker-verify
     stream:
       - master:
           branch: master
@@ -184,7 +213,7 @@
     name: nonrtric-test-prodstub
     project-name: "{name}"
     # image name
-    docker-name: "prodstub"
+    docker-name: "producer-stub"
     # Directory with Dockerfile
     docker-root: "test/prodstub"
     # Limit build trigger to appropriate files
@@ -194,7 +223,7 @@
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
-      - "{project-name}-gerrit-docker-jobs"
+      - gerrit-docker-verify
     stream:
       - master:
           branch: master
@@ -214,7 +243,7 @@
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
-      - "{project-name}-gerrit-docker-jobs"
+      - gerrit-docker-verify
     stream:
       - master:
           branch: master