Merge "updating the ric-plt-xapp-frame-cpp job"

diff --git a/jjb/ci-management/ci-packer.yaml b/jjb/ci-management/ci-packer.yaml
index 5e2488e..6ed5505 100644 (file)
--- a/jjb/ci-management/ci-packer.yaml
+++ b/jjb/ci-management/ci-packer.yaml
@@ -46,3 +46,27 @@
       - centos-cs-9
       - ubuntu-18.04
       - ubuntu-20.04
+
+- project:
+    name: packer-devstack-jobs
+    jobs:
+      - gerrit-packer-merge
+
+    <<: *ci_packer_common
+
+    templates: devstack
+    platforms:
+      - centos-cs-8
+      - centos-cs-9
+
+- project:
+    name: packer-devstack-pre-pip-yoga-jobs
+    jobs:
+      - gerrit-packer-merge
+
+    <<: *ci_packer_common
+
+    templates: devstack-pre-pip-yoga
+    platforms:
+      - centos-cs-8
+      - centos-cs-9

diff --git a/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml b/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml
index 5e9e936..14caea3 100644 (file)
--- a/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml
+++ b/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml
@@ -34,12 +34,11 @@
     stream:
       - master:
           branch: master
-      - f-release:
-          java-version: openjdk11
-          branch: f-release
       - g-release:
           java-version: openjdk11
           branch: g-release
+      - h-release:
+          branch: h-release
 
 # nonrtric:a1policymanagementservice/
 # Maven artifacts for nonrtric-plt-a1policymanagementservice/
@@ -55,12 +54,11 @@
     stream:
       - master:
           branch: master
-      - f-release:
-          java-version: openjdk11
-          branch: f-release
       - g-release:
           java-version: openjdk11
           branch: g-release
+      - h-release:
+          branch: h-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 71b8f81..83a0d0b 100644 (file)
--- a/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml
+++ b/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml
@@ -34,12 +34,11 @@
     stream:
       - master:
           branch: master
-      - f-release:
-          java-version: openjdk11
-          branch: f-release
       - g-release:
           java-version: openjdk11
           branch: g-release
+      - h-release:
+          branch: h-release
 
 # nonrtric:dmaapadapter/
 # Maven artifacts for nonrtric-plt-dmaapadapter/
@@ -55,12 +54,11 @@
     stream:
       - master:
           branch: master
-      - f-release:
-          java-version: openjdk11
-          branch: f-release
       - g-release:
           java-version: openjdk11
           branch: g-release
+      - h-release:
+          branch: h-release
 
 - project:
     <<: *dmaapadapter_jdk_common

diff --git a/jjb/nonrtric-plt-dmaapmediatorproducer/nonrtric-plt-dmaapmediatorproducer.yaml b/jjb/nonrtric-plt-dmaapmediatorproducer/nonrtric-plt-dmaapmediatorproducer.yaml
index 3335540..91a3cc3 100644 (file)
--- a/jjb/nonrtric-plt-dmaapmediatorproducer/nonrtric-plt-dmaapmediatorproducer.yaml
+++ b/jjb/nonrtric-plt-dmaapmediatorproducer/nonrtric-plt-dmaapmediatorproducer.yaml
@@ -53,10 +53,10 @@
     stream:
       - master:
           branch: master
-      - f-release:
-          branch: f-release
       - g-release:
           branch: g-release
+      - h-release:
+          branch: h-release
 
 - project:
     <<: *dmaapmediatorproducer_common

diff --git a/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml b/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml
index d3fccb1..966eaae 100644 (file)
--- a/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml
+++ b/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml
@@ -35,11 +35,14 @@
       - master:
           branch: master
       - f-release:
+          # keep f release jobs for now since that is the last release
           java-version: openjdk11
           branch: f-release
       - g-release:
           java-version: openjdk11
           branch: g-release
+      - h-release:
+          branch: h-release
 
 # nonrtric:helmmanager
 # Maven artifacts for helmmanager
@@ -56,11 +59,14 @@
       - master:
           branch: master
       - f-release:
+          # keep f release jobs for now since that is the last release
           java-version: openjdk11
           branch: f-release
       - g-release:
           java-version: openjdk11
           branch: g-release
+      - h-release:
+          branch: h-release
 
 - project:
     <<: *helmmanager_jdk_common

diff --git a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml
index 94fb15d..a03f5b6 100644 (file)
--- a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml
+++ b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml
@@ -35,12 +35,11 @@
     stream:
       - master:
           branch: master
-      - f-release:
-          java-version: openjdk11
-          branch: f-release
       - g-release:
           java-version: openjdk11
           branch: g-release
+      - h-release:
+          branch: h-release
 
 # nonrtric:informationcoordinatorservice
 # Maven artifacts for nonrtric-plt-informationcoordinatorservice
@@ -56,12 +55,11 @@
     stream:
       - master:
           branch: master
-      - f-release:
-          java-version: openjdk11
-          branch: f-release
       - g-release:
           java-version: openjdk11
           branch: g-release
+      - h-release:
+          branch: h-release
 
 - project:
     <<: *informationcoordinatorservice_jdk_common

diff --git a/jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml b/jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml
index 7e52fbd..5fb7a80 100644 (file)
--- a/jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml
+++ b/jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml
@@ -54,6 +54,8 @@
     stream:
       - master:
           branch: master
+      - h-release:
+          branch: h-release
 
 # Jobs for nonrtric-plt-ranpm-pmproducer
 - project:
@@ -74,6 +76,8 @@
     stream:
       - master:
           branch: master
+      - h-release:
+          branch: h-release
 
 # Jobs for nonrtric-plt-ranpm-influxlogger
 - project:
@@ -94,6 +98,8 @@
     stream:
       - master:
           branch: master
+      - h-release:
+          branch: h-release
 
 - project:
     <<: *nonrtric_plt_ranpm_jdk_common
@@ -120,3 +126,5 @@
     stream:
       - master:
           branch: master
+      - h-release:
+          branch: h-release

diff --git a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
index 182fad7..d649852 100644 (file)
--- a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
+++ b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
@@ -35,11 +35,14 @@
       - master:
           branch: master
       - f-release:
+          # will keep f release for now since that is the previous release
           java-version: openjdk11
           branch: f-release
       - g-release:
           java-version: openjdk11
           branch: g-release
+      - h-release:
+          branch: h-release
 
 # nonrtric:rappcatalogue
 # Maven artifacts for rappcatalogue
@@ -56,11 +59,14 @@
       - master:
           branch: master
       - f-release:
+          # will keep f release for now since that is the previous release
           java-version: openjdk11
           branch: f-release
       - g-release:
           java-version: openjdk11
           branch: g-release
+      - h-release:
+          branch: h-release
 
 - project:
     <<: *rappcatalogue_jdk_common
@@ -103,6 +109,8 @@
           branch: master
       - g-release:
           branch: g-release
+      - h-release:
+          branch: h-release
     jobs:
       - gerrit-tox-verify
 
@@ -128,6 +136,8 @@
           branch: master
       - g-release:
           branch: g-release
+      - h-release:
+          branch: h-release
     jobs:
       - "{project-name}-gerrit-docker-jobs"
 

diff --git a/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml b/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
index c38271c..6f952b4 100644 (file)
--- a/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
+++ b/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
@@ -66,6 +66,8 @@
           branch: master
       - g-release:
           branch: g-release
+      - h-release:
+          branch: h-release
 
 - project:
     <<: *nonrtric_plt_sme_common

diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index 285faff..633d6e1 100644 (file)
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -175,12 +175,11 @@
     stream:
       - master:
           branch: master
-      - f-release:
-          java-version: openjdk11
-          branch: f-release
       - g-release:
           java-version: openjdk11
           branch: g-release
+      - h-release:
+          branch: h-release
 
 - project:
     <<: *nonrtric_jdk_common

diff --git a/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
index b77b5e4..dcc3aa4 100644 (file)
--- a/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
+++ b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
@@ -55,6 +55,8 @@
       - g-release:
           java-version: openjdk11
           branch: g-release
+      - h-release:
+          branch: h-release
 
 - project:
     <<: *portal_nonrtric_controlpanel_common
@@ -113,6 +115,8 @@
       - g-release:
           java-version: openjdk11
           branch: g-release
+      - h-release:
+          branch: h-release
 
 - project:
     <<: *portal_nonrtric_controlpanel_common
@@ -135,3 +139,5 @@
       - g-release:
           java-version: openjdk11
           branch: g-release
+      - h-release:
+          branch: h-release

diff --git a/jjb/pti-rtp/pti-rtp.yaml b/jjb/pti-rtp/pti-rtp.yaml
index e96bff7..008b233 100644 (file)
--- a/jjb/pti-rtp/pti-rtp.yaml
+++ b/jjb/pti-rtp/pti-rtp.yaml
@@ -66,3 +66,5 @@
           branch: f-release
       - g-release:
           branch: g-release
+      - h-release:
+          branch: h-release

diff --git a/jjb/sim-a1-interface/sim-a1-interface.yaml b/jjb/sim-a1-interface/sim-a1-interface.yaml
index 310d092..a9674fc 100644 (file)
--- a/jjb/sim-a1-interface/sim-a1-interface.yaml
+++ b/jjb/sim-a1-interface/sim-a1-interface.yaml
@@ -37,10 +37,10 @@
     stream:
       - master:
           branch: master
-      - f-release:
-          branch: f-release
       - g-release:
           branch: g-release
+      - h-release:
+          branch: h-release
     jobs:
       - "{project-name}-gerrit-docker-jobs"
 

diff --git a/packer/common-packer b/packer/common-packer
index 15aba27..17bfe57 160000 (submodule)
--- a/packer/common-packer
+++ b/packer/common-packer
@@ -1 +1 @@
-Subproject commit 15aba27a45f98edb33890daa3712c6a4371b2947
+Subproject commit 17bfe57174ebf0e699cfcc235e83d6d568695651

diff --git a/packer/provision/devstack-centos.yaml b/packer/provision/devstack-centos.yaml
new file mode 120000 (symlink)
index 0000000..dc02778
--- /dev/null
+++ b/packer/provision/devstack-centos.yaml
@@ -0,0 +1 @@
+../common-packer/provision/devstack-centos.yaml
\ No newline at end of file

diff --git a/packer/provision/devstack-pre-pip-centos.yaml b/packer/provision/devstack-pre-pip-centos.yaml
new file mode 120000 (symlink)
index 0000000..46d6e78
--- /dev/null
+++ b/packer/provision/devstack-pre-pip-centos.yaml
@@ -0,0 +1 @@
+../common-packer/provision/devstack-pre-pip-centos.yaml
\ No newline at end of file

diff --git a/packer/templates/devstack-pre-pip-yoga.json b/packer/templates/devstack-pre-pip-yoga.json
new file mode 120000 (symlink)
index 0000000..b2f6b25
--- /dev/null
+++ b/packer/templates/devstack-pre-pip-yoga.json
@@ -0,0 +1 @@
+../common-packer/templates/devstack-pre-pip-yoga.json
\ No newline at end of file

diff --git a/packer/templates/devstack.json b/packer/templates/devstack.json
new file mode 120000 (symlink)
index 0000000..60505d9
--- /dev/null
+++ b/packer/templates/devstack.json
@@ -0,0 +1 @@
+../common-packer/templates/devstack.json
\ No newline at end of file