X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric%2Fnonrtric.yaml;h=b81b607ba9fe96e47d28ea2631adc25896c713d1;hb=e93852be15782ed4e29c66bca0529a6be85ca450;hp=c7a0b7ae78c87904912156e48c943f74531be6fc;hpb=33de58a8f35a3b1ee7e9c84c0a693d9bf3df3721;p=ci-management.git diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml index c7a0b7ae..b81b607b 100644 --- a/jjb/nonrtric/nonrtric.yaml +++ b/jjb/nonrtric/nonrtric.yaml @@ -32,21 +32,17 @@ - gerrit-maven-docker-merge - gerrit-maven-docker-stage stream: - - master: - branch: master - - cherry: - branch: cherry - - dawn: - branch: dawn + - e-release: + branch: e-release -# nonrtric:policy-agent -# Maven artifacts for nonrtric-policy-agent +# 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' + mvn-params: '-f policy-agent/' gerrit_trigger_file_paths: - compare-type: REG_EXP pattern: 'policy-agent/.*' @@ -57,10 +53,6 @@ - gerrit-maven-stage - gerrit-maven-clm stream: - - master: - branch: master - - cherry: - branch: cherry - dawn: branch: dawn @@ -82,12 +74,10 @@ - gerrit-maven-stage - gerrit-maven-clm stream: - - master: - branch: master - - cherry: - branch: cherry - dawn: branch: dawn + - e-release: + branch: e-release # nonrtric:enrichment-coordinator-service # Maven artifacts for nonrtric-enrichment-coordinator-service @@ -107,173 +97,52 @@ - 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 - project-name: '{name}' - mvn-opts: '-Ddocker.skip=true' - mvn-params: '-f r-app-catalogue' - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: 'r-app-catalogue/.*' - 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 - -- 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 - project: <<: *nonrtric_jdk_common - name: nonrtric-dmaap-mediator-producer + name: nonrtric-plt-auth-token-fetch project-name: '{name}' # image name - docker-name: 'o-ran-sc/nonrtric-dmaap-mediator-producer' + 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: 'dmaap-mediator-producer' - # Limit build trigger to appropriate files - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: 'dmaap-mediator-producer/.*' - build-node: ubuntu1804-docker-4c-4g - # Includes verify and merge jobs - jobs: - - "{project-name}-gerrit-docker-jobs" - stream: - - master: - branch: master - -- 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 + docker-root: 'auth-token-fetch' # 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: '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: + branch: f-release - project: <<: *nonrtric_jdk_common - name: nonrtric-dmaap-mediator-producer-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-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}_{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}' - # 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}_{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 - # Exclusions - sonar.exclusions=test/usecases/oruclosedlooprecovery/goversion/main.go,test/usecases/oruclosedlooprecovery/goversion/mocks/**.go,test/usecases/oruclosedlooprecovery/goversion/internal/**/**_test.go + sonar-properties: !include-raw: sonar-project.properties jobs: - gerrit-sonar-prescan-script @@ -285,16 +154,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}_{project-name}' - sonarcloud-project-organization: '{sonarcloud_project_organization}' - jobs: - - gerrit-maven-sonar