X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric%2Fnonrtric.yaml;h=e90741b9bce9f45962d70ea4af0cd1e33f7d07b3;hb=906fac627884648153d2af27bfa16cd5001dd1f7;hp=6773e1e6d1c0693db477edb9bdffd2a92a52bb29;hpb=38b5fa2557a74d6a66979e5abba78b5838870ded;p=ci-management.git diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml index 6773e1e6..e90741b9 100644 --- a/jjb/nonrtric/nonrtric.yaml +++ b/jjb/nonrtric/nonrtric.yaml @@ -34,20 +34,24 @@ stream: - master: branch: master - - bronze: - branch: bronze + - cherry: + 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 @@ -57,8 +61,31 @@ stream: - master: branch: master - - bronze: - branch: bronze + - 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: + branch: dawn # nonrtric:sdnc-a1-controller # Maven artifacts for nonrtric-sdnc-a1-controller @@ -80,8 +107,12 @@ stream: - master: branch: master - - bronze: - branch: bronze + - cherry: + branch: cherry + - dawn: + branch: dawn + - e-release: + branch: e-release # nonrtric:enrichment-coordinator-service # Maven artifacts for nonrtric-enrichment-coordinator-service @@ -101,30 +132,55 @@ - gerrit-maven-stage - gerrit-maven-clm stream: - - master: - branch: master + - 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 +- 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 @@ -137,11 +193,101 @@ - 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-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