From 54cd5491db7f0414f33a55600104f044723cc5dc Mon Sep 17 00:00:00 2001 From: elinuxhenrik Date: Wed, 3 Jun 2020 14:00:26 +0200 Subject: [PATCH] Change artifacts for nonrtric-sdnc-a1-controller Due to a misunderstanding the wrong jobs where created for the deployment of the nonrtric-sdnc-a1-controller. In this commit that is corrected so that there will only be one job to create all the artifacts needed. Change-Id: I94383c2a7b8872e6d04b62ac8ea7380d979ee331 Issue-ID: NONRTRIC-230 Signed-off-by: elinuxhenrik --- jjb/nonrtric/nonrtric.yaml | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml index 1d69409a..b8965bcf 100644 --- a/jjb/nonrtric/nonrtric.yaml +++ b/jjb/nonrtric/nonrtric.yaml @@ -65,36 +65,16 @@ - master: branch: master -# nonrtric:sdnc-a1-controller-model -# Maven artifacts for nonrtric-sdnc-a1-controller-model +# nonrtric:sdnc-a1-controller +# Maven artifacts for nonrtric-sdnc-a1-controller - project: <<: *nonrtric_jdk8 - name: nonrtric-sdnc-a1-controller-model + name: nonrtric-sdnc-a1-controller project-name: '{name}' - mvn-params: '-f sdnc-a1-controller/northbound/nonrt-ric-api/model' + mvn-params: '-f sdnc-a1-controller/northbound' 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/.*' + pattern: 'sdnc-a1-controller/northbound/.*' build-node: ubuntu1804-builder-4c-4g jobs: - gerrit-maven-verify -- 2.16.6