X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric%2Fnonrtric.yaml;h=cf574ffdb6b219928cecf63ed54edae0490c8261;hb=f77ee19ba6d1aafc2d5a30c81d15dd1cf5d0e2d4;hp=63be2f1d6744b2cf849b3255cdf0e607583ea7b0;hpb=0a05dc377e41dafeaa1eb4783597eab753952029;p=ci-management.git

diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index 63be2f1d..cf574ffd 100644
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -160,51 +160,26 @@
       - dawn:
           branch: dawn
 
-# nonrtric:r-app-catalogue
-# Maven artifacts for r-app-catalogue
 - project:
     <<: *nonrtric_jdk_common
-    name: nonrtric-r-app-catalogue
-    project-name: '{name}'
-    mvn-opts: '-Ddocker.skip=true'
-    mvn-params: '-f r-app-catalogue'
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'r-app-catalogue/.*'
-    build-node: ubuntu1804-builder-4c-4g
-    jobs:
-      - gerrit-maven-verify
-      - gerrit-maven-merge
-      - gerrit-maven-stage
-      - gerrit-maven-clm
-    stream:
-      - master:
-          branch: master
-      - cherry:
-          branch: cherry
-      - dawn:
-          branch: dawn
-      - e-release:
-          branch: e-release
-
-- 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:
@@ -213,37 +188,19 @@
     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-sonar
+    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
-    sonar-properties: |
-        # Required metadata
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_nonrtric-dmaap-mediator-producer
-        sonar.organization={sonarcloud_project_organization}
-        # Encoding
-        sonar.build.sourceEncoding=UTF-8
-        # Language
-        sonar.language=go
-        # Source
-        sonar.sources=.
-        # Unit tests
-        sonar.go.coverage.reportPaths=dmaap-mediator-producer/coverage.txt
-        # Inclusions
-        sonar.inclusions=dmaap-mediator-producer/internal/**/**.go
-        # Exclusions
-        sonar.exclusions=dmaap-mediator-producer/main.go,dmaap-mediator-producer/mocks/**.go,dmaap-mediator-producer/stub/**.go,dmaap-mediator-producer/internal/**/**_test.go
+    sonar-properties: !include-raw: sonar-project.properties
     jobs:
       - gerrit-sonar-prescan-script
 
@@ -327,35 +284,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
@@ -386,4 +314,3 @@
         sonar.exclusions=test/usecases/oruclosedlooprecovery/goversion/mocks/**.go,test/usecases/oruclosedlooprecovery/goversion/internal/**/**_test.go,test/usecases/oruclosedlooprecovery/goversion/**_test.go,test/usecases/oruclosedlooprecovery/goversion/simulator/**.go
     jobs:
       - gerrit-sonar-prescan-script
-