From ba9bee2b417123113a6dd550c35d2cfd63339e6c Mon Sep 17 00:00:00 2001 From: elinuxhenrik Date: Tue, 2 Jun 2020 11:53:56 +0200 Subject: [PATCH] Deployment of artifacts nonrtric-sdnc-a1-controller Change-Id: I266fd2e8becf7279a1e8285670fe524c408b0308 Issue-ID: NONRTRIC-230 Signed-off-by: elinuxhenrik --- jjb/nonrtric/nonrtric.yaml | 68 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 55 insertions(+), 13 deletions(-) diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml index d030a591..1d69409a 100644 --- a/jjb/nonrtric/nonrtric.yaml +++ b/jjb/nonrtric/nonrtric.yaml @@ -13,19 +13,26 @@ jobs: - gerrit-info-yaml-verify -- nonrtric_jdk11: &nonrtric_jdk11 - # values apply to all projects here - name: nonrtric-jdk11 +- nonrtric_jdk_common: &nonrtric_jdk_common + name: nonrtric-jdk-common # git repo project: nonrtric # jenkins job name prefix project-name: nonrtric # maven settings file has docker credentials mvn-settings: nonrtric-settings - # defaults.yaml value is NOT used due to value set in lf-maven-jobs.yaml - java-version: openjdk11 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-params: -Dbuild.number=${{BUILD_NUMBER}} @@ -38,21 +45,56 @@ branch: master # nonrtric:policy-agent -# common for artifacts for nonrtric-policy-agent -- nonrtric_policy_agent_common: &nonrtric_policy_agent_common - name: nonrtric-policy-agent-common - project-name: nonrtric-policy-agent +# Maven artifacts for nonrtric-policy-agent +- project: + <<: *nonrtric_jdk11 + 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 -# build feature artifacts for nonrtric-policy-agent +# nonrtric:sdnc-a1-controller-model +# Maven artifacts for nonrtric-sdnc-a1-controller-model - project: - <<: *nonrtric_jdk11 - <<: *nonrtric_policy_agent_common - name: nonrtric-policy-agent + <<: *nonrtric_jdk8 + name: nonrtric-sdnc-a1-controller-model + project-name: '{name}' + mvn-params: '-f sdnc-a1-controller/northbound/nonrt-ric-api/model' + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: 'sdnc-a1-controller/northbound/nonrt-ric-api/model/.*' + build-node: ubuntu1804-builder-4c-4g + jobs: + - gerrit-maven-verify + - gerrit-maven-merge + - gerrit-maven-stage + - gerrit-maven-clm + stream: + - master: + branch: master + +# nonrtric:sdnc-a1-controller-provider +# Maven artifacts for nonrtric-sdnc-a1-controller-provider +- project: + <<: *nonrtric_jdk8 + name: nonrtric-sdnc-a1-controller-provider + project-name: '{name}' + mvn-params: '-f sdnc-a1-controller/northbound/nonrt-ric-api/provider' + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: 'sdnc-a1-controller/northbound/nonrt-ric-api/provider/.*' build-node: ubuntu1804-builder-4c-4g jobs: - gerrit-maven-verify -- 2.16.6