X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric%2Fnonrtric.yaml;h=e90741b9bce9f45962d70ea4af0cd1e33f7d07b3;hb=906fac627884648153d2af27bfa16cd5001dd1f7;hp=d45141e9bc72b2138b4554731d107e850d81d615;hpb=8def6014920ea57f1ea59d3fcf82de605bfa0f49;p=ci-management.git

diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index d45141e9..e90741b9 100644
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -114,29 +114,6 @@
       - e-release:
           branch: e-release
 
-# nonrtric:information-coordinator-service
-# Maven artifacts for nonrtric-information-coordinator-service
-- project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-information-coordinator-service
-    project-name: '{name}'
-    mvn-opts: '-Ddocker.skip=true'
-    mvn-params: '-f information-coordinator-service'
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'information-coordinator-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
-
 # nonrtric:enrichment-coordinator-service
 # Maven artifacts for nonrtric-enrichment-coordinator-service
 - project:
@@ -162,22 +139,24 @@
 
 - project:
     <<: *nonrtric_jdk_common
-    name: nonrtric-dmaap-mediator-producer
+    name: nonrtric-auth-token-fetch
     project-name: '{name}'
     # image name
-    docker-name: 'o-ran-sc/nonrtric-dmaap-mediator-producer'
+    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: 'dmaap-mediator-producer'
+    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: 'dmaap-mediator-producer'
+    go-root: 'auth-token-fetch'
     # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'dmaap-mediator-producer/.*'
+        pattern: 'auth-token-fetch/.*'
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
@@ -186,17 +165,15 @@
     stream:
       - master:
           branch: master
-      - e-release:
-          branch: e-release
 
 - project:
     <<: *nonrtric_jdk_common
-    name: nonrtric-dmaap-mediator-producer-sonar
-    project-name: nonrtric-dmaap-mediator-producer
+    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-dmaapmediatorproducer-ubuntu.sh
+    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
@@ -284,35 +261,6 @@
       - e-release:
           branch: e-release
 
-- project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-o-du-slice-assurance
-    project-name: '{name}'
-    # image name
-    docker-name: 'o-ran-sc/nonrtric-o-du-slice-assurance'
-    # 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: 'test/usecases/odusliceassurance/goversion'
-    # Directory where go test should be run
-    go-root: 'test/usecases/odusliceassurance/goversion'
-    # Limit build trigger to appropriate files
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'test/usecases/odusliceassurance/goversion/.*'
-    build-node: ubuntu1804-docker-4c-4g
-    # Includes verify and merge jobs
-    jobs:
-      - "{project-name}-gerrit-docker-jobs"
-      - gerrit-go-verify
-    stream:
-      - master:
-          branch: master
-      - e-release:
-          branch: e-release
-
 - project:
     <<: *nonrtric_jdk_common
     name: nonrtric-o-ru-closed-loop-consumer-sonar