X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric%2Fnonrtric.yaml;h=0353ea84f1f2452ff120221c616090a45e0ee3ce;hb=1b84e1507a7f8a9ece288849dd877490843de00e;hp=d030a5910232f3a08dd4b12b17944b722bf32ff5;hpb=e2c327b7d9042ecfe8fc74149265e3d45f84605a;p=ci-management.git

diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index d030a591..0353ea84 100644
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -5,82 +5,245 @@
     views:
       - project-view
 
-- project:
-    name: nonrtric-info
-    project: nonrtric
-    project-name: nonrtric
-    build-node: centos7-builder-1c-1g
-    jobs:
-      - gerrit-info-yaml-verify
-
-- nonrtric_jdk11: &nonrtric_jdk11
-    # values apply to all projects here
-    name: nonrtric-jdk11
+- _nonrtric_jdk_common: &nonrtric_jdk_common
     # git repo
     project: nonrtric
     # jenkins job name prefix
     project-name: nonrtric
     # maven settings file has docker credentials
     mvn-settings: nonrtric-settings
-    # defaults.yaml value is NOT used due to value set in lf-maven-jobs.yaml
-    java-version: openjdk11
     mvn-version: mvn36
+    java-version: openjdk17
+
+- _nonrtric_docker_common: &nonrtric_docker_common
+    <<: *nonrtric_jdk_common
+    # get tag from YAML
+    container-tag-method: yaml-file
+    # use host network to clone from our gerrit
+    docker-build-args: "--network=host"
+
+- project:
+    <<: *nonrtric_jdk_common
+    name: nonrtric-release
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - "{project-name}-gerrit-release-jobs"
+
+# Jobs to verify / build / sonar for functional releaseable funtions
+- project:
+    <<: *nonrtric_docker_common
+    name: nonrtric-plt-auth-token-fetch
+    project-name: "{name}"
+    # image name
+    docker-name: "o-ran-sc/nonrtric-plt-auth-token-fetch"
+    # Directory with Dockerfile
+    docker-root: "auth-token-fetch"
+    # Directory where go test should be run
+    go-root: "auth-token-fetch"
+    # Limit build trigger to appropriate files
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: "auth-token-fetch/.*"
+    build-node: ubuntu1804-docker-4c-4g
+    # Includes verify and merge jobs
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"
+      - gerrit-go-verify
+    stream:
+      - master:
+          branch: master
+      - g-release:
+          java-version: openjdk11
+          branch: g-release
+      - h-release:
+          branch: h-release
+      - i-release:
+          branch: i-release
 
+# Jobs to verify / build sample uService images
 - project:
-    <<: *nonrtric_jdk11
-    mvn-params: -Dbuild.number=${{BUILD_NUMBER}}
+    <<: *nonrtric_docker_common
+    name: nonrtric-sample-helloworld-sme-invoker
+    project-name: "{name}"
+    # image name
+    docker-name: "o-ran-sc/nonrtric-sample-helloworld-sme-invoker"
+    # Directory with Dockerfile
+    docker-root: "sample-services/hello-world-sme-invoker"
+    # Limit build trigger to appropriate files
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: "sample-services/hello-world-sme-invoker/.*"
+    build-node: ubuntu1804-docker-4c-4g
+    # Includes verify and merge jobs
     jobs:
-      - gerrit-maven-docker-verify
-      - gerrit-maven-docker-merge
-      - gerrit-maven-docker-stage
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
 
-# nonrtric:policy-agent
-# common for artifacts for nonrtric-policy-agent
-- nonrtric_policy_agent_common: &nonrtric_policy_agent_common
-    name: nonrtric-policy-agent-common
-    project-name: nonrtric-policy-agent
-    mvn-opts: '-Ddocker.skip=true'
-    mvn-params: '-f policy-agent'
+- project:
+    <<: *nonrtric_docker_common
+    name: nonrtric-sample-helloworld
+    project-name: "{name}"
+    # image name
+    docker-name: "o-ran-sc/nonrtric-sample-helloworld"
+    # Directory with Dockerfile
+    docker-root: "sample-services/hello-world"
+    # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'policy-agent/.*'
+        pattern: "sample-services/hello-world/.*"
+    build-node: ubuntu1804-docker-4c-4g
+    # Includes verify and merge jobs
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"
+    stream:
+      - master:
+          branch: master
 
-# build feature artifacts for nonrtric-policy-agent
 - project:
-    <<: *nonrtric_jdk11
-    <<: *nonrtric_policy_agent_common
-    name: nonrtric-policy-agent
-    build-node: ubuntu1804-builder-4c-4g
+    <<: *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:
-      - gerrit-maven-verify
-      - gerrit-maven-merge
-      - gerrit-maven-stage
-      - gerrit-maven-clm
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
 
 - project:
-    <<: *nonrtric_jdk11
-    name: nonrtric-release
-    branch: master
-    # maven release requires sigul which requires centos
-    # container release requires docker
-    build-node: centos7-docker-2c-8g
+    <<: *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
+    name: nonrtric-test-kafka-procon
+    project-name: "{name}"
+    # image name
+    docker-name: "kafka-procon"
+    # Directory with Dockerfile
+    docker-root: "test/kafka-procon"
+    # Limit build trigger to appropriate files
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: "test/kafka-procon/.*"
+    build-node: ubuntu1804-docker-4c-4g
+    # Includes verify and merge jobs
+    jobs:
+      - gerrit-docker-verify
+    stream:
+      - master:
+          branch: master
+
+- project:
+    <<: *nonrtric_docker_common
+    name: nonrtric-test-http-https-proxy
+    project-name: "{name}"
+    # image name
+    docker-name: "nodejs-kube-proxy"
+    # Directory with Dockerfile
+    docker-root: "test/http-https-proxy"
+    # Limit build trigger to appropriate files
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: "test/http-https-proxy/.*"
+    build-node: ubuntu1804-docker-4c-4g
+    # Includes verify and merge jobs
+    jobs:
+      - gerrit-docker-verify
+    stream:
+      - master:
+          branch: master
+
+- project:
+    <<: *nonrtric_docker_common
+    name: nonrtric-test-cr
+    project-name: "{name}"
+    # image name
+    docker-name: "callback-receiver"
+    # Directory with Dockerfile
+    docker-root: "test/cr"
+    # Limit build trigger to appropriate files
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: "test/cr/.*"
+    build-node: ubuntu1804-docker-4c-4g
+    # Includes verify and merge jobs
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - gerrit-docker-verify
+    stream:
+      - master:
+          branch: master
 
 - project:
-    <<: *nonrtric_jdk11
-    name: nonrtric-sonar
-    # template goal install builds docker image unnecessarily
-    mvn-params: -Ddocker.skip=true
-    sonarcloud: true
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    <<: *nonrtric_docker_common
+    name: nonrtric-test-prodstub
+    project-name: "{name}"
+    # image name
+    docker-name: "producer-stub"
+    # Directory with Dockerfile
+    docker-root: "test/prodstub"
+    # Limit build trigger to appropriate files
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: "test/prodstub/.*"
+    build-node: ubuntu1804-docker-4c-4g
+    # Includes verify and merge jobs
     jobs:
-      - gerrit-maven-sonar
+      - gerrit-docker-verify
+    stream:
+      - master:
+          branch: master
+
+- project:
+    <<: *nonrtric_docker_common
+    name: nonrtric-test-mrstub
+    project-name: "{name}"
+    # image name
+    docker-name: "mrstub"
+    # Directory with Dockerfile
+    docker-root: "test/mrstub"
+    # Limit build trigger to appropriate files
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: "test/mrstub/.*"
+    build-node: ubuntu1804-docker-4c-4g
+    # Includes verify and merge jobs
+    jobs:
+      - gerrit-docker-verify
+    stream:
+      - master:
+          branch: master