X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric%2Fnonrtric.yaml;h=827dbdb13b228b90d94e8b091b24aa00a48db8aa;hb=a7f9c4ab7d03930ad4445c1792ea1a9d2302035e;hp=b8965bcfb791506a5b63d8d891cd790d562fd5da;hpb=54cd5491db7f0414f33a55600104f044723cc5dc;p=ci-management.git diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml index b8965bcf..827dbdb1 100644 --- a/jjb/nonrtric/nonrtric.yaml +++ b/jjb/nonrtric/nonrtric.yaml @@ -22,19 +22,10 @@ # maven settings file has docker credentials mvn-settings: nonrtric-settings mvn-version: mvn36 - -- nonrtric_jdk11: &nonrtric_jdk11 - <<: *nonrtric_jdk_common - name: nonrtric-jdk11 java-version: openjdk11 -- nonrtric_jdk8: &nonrtric_jdk8 - <<: *nonrtric_jdk_common - name: nonrtric-jdk8 - java-version: openjdk8 - - project: - <<: *nonrtric_jdk11 + <<: *nonrtric_jdk_common mvn-params: -Dbuild.number=${{BUILD_NUMBER}} jobs: - gerrit-maven-docker-verify @@ -43,11 +34,13 @@ stream: - master: branch: master + - bronze: + branch: bronze # nonrtric:policy-agent # Maven artifacts for nonrtric-policy-agent - project: - <<: *nonrtric_jdk11 + <<: *nonrtric_jdk_common name: nonrtric-policy-agent project-name: '{name}' mvn-opts: '-Ddocker.skip=true' @@ -64,13 +57,16 @@ stream: - master: branch: master + - bronze: + branch: bronze # nonrtric:sdnc-a1-controller # Maven artifacts for nonrtric-sdnc-a1-controller - project: - <<: *nonrtric_jdk8 + <<: *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 @@ -84,11 +80,12 @@ stream: - master: branch: master + - bronze: + branch: bronze - project: - <<: *nonrtric_jdk11 + <<: *nonrtric_jdk_common name: nonrtric-release - branch: master # maven release requires sigul which requires centos # container release requires docker build-node: centos7-docker-2c-8g @@ -96,10 +93,10 @@ - '{project-name}-gerrit-release-jobs' - project: - <<: *nonrtric_jdk11 + <<: *nonrtric_jdk_common name: nonrtric-sonar # template goal install builds docker image unnecessarily - mvn-params: -Ddocker.skip=true + mvn-params: '-Ddocker.skip=true' sonarcloud: true sonarcloud-api-token: '{sonarcloud_api_token}' sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'