NONRTRIC: Add jenkins jobs for j-release branches

Issue-ID: NONRTRIC-970
Change-Id: I3a24008655c8a3f03d123c5b77373dbe78ca3e40
Signed-off-by: JohnKeeney <john.keeney@est.tech>

diff --git a/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml b/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml
index fa04d80..5c8787f 100644 (file)
--- a/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml
+++ b/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml
@@ -26,13 +26,12 @@
     stream:
       - master:
           branch: master
-      - g-release:
-          java-version: openjdk11
-          branch: g-release
       - h-release:
           branch: h-release
       - i-release:
           branch: i-release
+      - j-release:
+          branch: j-release
 
 # nonrtric:a1policymanagementservice/
 # Maven artifacts for nonrtric-plt-a1policymanagementservice/
@@ -48,13 +47,12 @@
     stream:
       - master:
           branch: master
-      - g-release:
-          java-version: openjdk11
-          branch: g-release
       - h-release:
           branch: h-release
       - i-release:
           branch: i-release
+      - j-release:
+          branch: j-release
 
 - project:
     <<: *a1policymanagementservice_jdk_common

diff --git a/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml b/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml
index 4becabc..3e18a2b 100644 (file)
--- a/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml
+++ b/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml
@@ -26,13 +26,12 @@
     stream:
       - master:
           branch: master
-      - g-release:
-          java-version: openjdk11
-          branch: g-release
       - h-release:
           branch: h-release
       - i-release:
           branch: i-release
+      - j-release:
+          branch: j-release
 
 # nonrtric:dmaapadapter/
 # Maven artifacts for nonrtric-plt-dmaapadapter/
@@ -48,13 +47,12 @@
     stream:
       - master:
           branch: master
-      - g-release:
-          java-version: openjdk11
-          branch: g-release
       - h-release:
           branch: h-release
       - i-release:
           branch: i-release
+      - j-release:
+          branch: j-release
 
 - project:
     <<: *dmaapadapter_jdk_common

diff --git a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml
index 20b0b54..3e9e2fc 100644 (file)
--- a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml
+++ b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml
@@ -27,13 +27,12 @@
     stream:
       - master:
           branch: master
-      - g-release:
-          java-version: openjdk11
-          branch: g-release
       - h-release:
           branch: h-release
       - i-release:
           branch: i-release
+      - j-release:
+          branch: j-release
 
 # nonrtric:informationcoordinatorservice
 # Maven artifacts for nonrtric-plt-informationcoordinatorservice
@@ -49,13 +48,12 @@
     stream:
       - master:
           branch: master
-      - g-release:
-          java-version: openjdk11
-          branch: g-release
       - h-release:
           branch: h-release
       - i-release:
           branch: i-release
+      - j-release:
+          branch: j-release
 
 - project:
     <<: *informationcoordinatorservice_jdk_common

diff --git a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
index 04b1ee2..bb932e6 100644 (file)
--- a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
+++ b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
@@ -84,12 +84,12 @@
       - compare-type: REG_EXP
         pattern: "catalogue-enhanced/.*"
     stream:
-      - g-release:
-          branch: g-release
       - h-release:
           branch: h-release
       - i-release:
           branch: i-release
+      - j-release:
+          branch: j-release
     jobs:
       - gerrit-tox-verify
 
@@ -113,11 +113,11 @@
     stream:
       - master:
           branch: master
-      - g-release:
-          branch: g-release
       - h-release:
           branch: h-release
       - i-release:
           branch: i-release
+      - j-release:
+          branch: j-release
     jobs:
       - "{project-name}-gerrit-docker-jobs"

diff --git a/jjb/nonrtric-plt-rappmanager/nonrtric-plt-rappmanager.yaml b/jjb/nonrtric-plt-rappmanager/nonrtric-plt-rappmanager.yaml
index dfdced6..7f32f68 100644 (file)
--- a/jjb/nonrtric-plt-rappmanager/nonrtric-plt-rappmanager.yaml
+++ b/jjb/nonrtric-plt-rappmanager/nonrtric-plt-rappmanager.yaml
@@ -38,6 +38,8 @@
           branch: master
       - i-release:
           branch: i-release
+      - j-release:
+          branch: j-release
 
 # nonrtric:rappmanager/
 # Maven artifacts for nonrtric-plt-rappmanager/
@@ -55,6 +57,8 @@
           branch: master
       - i-release:
           branch: i-release
+      - j-release:
+          branch: j-release
 
 - project:
     <<: *rappmanager_jdk_common
@@ -107,6 +111,8 @@
           branch: master
       - i-release:
           branch: i-release
+      - j-release:
+          branch: j-release
 
 # nonrtric:rappmanager/
 # Maven artifacts for nonrtric-plt-rappmanager/
@@ -124,6 +130,8 @@
           branch: master
       - i-release:
           branch: i-release
+      - j-release:
+          branch: j-release
 
 - project:
     <<: *acm_participants_jdk_common

diff --git a/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml b/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
index 05f77b6..649e4c2 100644 (file)
--- a/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
+++ b/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
@@ -54,12 +54,12 @@
     stream:
       - master:
           branch: master
-      - g-release:
-          branch: g-release
       - h-release:
           branch: h-release
       - i-release:
           branch: i-release
+      - j-release:
+          branch: j-release
 
 - project:
     <<: *nonrtric_plt_sme_common
@@ -88,6 +88,8 @@
     stream:
       - master:
           branch: master
+      - j-release:
+          branch: j-release
 
 - project:
     <<: *nonrtric_plt_sme_common

diff --git a/jjb/sim-a1-interface/sim-a1-interface.yaml b/jjb/sim-a1-interface/sim-a1-interface.yaml
index f534aa3..588f5f2 100644 (file)
--- a/jjb/sim-a1-interface/sim-a1-interface.yaml
+++ b/jjb/sim-a1-interface/sim-a1-interface.yaml
@@ -30,12 +30,12 @@
     stream:
       - master:
           branch: master
-      - g-release:
-          branch: g-release
       - h-release:
           branch: h-release
       - i-release:
           branch: i-release
+      - j-release:
+          branch: j-release
     jobs:
       - "{project-name}-gerrit-docker-jobs"
 
@@ -72,3 +72,5 @@
           branch: h-release
       - i-release:
           branch: i-release
+      - j-release:
+          branch: j-release

diff --git a/jjb/smo-teiv/smo-teiv.yaml b/jjb/smo-teiv/smo-teiv.yaml
index bdec07a..2d2fbb4 100644 (file)
--- a/jjb/smo-teiv/smo-teiv.yaml
+++ b/jjb/smo-teiv/smo-teiv.yaml
@@ -36,6 +36,8 @@
     stream:
       - master:
           branch: master
+      - j-release:
+          branch: j-release
 
 # smo:teiv/
 # Maven artifacts for smo-teiv/
@@ -55,6 +57,8 @@
     stream:
       - master:
           branch: master
+      - j-release:
+          branch: j-release
 
 - project:
     <<: *smo_teiv_jdk_common