X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric%2Fnonrtric.yaml;h=460693599f50d60082dcbaea116a6feb6db20575;hb=e2d64fba911cad748127778e3101ef2237bc70a8;hp=d17a9b53abe5970bb7470592109457679e31809c;hpb=fd14732ba31051f8ffdc39f36998e4affdae8652;p=ci-management.git diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml index d17a9b53..46069359 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,38 +74,11 @@ - 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 -- 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: @@ -155,29 +97,29 @@ - gerrit-maven-stage - gerrit-maven-clm stream: - - cherry: - branch: cherry - dawn: branch: dawn - 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 +128,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 @@ -212,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