NONRTRIC Add & update jobs for sample uServices used by other functions

Change-Id: I074f2df2c398624f2ffd51f61724bf37b4b0fc51
Signed-off-by: JohnKeeney <john.keeney@est.tech>
Issue-ID: NONRTRIC-965

diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index d5fc71d..a373592 100644 (file)
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -6,7 +6,6 @@
       - project-view
 
 - _nonrtric_jdk_common: &nonrtric_jdk_common
-    name: nonrtric-jdk-common
     # git repo
     project: nonrtric
     # jenkins job name prefix
@@ -16,48 +15,81 @@
     mvn-version: mvn36
     java-version: openjdk17
 
-- project:
+- _nonrtric_docker_common: &nonrtric_docker_common
     <<: *nonrtric_jdk_common
-    name: nonrtric-test-kafka-procon
-    project-name: "{name}"
-    # image name
-    docker-name: "kafka-procon"
     # 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: "test/kafka-procon"
+    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: "test/kafka-procon/.*"
+        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
 
 - project:
     <<: *nonrtric_jdk_common
-    name: nonrtric-test-http-https-proxy
+    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
+    name: nonrtric-sample-helloworld-sme-invoker
     project-name: "{name}"
     # image name
-    docker-name: "http-https-proxy"
-    # get tag from YAML
-    container-tag-method: yaml-file
-    # use host network to clone from our gerrit
-    docker-build-args: "--network=host"
+    docker-name: "nonrtric-sample-helloworld-sme-invoker"
     # Directory with Dockerfile
-    docker-root: "test/http-https-proxy"
-    # Directory where go test should be run
+    docker-root: "sample-services/hello-world-sme-invoker"
     # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: "test/http-https-proxy/.*"
+        pattern: "sample-services/hello-world-sme-invoker/.*"
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
@@ -67,22 +99,17 @@
           branch: master
 
 - project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-test-cr
+    <<: *nonrtric_docker_common
+    name: nonrtric-sample-helloworld
     project-name: "{name}"
     # image name
-    docker-name: "cr"
-    # get tag from YAML
-    container-tag-method: yaml-file
-    # use host network to clone from our gerrit
-    docker-build-args: "--network=host"
+    docker-name: "nonrtric-sample-helloworld"
     # Directory with Dockerfile
-    docker-root: "test/cr"
-    # Directory where go test should be run
+    docker-root: "sample-services/hello-world"
     # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: "test/cr/.*"
+        pattern: "sample-services/hello-world/.*"
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
@@ -91,23 +118,19 @@
       - master:
           branch: master
 
+# Jobs to verify / build images for testing
 - project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-test-prodstub
+    <<: *nonrtric_docker_common
+    name: nonrtric-test-kafka-procon
     project-name: "{name}"
     # image name
-    docker-name: "prodstub"
-    # get tag from YAML
-    container-tag-method: yaml-file
-    # use host network to clone from our gerrit
-    docker-build-args: "--network=host"
+    docker-name: "kafka-procon"
     # Directory with Dockerfile
-    docker-root: "test/prodstub"
-    # Directory where go test should be run
+    docker-root: "test/kafka-procon"
     # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: "test/prodstub/.*"
+        pattern: "test/kafka-procon/.*"
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
@@ -117,22 +140,17 @@
           branch: master
 
 - project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-test-servicestub
+    <<: *nonrtric_docker_common
+    name: nonrtric-test-http-https-proxy
     project-name: "{name}"
     # image name
-    docker-name: "servicestub"
-    # get tag from YAML
-    container-tag-method: yaml-file
-    # use host network to clone from our gerrit
-    docker-build-args: "--network=host"
+    docker-name: "http-https-proxy"
     # Directory with Dockerfile
-    docker-root: "test/servicestub"
-    # Directory where go test should be run
+    docker-root: "test/http-https-proxy"
     # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: "test/servicestub/.*"
+        pattern: "test/http-https-proxy/.*"
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
@@ -142,22 +160,17 @@
           branch: master
 
 - project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-test-mrstub
+    <<: *nonrtric_docker_common
+    name: nonrtric-test-cr
     project-name: "{name}"
     # image name
-    docker-name: "mrstub"
-    # get tag from YAML
-    container-tag-method: yaml-file
-    # use host network to clone from our gerrit
-    docker-build-args: "--network=host"
+    docker-name: "cr"
     # Directory with Dockerfile
-    docker-root: "test/mrstub"
-    # Directory where go test should be run
+    docker-root: "test/cr"
     # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: "test/mrstub/.*"
+        pattern: "test/cr/.*"
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
@@ -167,59 +180,41 @@
           branch: master
 
 - project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-plt-auth-token-fetch
+    <<: *nonrtric_docker_common
+    name: nonrtric-test-prodstub
     project-name: "{name}"
     # image name
-    docker-name: "o-ran-sc/nonrtric-plt-auth-token-fetch"
-    # get tag from YAML
-    container-tag-method: yaml-file
-    # use host network to clone from our gerrit
-    docker-build-args: "--network=host"
+    docker-name: "prodstub"
     # Directory with Dockerfile
-    docker-root: "auth-token-fetch"
-    # Directory where go test should be run
-    go-root: "auth-token-fetch"
+    docker-root: "test/prodstub"
     # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: "auth-token-fetch/.*"
+        pattern: "test/prodstub/.*"
     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
 
 - 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
+    <<: *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
-    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
-
-- project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-release
-    # maven release requires sigul which requires centos
-    # container release requires docker
-    build-node: centos7-docker-2c-8g
+    # Includes verify and merge jobs
     jobs:
-      - "{project-name}-gerrit-release-jobs"
+      - "{project-name}-gerrit-docker-jobs"
+    stream:
+      - master:
+          branch: master