X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric%2Fnonrtric.yaml;h=460693599f50d60082dcbaea116a6feb6db20575;hb=e2d64fba911cad748127778e3101ef2237bc70a8;hp=bf4cd35041bd415bfc1e668ea127dbe2ddfed04a;hpb=129f3af7ce6952da36dca45fe664b9e2406eac7e;p=ci-management.git

diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index bf4cd350..46069359 100644
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -32,12 +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
 
@@ -59,8 +53,6 @@
       - gerrit-maven-stage
       - gerrit-maven-clm
     stream:
-      - cherry:
-          branch: cherry
       - dawn:
           branch: dawn
 
@@ -82,10 +74,6 @@
       - gerrit-maven-stage
       - gerrit-maven-clm
     stream:
-      - master:
-          branch: master
-      - cherry:
-          branch: cherry
       - dawn:
           branch: dawn
       - e-release:
@@ -109,8 +97,6 @@
       - gerrit-maven-stage
       - gerrit-maven-clm
     stream:
-      - cherry:
-          branch: cherry
       - dawn:
           branch: dawn
 
@@ -166,105 +152,3 @@
     build-node: centos7-docker-2c-8g
     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
-    name: nonrtric-o-ru-closed-loop-recovery
-    project-name: '{name}'
-    # image name
-    docker-name: 'o-ran-sc/nonrtric-o-ru-closed-loop-recovery'
-    # 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/oruclosedlooprecovery/scriptversion/app'
-    # Limit build trigger to appropriate files
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'test/usecases/oruclosedlooprecovery/scriptversion/app/.*'
-    build-node: ubuntu1804-docker-4c-4g
-    # Includes verify and merge jobs
-    jobs:
-      - "{project-name}-gerrit-docker-jobs"
-    stream:
-      - master:
-          branch: master
-      - dawn:
-          branch: dawn
-      - e-release:
-          branch: e-release
-
-- project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-o-ru-closed-loop-consumer
-    project-name: '{name}'
-    # image name
-    docker-name: 'o-ran-sc/nonrtric-o-ru-closed-loop-consumer'
-    # 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/oruclosedlooprecovery/goversion'
-    # Directory where go test should be run
-    go-root: 'test/usecases/oruclosedlooprecovery/goversion'
-    # Limit build trigger to appropriate files
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'test/usecases/oruclosedlooprecovery/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
-    project-name: nonrtric-o-ru-closed-loop-consumer-sonar
-    # prescan script requires ubuntu
-    # golang is only on docker-enabled nodes
-    build-node: ubuntu1804-docker-4c-4g
-    sonar-prescan-script: !include-raw-escape: prescan-oruclosedloopconsumer-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-o-ru-closed-loop-consumer
-        sonar.organization={sonarcloud_project_organization}
-        # Encoding
-        sonar.build.sourceEncoding=UTF-8
-        # Language
-        sonar.language=go
-        # Source
-        sonar.sources=.
-        # Unit tests
-        sonar.go.coverage.reportPaths=test/usecases/oruclosedlooprecovery/goversion/coverage.txt
-        # Inclusions
-        sonar.inclusions=test/usecases/oruclosedlooprecovery/goversion/internal/**/**.go,test/usecases/oruclosedlooprecovery/goversion/**.go
-        # Exclusions
-        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