X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric%2Fnonrtric.yaml;h=b7348dfb3705a8a618958a98168fe07568bbb651;hb=831efc99cc04bdc47ee8ea40985a2102b23cf2f4;hp=3dec5a44c79fadda6036d955e4f7d72beae6a659;hpb=80824319092ed0dba3cf11ae3b0ad8294aec8054;p=ci-management.git diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml index 3dec5a44..b7348dfb 100644 --- a/jjb/nonrtric/nonrtric.yaml +++ b/jjb/nonrtric/nonrtric.yaml @@ -22,20 +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 - mvn-opts: -Dexec.skip=true + <<: *nonrtric_jdk_common mvn-params: -Dbuild.number=${{BUILD_NUMBER}} jobs: - gerrit-maven-docker-verify: @@ -49,7 +39,7 @@ # 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 -Dexec.skip=true' @@ -66,11 +56,13 @@ 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 -Dexec.skip=true' @@ -87,11 +79,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 @@ -99,7 +92,7 @@ - '{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 -Dexec.skip=true'