X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric%2Fnonrtric.yaml;h=718c0f634974d7075a595e372ee3730b155baaae;hb=ec0ede761b79e4971f92c567a79b4c5151efab8d;hp=7b22e9d8233faff8667b2ccfa8b841663cfca2a8;hpb=0e41f019e4269add97ea8a2b9ea14838f5645f12;p=ci-management.git diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml index 7b22e9d8..718c0f63 100644 --- a/jjb/nonrtric/nonrtric.yaml +++ b/jjb/nonrtric/nonrtric.yaml @@ -13,7 +13,7 @@ jobs: - gerrit-info-yaml-verify -- nonrtric_jdk_common: &nonrtric_jdk_common +- _nonrtric_jdk_common: &nonrtric_jdk_common name: nonrtric-jdk-common # git repo project: nonrtric @@ -22,232 +22,125 @@ # maven settings file has docker credentials mvn-settings: nonrtric-settings mvn-version: mvn36 - java-version: openjdk11 + java-version: openjdk17 -# nonrtric:policy-agent -# Docker image for nonrtric-policy-agent - project: <<: *nonrtric_jdk_common - name: nonrtric-policy-agent-docker - project-name: '{name}' - mvn-params: '-f policy-agent/pom.xml -Dbuild.number=${{BUILD_NUMBER}}' - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: 'policy-agent/.*' - jobs: - - gerrit-maven-docker-verify - - gerrit-maven-docker-merge - - gerrit-maven-docker-stage - stream: - - master: - branch: master - - cherry: - branch: cherry - - dawn: - branch: dawn - -# 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: - - master: - branch: master - - cherry: - branch: cherry - - dawn: - branch: dawn - -# nonrtric:sdnc-a1-controller -# Docker image for nonrtric-sdnc-a1-controller -- project: - <<: *nonrtric_jdk_common - name: nonrtric-sdnc-a1-controller-docker - project-name: '{name}' - mvn-params: '-f sdnc-a1-controller/pom.xml -Dbuild.number=${{BUILD_NUMBER}}' - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: 'sdnc-a1-controller/.*' - jobs: - - gerrit-maven-docker-verify - - gerrit-maven-docker-merge - - gerrit-maven-docker-stage - stream: - - master: - branch: master - - 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 - project-name: '{name}' - mvn-opts: '-Ddocker.skip=true' - mvn-params: '-f sdnc-a1-controller/northbound' - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: 'sdnc-a1-controller/northbound/.*' - build-node: ubuntu1804-builder-4c-4g - jobs: - - gerrit-maven-verify - - gerrit-maven-merge - - gerrit-maven-stage - - gerrit-maven-clm - stream: - - master: - branch: master - - cherry: - branch: cherry - - dawn: - branch: dawn - -# nonrtric:enrichment-coordinator-service -# Docker image for nonrtric-enrichment-coordinator-service -- project: - <<: *nonrtric_jdk_common - name: nonrtric-enrichment-coordinator-service-docker - project-name: '{name}' - mvn-params: '-f enrichment-coordinator-service/pom.xml -Dbuild.number=${{BUILD_NUMBER}}' - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: 'enrichment-coordinator-service/.*' - jobs: - - gerrit-maven-docker-verify - - gerrit-maven-docker-merge - - gerrit-maven-docker-stage - stream: - - master: - branch: master - - cherry: - branch: cherry - - dawn: - branch: dawn - -# nonrtric:enrichment-coordinator-service -# Maven artifacts for nonrtric-enrichment-coordinator-service -- project: - <<: *nonrtric_jdk_common - name: nonrtric-enrichment-coordinator-service - project-name: '{name}' - mvn-opts: '-Ddocker.skip=true' - mvn-params: '-f enrichment-coordinator-service' + name: nonrtric-test-kafka-procon + project-name: "{name}" + # 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" + # Directory where go test should be run + # Limit build trigger to appropriate files gerrit_trigger_file_paths: - compare-type: REG_EXP - pattern: 'enrichment-coordinator-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 - - cherry: - branch: cherry - - dawn: - branch: dawn -# nonrtric:r-app-catalogue -# Docker image for nonrtric-r-app-catalogue - project: <<: *nonrtric_jdk_common - name: nonrtric-r-app-catalogue-docker - project-name: '{name}' - mvn-params: '-f r-app-catalogue/pom.xml -Dbuild.number=${{BUILD_NUMBER}}' + name: nonrtric-test-http-https-proxy + project-name: "{name}" + # 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" + # 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/.*' + pattern: "test/http-https-proxy/.*" + build-node: ubuntu1804-docker-4c-4g + # Includes verify and merge jobs jobs: - - gerrit-maven-docker-verify - - gerrit-maven-docker-merge - - gerrit-maven-docker-stage + - "{project-name}-gerrit-docker-jobs" 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 - project-name: '{name}' - mvn-opts: '-Ddocker.skip=true' - mvn-params: '-f r-app-catalogue' + name: nonrtric-test-cr + project-name: "{name}" + # 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" + # 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/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 - - cherry: - branch: cherry - - dawn: - branch: dawn -# nonrtric:helm-manager -# Docker image for nonrtric-helm-manager - project: <<: *nonrtric_jdk_common - name: nonrtric-helm-manager-docker - project-name: '{name}' - mvn-params: '-f helm-manager/pom.xml -Dbuild.number=${{BUILD_NUMBER}}' + name: nonrtric-test-prodstub + project-name: "{name}" + # 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" + # Directory where go test should be run + # Limit build trigger to appropriate files gerrit_trigger_file_paths: - compare-type: REG_EXP - pattern: 'helm-manager/.*' + pattern: "test/prodstub/.*" + build-node: ubuntu1804-docker-4c-4g + # Includes verify and merge jobs jobs: - - gerrit-maven-docker-verify - - gerrit-maven-docker-merge - - gerrit-maven-docker-stage + - "{project-name}-gerrit-docker-jobs" stream: - master: branch: master - - dawn: - branch: dawn - project: <<: *nonrtric_jdk_common - name: nonrtric-o-ru-closed-loop-recovery - project-name: '{name}' + name: nonrtric-test-servicestub + project-name: "{name}" # image name - docker-name: 'o-ran-sc/nonrtric-o-ru-closed-loop-recovery' + docker-name: "servicestub" # get tag from YAML container-tag-method: yaml-file # use host network to clone from our gerrit - docker-build-args: '--network=host' + docker-build-args: "--network=host" # Directory with Dockerfile - docker-root: 'test/usecases/oruclosedlooprecovery/scriptversion/app' + docker-root: "test/servicestub" + # 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/servicestub/.*" build-node: ubuntu1804-docker-4c-4g # Includes verify and merge jobs jobs: @@ -255,25 +148,24 @@ stream: - master: branch: master - - dawn: - branch: dawn - project: <<: *nonrtric_jdk_common - name: nonrtric-dmaap-mediator-producer - project-name: '{name}' + name: nonrtric-test-mrstub + project-name: "{name}" # image name - docker-name: 'o-ran-sc/nonrtric-dmaap-mediator-producer' + 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' + docker-build-args: "--network=host" # Directory with Dockerfile - docker-root: 'dmaap-mediator-producer' + docker-root: "test/mrstub" + # Directory where go test should be run # Limit build trigger to appropriate files gerrit_trigger_file_paths: - compare-type: REG_EXP - pattern: 'dmaap-mediator-producer/.*' + pattern: "test/mrstub/.*" build-node: ubuntu1804-docker-4c-4g # Includes verify and merge jobs jobs: @@ -284,89 +176,48 @@ - project: <<: *nonrtric_jdk_common - name: nonrtric-o-ru-closed-loop-consumer - project-name: '{name}' + 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' + docker-build-args: "--network=host" # Directory with Dockerfile - docker-root: 'test/usecases/oruclosedlooprecovery/goversion/' + docker-root: "auth-token-fetch" + # 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 + - g-release: + java-version: openjdk11 + branch: g-release + - h-release: + branch: h-release - 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 - -- project: - <<: *nonrtric_jdk_common - name: nonrtric-o-ru-closed-loop-consumer-sonar - project-name: '{name}' + 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-oruclosedloopconsumer-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}_{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=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/simulator/**.go + sonar-properties: !include-raw-escape: sonar-project.properties jobs: - gerrit-sonar-prescan-script @@ -377,17 +228,4 @@ # 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 + - "{project-name}-gerrit-release-jobs"