X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric%2Fnonrtric.yaml;h=6eb7e362bc40510522988467971f650392cb39de;hb=07cae68a7774053ed7de460c42c3e75734ec6121;hp=55c2ab68ad2dc05f419fd1645ee75337b6107371;hpb=17a93e8af9837b25f7ac7436bf0baf50e37cf118;p=ci-management.git

diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index 55c2ab68..6eb7e362 100644
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -32,35 +32,6 @@
       - gerrit-maven-docker-merge
       - gerrit-maven-docker-stage
     stream:
-      - master:
-          branch: master
-      - cherry:
-          branch: cherry
-      - dawn:
-          branch: dawn
-      - e-release:
-          branch: e-release
-
-# nonrtric:a1-policy-management-service/
-# Maven artifacts for nonrtric-a1-policy-management-service/
-- project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-a1-policy-management-service
-    project-name: '{name}'
-    mvn-opts: '-Ddocker.skip=true'
-    mvn-params: '-f a1-policy-management-service/'
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'a1-policy-management-service/.*'
-    build-node: ubuntu1804-builder-4c-4g
-    jobs:
-      - gerrit-maven-verify
-      - gerrit-maven-merge
-      - gerrit-maven-stage
-      - gerrit-maven-clm
-    stream:
-      - master:
-          branch: master
       - e-release:
           branch: e-release
 
@@ -82,8 +53,6 @@
       - gerrit-maven-stage
       - gerrit-maven-clm
     stream:
-      - cherry:
-          branch: cherry
       - dawn:
           branch: dawn
 
@@ -105,26 +74,22 @@
       - gerrit-maven-stage
       - gerrit-maven-clm
     stream:
-      - master:
-          branch: master
-      - cherry:
-          branch: cherry
       - dawn:
           branch: dawn
       - e-release:
           branch: e-release
 
-# nonrtric:information-coordinator-service
-# Maven artifacts for nonrtric-information-coordinator-service
+# nonrtric:enrichment-coordinator-service
+# Maven artifacts for nonrtric-enrichment-coordinator-service
 - project:
     <<: *nonrtric_jdk_common
-    name: nonrtric-information-coordinator-service
+    name: nonrtric-enrichment-coordinator-service
     project-name: '{name}'
     mvn-opts: '-Ddocker.skip=true'
-    mvn-params: '-f information-coordinator-service'
+    mvn-params: '-f enrichment-coordinator-service'
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'information-coordinator-service/.*'
+        pattern: 'enrichment-coordinator-service/.*'
     build-node: ubuntu1804-builder-4c-4g
     jobs:
       - gerrit-maven-verify
@@ -132,33 +97,52 @@
       - gerrit-maven-stage
       - gerrit-maven-clm
     stream:
-      - master:
-          branch: master
-      - e-release:
-          branch: e-release
+      - dawn:
+          branch: dawn
 
-# nonrtric:enrichment-coordinator-service
-# Maven artifacts for nonrtric-enrichment-coordinator-service
 - project:
     <<: *nonrtric_jdk_common
-    name: nonrtric-enrichment-coordinator-service
+    name: nonrtric-auth-token-fetch
     project-name: '{name}'
-    mvn-opts: '-Ddocker.skip=true'
-    mvn-params: '-f enrichment-coordinator-service'
+    # image name
+    docker-name: 'o-ran-sc/nonrtric-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'
+    # Directory with Dockerfile
+    docker-root: 'auth-token-fetch'
+    # use host network to clone from our gerrit
+    docker-build-args: '--network=host'
+    # 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: 'enrichment-coordinator-service/.*'
-    build-node: ubuntu1804-builder-4c-4g
+        pattern: 'auth-token-fetch/.*'
+    build-node: ubuntu1804-docker-4c-4g
+    # Includes verify and merge jobs
     jobs:
-      - gerrit-maven-verify
-      - gerrit-maven-merge
-      - gerrit-maven-stage
-      - gerrit-maven-clm
+      - "{project-name}-gerrit-docker-jobs"
+      - gerrit-go-verify
     stream:
-      - cherry:
-          branch: cherry
-      - dawn:
-          branch: dawn
+      - master:
+          branch: master
+
+- project:
+    <<: *nonrtric_jdk_common
+    name: nonrtric-auth-token-fetch-sonar
+    project-name: nonrtric-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: sonar-project.properties
+    jobs:
+      - gerrit-sonar-prescan-script
 
 - project:
     <<: *nonrtric_jdk_common
@@ -169,19 +153,6 @@
     jobs:
       - '{project-name}-gerrit-release-jobs'
 
-- project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-sonar
-    project-name: '{name}'
-    # 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}_nonrtric'
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    jobs:
-      - gerrit-maven-sonar
-
 # Usecases
 - project:
     <<: *nonrtric_jdk_common