X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fnonrtric%2Fnonrtric.yaml;h=6eb7e362bc40510522988467971f650392cb39de;hb=07cae68a7774053ed7de460c42c3e75734ec6121;hp=002bf1e2023a09e2150361c5da53f475c5a7f513;hpb=b64afc60c58dfe55b660aba54d61c3b8627b9159;p=ci-management.git diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml index 002bf1e2..6eb7e362 100644 --- a/jjb/nonrtric/nonrtric.yaml +++ b/jjb/nonrtric/nonrtric.yaml @@ -32,42 +32,17 @@ - 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 - -# nonrtric:policy-agent -# Maven artifacts for nonrtric-policy-agent +# 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' + mvn-params: '-f policy-agent/' gerrit_trigger_file_paths: - compare-type: REG_EXP pattern: 'policy-agent/.*' @@ -78,8 +53,6 @@ - gerrit-maven-stage - gerrit-maven-clm stream: - - cherry: - branch: cherry - dawn: branch: dawn @@ -101,33 +74,10 @@ - gerrit-maven-stage - gerrit-maven-clm stream: - - master: - branch: master - - cherry: - branch: cherry - dawn: branch: dawn - -# 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 @@ -147,36 +97,63 @@ - gerrit-maven-stage - gerrit-maven-clm stream: - - cherry: - branch: cherry - dawn: branch: dawn -# nonrtric:r-app-catalogue -# Maven artifacts for r-app-catalogue - project: <<: *nonrtric_jdk_common - name: nonrtric-r-app-catalogue + name: nonrtric-auth-token-fetch project-name: '{name}' - mvn-opts: '-Ddocker.skip=true' - mvn-params: '-f r-app-catalogue' + # image name + 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: '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: 'auth-token-fetch' + # Limit build trigger to appropriate files gerrit_trigger_file_paths: - compare-type: REG_EXP - pattern: 'r-app-catalogue/.*' - build-node: ubuntu1804-builder-4c-4g + pattern: 'auth-token-fetch/.*' + build-node: ubuntu1804-docker-4c-4g + # Includes verify and merge jobs jobs: - - gerrit-maven-verify - - gerrit-maven-merge - - gerrit-maven-stage - - gerrit-maven-clm + - "{project-name}-gerrit-docker-jobs" + - gerrit-go-verify stream: - master: branch: master - - cherry: - branch: cherry - - dawn: - branch: dawn +- project: + <<: *nonrtric_jdk_common + 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-nonrtric-auth-token-fetch-ubuntu.sh + sonar-project-file: "" + java-version: openjdk11 + # use sonarcloud values from defaults.yaml + sonar-properties: !include-raw: sonar-project.properties + jobs: + - gerrit-sonar-prescan-script + +- project: + <<: *nonrtric_jdk_common + name: nonrtric-release + # maven release requires sigul which requires centos + # container release requires docker + build-node: centos7-docker-2c-8g + jobs: + - '{project-name}-gerrit-release-jobs' + +# Usecases - project: <<: *nonrtric_jdk_common name: nonrtric-o-ru-closed-loop-recovery @@ -202,6 +179,8 @@ branch: master - dawn: branch: dawn + - e-release: + branch: e-release - project: <<: *nonrtric_jdk_common @@ -214,7 +193,9 @@ # use host network to clone from our gerrit docker-build-args: '--network=host' # Directory with Dockerfile - docker-root: 'test/usecases/oruclosedlooprecovery/goversion/' + 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 @@ -223,40 +204,12 @@ # Includes verify and merge jobs jobs: - "{project-name}-gerrit-docker-jobs" + - gerrit-go-verify stream: - master: branch: master - -- 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}_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 - jobs: - - gerrit-sonar-prescan-script + - e-release: + branch: e-release - project: <<: *nonrtric_jdk_common @@ -288,25 +241,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 - -- project: - <<: *nonrtric_jdk_common - name: nonrtric-release - # maven release requires sigul which requires centos - # container release requires docker - 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