Add jenkins jobs for l-release branches & remove some old jobs

Issue-ID: NONRTRIC-1072
Change-Id: Ifa78fadc74a47a55eea3f52aa1677af1dbe823c2
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 d4ced21..d005142 100644 (file)
--- a/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml
+++ b/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml
@@ -28,13 +28,12 @@
     stream:
       - master:
           branch: master
-      - i-release:
-          branch: i-release
-          mvn-version: mvn36
       - j-release:
           branch: j-release
       - k-release:
           branch: k-release
+      - l-release:
+          branch: l-release
 
 - project:
     <<: *a1policymanagementservice_jdk_common
@@ -46,13 +45,12 @@
     stream:
       - master:
           branch: master
-      - i-release:
-          branch: i-release
-          mvn-version: mvn36
       - j-release:
           branch: j-release
       - k-release:
           branch: k-release
+      - l-release:
+          branch: l-release
 
 - project:
     <<: *a1policymanagementservice_jdk_common
@@ -67,6 +65,10 @@
           branch: master
       - j-release:
           branch: j-release
+      - k-release:
+          branch: k-release
+      - l-release:
+          branch: l-release
 
 - project:
     <<: *a1policymanagementservice_jdk_common

diff --git a/jjb/nonrtric-plt-rappmanager/nonrtric-plt-rappmanager.yaml b/jjb/nonrtric-plt-rappmanager/nonrtric-plt-rappmanager.yaml
index c71894f..6cde252 100644 (file)
--- a/jjb/nonrtric-plt-rappmanager/nonrtric-plt-rappmanager.yaml
+++ b/jjb/nonrtric-plt-rappmanager/nonrtric-plt-rappmanager.yaml
@@ -36,10 +36,12 @@
     stream:
       - master:
           branch: master
-      - i-release:
-          branch: i-release
       - j-release:
           branch: j-release
+      - k-release:
+          branch: k-release
+      - l-release:
+          branch: l-release
 
 # nonrtric:rappmanager/
 # Maven artifacts for nonrtric-plt-rappmanager/
@@ -58,10 +60,12 @@
     stream:
       - master:
           branch: master
-      - i-release:
-          branch: i-release
       - j-release:
           branch: j-release
+      - k-release:
+          branch: k-release
+      - l-release:
+          branch: l-release
 
 - project:
     <<: *rappmanager_jdk_common
@@ -112,10 +116,12 @@
     stream:
       - master:
           branch: master
-      - i-release:
-          branch: i-release
       - j-release:
           branch: j-release
+      - k-release:
+          branch: k-release
+      - l-release:
+          branch: l-release
 
 # nonrtric:rappmanager/
 # Maven artifacts for nonrtric-plt-rappmanager/
@@ -133,10 +139,12 @@
     stream:
       - master:
           branch: master
-      - i-release:
-          branch: i-release
       - j-release:
           branch: j-release
+      - k-release:
+          branch: k-release
+      - l-release:
+          branch: l-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 649e4c2..9baa219 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
-      - h-release:
-          branch: h-release
-      - i-release:
-          branch: i-release
       - j-release:
           branch: j-release
+      - k-release:
+          branch: k-release
+      - l-release:
+          branch: l-release
 
 - project:
     <<: *nonrtric_plt_sme_common
@@ -90,6 +90,10 @@
           branch: master
       - j-release:
           branch: j-release
+      - k-release:
+          branch: k-release
+      - l-release:
+          branch: l-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 588f5f2..4602f26 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
-      - h-release:
-          branch: h-release
-      - i-release:
-          branch: i-release
       - j-release:
           branch: j-release
+      - k-release:
+          branch: k-release
+      - l-release:
+          branch: l-release
     jobs:
       - "{project-name}-gerrit-docker-jobs"
 
@@ -68,9 +68,9 @@
     stream:
       - master:
           branch: master
-      - h-release:
-          branch: h-release
-      - i-release:
-          branch: i-release
       - j-release:
           branch: j-release
+      - k-release:
+          branch: k-release
+      - l-release:
+          branch: l-release

diff --git a/jjb/smo-teiv/smo-teiv.yaml b/jjb/smo-teiv/smo-teiv.yaml
index 5e181a4..2de18ec 100644 (file)
--- a/jjb/smo-teiv/smo-teiv.yaml
+++ b/jjb/smo-teiv/smo-teiv.yaml
@@ -41,6 +41,8 @@
           branch: j-release
       - k-release:
           branch: k-release
+      - l-release:
+          branch: l-release
 
 # smo:teiv/
 # Maven artifacts for smo-teiv/
@@ -64,6 +66,8 @@
           branch: j-release
       - k-release:
           branch: k-release
+      - l-release:
+          branch: l-release
 
 - project:
     <<: *smo_teiv_jdk_common