X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric%2Fnonrtric.yaml;h=285faff9aeb3a8616bb74bb8fec4ea9801a54ae4;hb=a7fbd14ea49c453ead41af57020ebf966b547a19;hp=77512fefc4913d51821339d45bf5c4d95c143b75;hpb=a8e3b8d418438120a9d9aa7cae8341286f89d0da;p=ci-management.git diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml index 77512fef..285faff9 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,143 +22,125 @@ # maven settings file has docker credentials mvn-settings: nonrtric-settings mvn-version: mvn36 - java-version: openjdk11 + java-version: openjdk17 -# 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/' + 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: 'policy-agent/.*' - 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: - - dawn: - branch: dawn + - master: + branch: master -# 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' + 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: '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: - - dawn: - branch: dawn - - e-release: - branch: e-release + - master: + branch: master -# 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-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: 'enrichment-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: - - dawn: - branch: dawn + - master: + branch: master - project: <<: *nonrtric_jdk_common - name: nonrtric-auth-token-fetch - project-name: '{name}' + name: nonrtric-test-prodstub + project-name: "{name}" # image name - docker-name: 'o-ran-sc/nonrtric-auth-token-fetch' + 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' + 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' + docker-root: "test/prodstub" # 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: 'auth-token-fetch/.*' + pattern: "test/prodstub/.*" build-node: ubuntu1804-docker-4c-4g # Includes verify and merge jobs jobs: - "{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 - # 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 - project-name: '{name}' + 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' + docker-build-args: "--network=host" # Directory with Dockerfile - docker-root: 'test/usecases/oruclosedlooprecovery/scriptversion/app' + 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: 'test/usecases/oruclosedlooprecovery/scriptversion/app/.*' + pattern: "test/mrstub/.*" build-node: ubuntu1804-docker-4c-4g # Includes verify and merge jobs jobs: @@ -166,29 +148,25 @@ 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}' + 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: 'test/usecases/oruclosedlooprecovery/goversion' + 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: @@ -197,36 +175,33 @@ stream: - master: branch: master - - e-release: - branch: e-release + - f-release: + java-version: openjdk11 + branch: f-release + - g-release: + java-version: openjdk11 + branch: g-release - project: <<: *nonrtric_jdk_common - name: nonrtric-o-ru-closed-loop-consumer-sonar - project-name: nonrtric-o-ru-closed-loop-consumer-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-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}_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-escape: 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"