X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric%2Fnonrtric.yaml;h=415f4176c0be1a09a38f2b0faaeb998176f2d635;hb=9cefbbebc90b55285bae0adaa9d71f1af404282d;hp=220a4db9e00019d4431771ff18e6905d6feff55e;hpb=b297725ef1237dea0df08d29c61926a6f5ba3c8b;p=ci-management.git diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml index 220a4db9..415f4176 100644 --- a/jjb/nonrtric/nonrtric.yaml +++ b/jjb/nonrtric/nonrtric.yaml @@ -38,18 +38,20 @@ branch: cherry - dawn: branch: dawn + - e-release: + branch: e-release -# nonrtric:policy-agent -# Maven artifacts for nonrtric-policy-agent +# nonrtric:a1-policy-management-service/ +# Maven artifacts for nonrtric-a1-policy-management-service/ - project: <<: *nonrtric_jdk_common - name: nonrtric-policy-agent + name: nonrtric-a1-policy-management-service project-name: '{name}' mvn-opts: '-Ddocker.skip=true' - mvn-params: '-f policy-agent' + mvn-params: '-f a1-policy-management-service/' gerrit_trigger_file_paths: - compare-type: REG_EXP - pattern: 'policy-agent/.*' + pattern: 'a1-policy-management-service/.*' build-node: ubuntu1804-builder-4c-4g jobs: - gerrit-maven-verify @@ -59,6 +61,27 @@ stream: - master: branch: master + - e-release: + branch: e-release + +# nonrtric:policy-agent/ +# Maven artifacts for nonrtric-policy-agent/ +- project: + <<: *nonrtric_jdk_common + name: nonrtric-policy-agent + project-name: '{name}' + mvn-opts: '-Ddocker.skip=true' + mvn-params: '-f policy-agent/' + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: 'policy-agent/.*' + build-node: ubuntu1804-builder-4c-4g + jobs: + - gerrit-maven-verify + - gerrit-maven-merge + - gerrit-maven-stage + - gerrit-maven-clm + stream: - cherry: branch: cherry - dawn: @@ -88,6 +111,31 @@ branch: cherry - dawn: branch: dawn + - 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 @@ -107,8 +155,6 @@ - gerrit-maven-stage - gerrit-maven-clm stream: - - master: - branch: master - cherry: branch: cherry - dawn: @@ -138,32 +184,8 @@ branch: cherry - dawn: branch: dawn - -- 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 @@ -177,6 +199,8 @@ docker-build-args: '--network=host' # Directory with Dockerfile docker-root: 'dmaap-mediator-producer' + # Directory where go test should be run + go-root: 'test/usecases/dmaap-mediator-producer' # Limit build trigger to appropriate files gerrit_trigger_file_paths: - compare-type: REG_EXP @@ -185,24 +209,28 @@ # 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-dmaap-mediator-producer-sonar + project-name: nonrtric-dmaap-mediator-producer-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-dmaapmediatorproducer-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}_{project-name} - sonar.projectName={project-name} + sonar.projectKey={sonarcloud_project_organization}_nonrtric-dmaap-mediator-producer sonar.organization={sonarcloud_project_organization} # Encoding sonar.build.sourceEncoding=UTF-8 @@ -211,11 +239,11 @@ # Source sonar.sources=. # Unit tests - sonar.go.coverage.reportPaths=./coverage.txt + 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/internal/**/**_test.go + sonar.exclusions=dmaap-mediator-producer/main.go,dmaap-mediator-producer/mocks/**.go,dmaap-mediator-producer/stub/**.go,dmaap-mediator-producer/internal/**/**_test.go jobs: - gerrit-sonar-prescan-script @@ -231,11 +259,131 @@ - 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}_{project-name}' + 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-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 + 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 +