X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric%2Fnonrtric.yaml;h=b54e6ac36d1f59f325910db5a718524abe9b69ee;hb=641ac9c3cb4ee512eccec9c228bb819e0a743025;hp=3e3d9bf38435e38f9972aaa4956d011c5661f7a7;hpb=89931c66b325644fa616bfe2caae7273c3614370;p=ci-management.git diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml index 3e3d9bf3..b54e6ac3 100644 --- a/jjb/nonrtric/nonrtric.yaml +++ b/jjb/nonrtric/nonrtric.yaml @@ -22,177 +22,135 @@ # maven settings file has docker credentials mvn-settings: nonrtric-settings mvn-version: mvn36 - java-version: openjdk11 - -- project: - <<: *nonrtric_jdk_common - mvn-params: -Dbuild.number=${{BUILD_NUMBER}} - jobs: - - gerrit-maven-docker-verify - - gerrit-maven-docker-merge - - gerrit-maven-docker-stage - stream: - - master: - branch: master - - cherry: - branch: cherry - - dawn: - branch: dawn + java-version: openjdk17 -# nonrtric:a1-policy-management-service/ -# Maven artifacts for nonrtric-a1-policy-management-service/ - project: <<: *nonrtric_jdk_common - name: nonrtric-a1-policy-management-service + name: nonrtric-test-kafka-procon project-name: '{name}' - mvn-opts: '-Ddocker.skip=true' - mvn-params: '-f a1-policy-management-service/' + # image name + docker-name: 'kafka-procon' + # 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/kafka-procon' + # use host network to clone from our gerrit + docker-build-args: '--network=host' + # Directory where go test should be run + # Limit build trigger to appropriate files gerrit_trigger_file_paths: - compare-type: REG_EXP - pattern: 'a1-policy-management-service/.*' - build-node: ubuntu1804-builder-4c-4g + pattern: 'test/kafka-procon/.*' + 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" stream: - master: branch: master -# 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 - project: <<: *nonrtric_jdk_common - name: nonrtric-sdnc-a1-controller + name: nonrtric-test-http-https-proxy project-name: '{name}' - mvn-opts: '-Ddocker.skip=true' - mvn-params: '-f sdnc-a1-controller/northbound' + # image name + docker-name: 'http-https-proxy' + # 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/http-https-proxy' + # use host network to clone from our gerrit + docker-build-args: '--network=host' + # Directory where go test should be run + # Limit build trigger to appropriate files gerrit_trigger_file_paths: - compare-type: REG_EXP - pattern: 'sdnc-a1-controller/northbound/.*' - build-node: ubuntu1804-builder-4c-4g + pattern: 'test/http-https-proxy/.*' + 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" 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 + name: nonrtric-test-cr project-name: '{name}' - mvn-opts: '-Ddocker.skip=true' - mvn-params: '-f information-coordinator-service' + # image name + docker-name: 'cr' + # 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/cr' + # use host network to clone from our gerrit + docker-build-args: '--network=host' + # Directory where go test should be run + # Limit build trigger to appropriate files gerrit_trigger_file_paths: - compare-type: REG_EXP - pattern: 'information-coordinator-service/.*' - build-node: ubuntu1804-builder-4c-4g + pattern: 'test/cr/.*' + 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" stream: - master: branch: master -# nonrtric:enrichment-coordinator-service -# Maven artifacts for nonrtric-enrichment-coordinator-service - project: <<: *nonrtric_jdk_common - name: nonrtric-enrichment-coordinator-service + name: nonrtric-test-prodstub project-name: '{name}' - mvn-opts: '-Ddocker.skip=true' - mvn-params: '-f enrichment-coordinator-service' - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: 'enrichment-coordinator-service/.*' - 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:r-app-catalogue -# Maven artifacts for r-app-catalogue -- project: - <<: *nonrtric_jdk_common - name: nonrtric-r-app-catalogue - project-name: '{name}' - mvn-opts: '-Ddocker.skip=true' - mvn-params: '-f r-app-catalogue' + # image name + docker-name: 'prodstub' + # 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/prodstub' + # use host network to clone from our gerrit + docker-build-args: '--network=host' + # Directory where go test should be run + # 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: 'test/prodstub/.*' + 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" stream: - master: branch: master - - cherry: - branch: cherry - - dawn: - branch: dawn - project: <<: *nonrtric_jdk_common - name: nonrtric-o-ru-closed-loop-recovery + name: nonrtric-test-mrstub project-name: '{name}' # image name - docker-name: 'o-ran-sc/nonrtric-o-ru-closed-loop-recovery' + docker-name: 'mrstub' # 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: 'test/mrstub' + # use host network to clone from our gerrit + docker-build-args: '--network=host' + # Directory where go test should be run # Limit build trigger to appropriate files gerrit_trigger_file_paths: - compare-type: REG_EXP - pattern: 'test/usecases/oruclosedlooprecovery/scriptversion/app/.*' + pattern: 'test/mrstub/.*' build-node: ubuntu1804-docker-4c-4g # Includes verify and merge jobs jobs: @@ -200,92 +158,54 @@ stream: - master: branch: master - - dawn: - branch: dawn - project: <<: *nonrtric_jdk_common - name: nonrtric-o-ru-closed-loop-consumer + name: nonrtric-plt-auth-token-fetch project-name: '{name}' # image name - docker-name: 'o-ran-sc/nonrtric-o-ru-closed-loop-consumer' + docker-name: 'o-ran-sc/nonrtric-plt-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/goversion/' + 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/goversion/.*' + 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 + - f-release: + java-version: openjdk11 + branch: f-release + - g-release: + java-version: openjdk11 + branch: g-release - project: <<: *nonrtric_jdk_common - name: nonrtric-dmaap-mediator-producer-sonar - project-name: nonrtric-dmaap-mediator-producer-sonar + name: nonrtric-plt-auth-token-fetch-sonar + project-name: nonrtric-plt-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 - 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 - -- 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 + sonar-properties: !include-raw: sonar-project.properties jobs: - gerrit-sonar-prescan-script @@ -297,16 +217,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