X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric%2Fnonrtric.yaml;h=e90741b9bce9f45962d70ea4af0cd1e33f7d07b3;hb=906fac627884648153d2af27bfa16cd5001dd1f7;hp=57434c49ade4cd9d3cd43d5da18004269fbd0415;hpb=b628a7fd215eb5a6080342eb585b4e09d24c27b0;p=ci-management.git diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml index 57434c49..e90741b9 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,22 +61,20 @@ stream: - master: branch: master - - cherry: - branch: cherry - - dawn: - branch: dawn + - e-release: + branch: e-release -# nonrtric:sdnc-a1-controller -# Maven artifacts for nonrtric-sdnc-a1-controller +# nonrtric:policy-agent/ +# Maven artifacts for nonrtric-policy-agent/ - project: <<: *nonrtric_jdk_common - name: nonrtric-sdnc-a1-controller + name: nonrtric-policy-agent project-name: '{name}' mvn-opts: '-Ddocker.skip=true' - mvn-params: '-f sdnc-a1-controller/northbound' + mvn-params: '-f policy-agent/' gerrit_trigger_file_paths: - compare-type: REG_EXP - pattern: 'sdnc-a1-controller/northbound/.*' + pattern: 'policy-agent/.*' build-node: ubuntu1804-builder-4c-4g jobs: - gerrit-maven-verify @@ -82,24 +82,22 @@ - gerrit-maven-stage - gerrit-maven-clm stream: - - master: - branch: master - cherry: branch: cherry - dawn: branch: dawn -# nonrtric:enrichment-coordinator-service -# Maven artifacts for nonrtric-enrichment-coordinator-service +# nonrtric:sdnc-a1-controller +# Maven artifacts for nonrtric-sdnc-a1-controller - project: <<: *nonrtric_jdk_common - name: nonrtric-enrichment-coordinator-service + name: nonrtric-sdnc-a1-controller project-name: '{name}' mvn-opts: '-Ddocker.skip=true' - mvn-params: '-f enrichment-coordinator-service' + mvn-params: '-f sdnc-a1-controller/northbound' gerrit_trigger_file_paths: - compare-type: REG_EXP - pattern: 'enrichment-coordinator-service/.*' + pattern: 'sdnc-a1-controller/northbound/.*' build-node: ubuntu1804-builder-4c-4g jobs: - gerrit-maven-verify @@ -113,18 +111,20 @@ branch: cherry - dawn: branch: dawn + - e-release: + branch: e-release -# nonrtric:r-app-catalogue -# Maven artifacts for r-app-catalogue +# nonrtric:enrichment-coordinator-service +# Maven artifacts for nonrtric-enrichment-coordinator-service - project: <<: *nonrtric_jdk_common - name: nonrtric-r-app-catalogue + name: nonrtric-enrichment-coordinator-service project-name: '{name}' mvn-opts: '-Ddocker.skip=true' - mvn-params: '-f r-app-catalogue' + mvn-params: '-f enrichment-coordinator-service' gerrit_trigger_file_paths: - compare-type: REG_EXP - pattern: 'r-app-catalogue/.*' + pattern: 'enrichment-coordinator-service/.*' build-node: ubuntu1804-builder-4c-4g jobs: - gerrit-maven-verify @@ -132,8 +132,6 @@ - gerrit-maven-stage - gerrit-maven-clm stream: - - master: - branch: master - cherry: branch: cherry - dawn: @@ -141,46 +139,87 @@ - project: <<: *nonrtric_jdk_common - name: nonrtric-o-ru-closed-loop-recovery + name: nonrtric-auth-token-fetch project-name: '{name}' # image name - docker-name: 'o-ran-sc/nonrtric-o-ru-closed-loop-recovery' + 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: 'test/usecases/oruclosedlooprecovery/scriptversion/app' + 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: 'test/usecases/oruclosedlooprecovery/scriptversion/app/.*' + pattern: 'auth-token-fetch/.*' build-node: ubuntu1804-docker-4c-4g # Includes verify and merge jobs jobs: - "{project-name}-gerrit-docker-jobs" + - gerrit-go-verify stream: - master: branch: master - - dawn: - branch: dawn - project: <<: *nonrtric_jdk_common - 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-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' + +- 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-dmaap-mediator-producer' + 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: 'dmaap-mediator-producer' + docker-root: 'test/usecases/oruclosedlooprecovery/scriptversion/app' # Limit build trigger to appropriate files gerrit_trigger_file_paths: - compare-type: REG_EXP - pattern: 'dmaap-mediator-producer/.*' + pattern: 'test/usecases/oruclosedlooprecovery/scriptversion/app/.*' build-node: ubuntu1804-docker-4c-4g # Includes verify and merge jobs jobs: @@ -188,6 +227,10 @@ stream: - master: branch: master + - dawn: + branch: dawn + - e-release: + branch: e-release - project: <<: *nonrtric_jdk_common @@ -200,7 +243,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 @@ -209,46 +254,17 @@ # 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: '{name}' - # 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}_{name} - sonar.projectName={project-name} - 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/internal/**/**_test.go - jobs: - - gerrit-sonar-prescan-script + - e-release: + branch: e-release - project: <<: *nonrtric_jdk_common name: nonrtric-o-ru-closed-loop-consumer-sonar - project-name: '{name}' + 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 @@ -259,8 +275,7 @@ sonar-properties: | # Required metadata sonar.login={sonarcloud_api_token} - sonar.projectKey={sonarcloud_project_organization}_{name} - sonar.projectName={project-name} + sonar.projectKey={sonarcloud_project_organization}_nonrtric-o-ru-closed-loop-consumer sonar.organization={sonarcloud_project_organization} # Encoding sonar.build.sourceEncoding=UTF-8 @@ -273,28 +288,6 @@ # 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/simulator/**.go + 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}_{project-name}' - sonarcloud-project-organization: '{sonarcloud_project_organization}' - jobs: - - gerrit-maven-sonar