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 <henrik.b.andersson@est.tech>
Change-Id: Ie6f26bcdb9b54a6f494b580f5b2040caea689543

diff --git a/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml b/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml
index 1d3634f..63fba76 100644 (file)
--- 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 6b09c64..3d4283e 100644 (file)
--- 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 2360e33..3e57201 100644 (file)
--- 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 d6222c7..f512695 100644 (file)
--- 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 77512fe..6eb7e36 100644 (file)
--- 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: