Merge "NONRTRIC: Updating sample rapp build job"
diff --git a/jjb/nonrtric/ics-producer-consumer-tests.sh b/jjb/nonrtric/ics-producer-consumer-tests.sh
index 2fbefc4..f052e49 100755
--- a/jjb/nonrtric/ics-producer-consumer-tests.sh
+++ b/jjb/nonrtric/ics-producer-consumer-tests.sh
@@ -2,8 +2,13 @@
set -eux -o pipefail
-echo "Starting ics-producer-consumer-tests.sh which will execute sample-services/ics-producer-consumer/start.sh"
+echo "Starting ics-producer-consumer-tests.sh"
+echo "Executing sample-services/ics-producer-consumer/start.sh"
cd sample-services/ics-producer-consumer
bash start.sh
-
-echo "Finished ics-producer-consumer-tests.sh"
\ No newline at end of file
+echo "Finished Test 1"
+echo "Executing sample-services/ics-simple-producer-consumer/tests/start_ics_producer_consumer_test.sh"
+cd ../../sample-services/ics-simple-producer-consumer/tests/
+bash start_ics_producer_consumer_test.sh
+echo "Finished Test 1"
+echo "Finished ics-producer-consumer-tests.sh"
diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index 0353ea8..a075cb8 100644
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -54,13 +54,12 @@
stream:
- master:
branch: master
- - g-release:
- java-version: openjdk11
- branch: g-release
- h-release:
branch: h-release
- i-release:
branch: i-release
+ - j-release:
+ branch: j-release
# Jobs to verify / build sample uService images
- project:
@@ -82,6 +81,8 @@
stream:
- master:
branch: master
+ - j-release:
+ branch: j-release
- project:
<<: *nonrtric_docker_common
@@ -102,6 +103,8 @@
stream:
- master:
branch: master
+ - j-release:
+ branch: j-release
- project:
<<: *nonrtric_docker_common
@@ -124,6 +127,8 @@
stream:
- master:
branch: master
+ - j-release:
+ branch: j-release
- project:
<<: *nonrtric_docker_common
@@ -146,6 +151,52 @@
stream:
- master:
branch: master
+ - j-release:
+ branch: j-release
+
+- project:
+ <<: *nonrtric_docker_common
+ name: nonrtric-sample-simplekafkaproducer
+ project-name: "{name}"
+ # image name
+ docker-name: "o-ran-sc/nonrtric-simple-icsproducer"
+ # Directory with Dockerfile
+ docker-root: "sample-services/ics-simple-producer-consumer/kafka-producer"
+ # Limit build trigger to appropriate files
+ gerrit_trigger_file_paths:
+ - compare-type: REG_EXP
+ pattern: "sample-services/ics-simple-producer-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
+
+- project:
+ <<: *nonrtric_docker_common
+ name: nonrtric-sample-simplekafkaconsumer
+ project-name: "{name}"
+ # image name
+ docker-name: "o-ran-sc/nonrtric-simple-icsconsumer"
+ # Directory with Dockerfile
+ docker-root: "sample-services/ics-simple-producer-consumer/kafka-consumer"
+ # Limit build trigger to appropriate files
+ gerrit_trigger_file_paths:
+ - compare-type: REG_EXP
+ pattern: "sample-services/ics-simple-producer-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: