From ff67ef548e7b964aa67b6c0de93f08f4ce0e6161 Mon Sep 17 00:00:00 2001 From: elinuxhenrik Date: Fri, 8 Apr 2022 08:40:57 +0200 Subject: [PATCH] Fix jobs for nonrtric products Bring back the Maven merge jobs after fix of the grupId to match the new product names for nonrtric-plt-a1policymanagementservice and nonrtric-plt-informationcoordinatorservice. Remove the Maven merge job for nonrtric-plt-sdnca1controller. Remove the Maven verify job for nonrtric-plt-rappcatalogue, since the docker verify job is enough. Bring back docker jobs for the E relese branch for the nonrtric repo. Issue-ID: NONRTRIC-718 Signed-off-by: elinuxhenrik Change-Id: Ie6f26bcdb9b54a6f494b580f5b2040caea689543 --- .../nonrtric-plt-a1policymanagementservice.yaml | 1 + .../nonrtric-plt-informationcoordinatorservice.yaml | 1 + .../nonrtric-plt-rappcatalogue.yaml | 1 - .../nonrtric-plt-sdnca1controller.yaml | 2 -- jjb/nonrtric/nonrtric.yaml | 11 +++++++++++ 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml b/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml index 1d3634f0..63fba76f 100644 --- a/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml +++ b/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml @@ -44,6 +44,7 @@ mvn-opts: '-Ddocker.skip=true' build-node: ubuntu1804-builder-4c-4g jobs: + - gerrit-maven-merge - gerrit-maven-stage - gerrit-maven-clm stream: diff --git a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml index 6b09c64c..3d4283eb 100644 --- a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml +++ b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml @@ -44,6 +44,7 @@ mvn-opts: '-Ddocker.skip=true' build-node: ubuntu1804-builder-4c-4g jobs: + - gerrit-maven-merge - gerrit-maven-stage - gerrit-maven-clm stream: diff --git a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml index 2360e339..3e57201c 100644 --- a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml +++ b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml @@ -44,7 +44,6 @@ mvn-opts: '-Ddocker.skip=true' build-node: ubuntu1804-builder-4c-4g jobs: - - gerrit-maven-verify - gerrit-maven-merge - gerrit-maven-stage - gerrit-maven-clm diff --git a/jjb/nonrtric-plt-sdnca1controller/nonrtric-plt-sdnca1controller.yaml b/jjb/nonrtric-plt-sdnca1controller/nonrtric-plt-sdnca1controller.yaml index d6222c79..f5126958 100644 --- a/jjb/nonrtric-plt-sdnca1controller/nonrtric-plt-sdnca1controller.yaml +++ b/jjb/nonrtric-plt-sdnca1controller/nonrtric-plt-sdnca1controller.yaml @@ -44,8 +44,6 @@ mvn-opts: '-Ddocker.skip=true' build-node: ubuntu1804-builder-4c-4g jobs: - - gerrit-maven-verify - - gerrit-maven-merge - gerrit-maven-stage - gerrit-maven-clm stream: diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml index 77512fef..6eb7e362 100644 --- a/jjb/nonrtric/nonrtric.yaml +++ b/jjb/nonrtric/nonrtric.yaml @@ -24,6 +24,17 @@ mvn-version: mvn36 java-version: openjdk11 +- project: + <<: *nonrtric_jdk_common + mvn-params: -Dbuild.number=${{BUILD_NUMBER}} + jobs: + - gerrit-maven-docker-verify + - gerrit-maven-docker-merge + - gerrit-maven-docker-stage + stream: + - e-release: + branch: e-release + # nonrtric:policy-agent/ # Maven artifacts for nonrtric-policy-agent/ - project: -- 2.16.6