Merge "Install Ninja-build"

diff --git a/global-jjb b/global-jjb
index 6b41389..a09b8ba 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 6b413898e59824dede32428a4b7231e1824c7a59
+Subproject commit a09b8bab2c37f67f0f5e9ef36f9e93b330fdd571

diff --git a/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml b/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml
index 314ddf9..b2ea3a5 100644 (file)
--- a/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml
+++ b/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml
@@ -34,6 +34,8 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
 
 # nonrtric:a1policymanagementservice/
 # Maven artifacts for nonrtric-plt-a1policymanagementservice/
@@ -49,6 +51,8 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
 
 - project:
     <<: *a1policymanagementservice_jdk_common
@@ -58,3 +62,4 @@
     build-node: centos7-docker-2c-8g
     jobs:
       - '{project-name}-gerrit-release-jobs'
+

diff --git a/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml b/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml
index 095d12f..1d644f8 100644 (file)
--- a/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml
+++ b/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml
@@ -34,6 +34,8 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
 
 # nonrtric:dmaapadapter/
 # Maven artifacts for nonrtric-plt-dmaapadapter/
@@ -49,6 +51,8 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-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 e4fbc0b..8c6bc5a 100644 (file)
--- a/jjb/nonrtric-plt-dmaapmediatorproducer/nonrtric-plt-dmaapmediatorproducer.yaml
+++ b/jjb/nonrtric-plt-dmaapmediatorproducer/nonrtric-plt-dmaapmediatorproducer.yaml
@@ -54,6 +54,8 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-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 21c25fb..c88df2c 100644 (file)
--- a/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml
+++ b/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml
@@ -34,6 +34,8 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
 
 # nonrtric:helmmanager
 # Maven artifacts for helmmanager
@@ -49,6 +51,8 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-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 6b09c64..602ee42 100644 (file)
--- a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml
+++ b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml
@@ -34,6 +34,8 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
 
 # nonrtric:informationcoordinatorservice
 # Maven artifacts for nonrtric-plt-informationcoordinatorservice
@@ -49,6 +51,8 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-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 7451d7a..63402d2 100644 (file)
--- a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
+++ b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
@@ -34,6 +34,8 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
 
 # nonrtric:rappcatalogue
 # Maven artifacts for rappcatalogue
@@ -49,6 +51,8 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
 
 - project:
     <<: *rappcatalogue_jdk_common

diff --git a/jjb/nonrtric-plt-sdnca1controller/nonrtric-plt-sdnca1controller.yaml b/jjb/nonrtric-plt-sdnca1controller/nonrtric-plt-sdnca1controller.yaml
index f512695..6e70930 100644 (file)
--- a/jjb/nonrtric-plt-sdnca1controller/nonrtric-plt-sdnca1controller.yaml
+++ b/jjb/nonrtric-plt-sdnca1controller/nonrtric-plt-sdnca1controller.yaml
@@ -34,6 +34,8 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
 
 # nonrtric:nonrtric-plt-sdnca1controller
 # Maven artifacts for nonrtric-plt-sdnca1controller
@@ -49,6 +51,8 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
 
 - project:
     <<: *sdnca1controller_jdk_common

diff --git a/jjb/nonrtric-rapp-healthcheck/nonrtric-rapp-healthcheck.yaml b/jjb/nonrtric-rapp-healthcheck/nonrtric-rapp-healthcheck.yaml
index 8f7e2df..d08b395 100644 (file)
--- a/jjb/nonrtric-rapp-healthcheck/nonrtric-rapp-healthcheck.yaml
+++ b/jjb/nonrtric-rapp-healthcheck/nonrtric-rapp-healthcheck.yaml
@@ -39,3 +39,6 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
+

diff --git a/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml b/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml
index 99c135a..b995a3f 100644 (file)
--- a/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml
+++ b/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml
@@ -48,6 +48,8 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
 
 - project:
     <<: *orufhrecovery_common
@@ -76,6 +78,8 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
 
 - project:
     <<: *orufhrecovery_common

diff --git a/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml b/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml
index f35a376..0618200 100644 (file)
--- a/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml
+++ b/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml
@@ -54,6 +54,8 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
 
 - project:
     <<: *ransliceassurance_common
@@ -78,6 +80,8 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
 
 - project:
     <<: *ransliceassurance_common

diff --git a/jjb/ric-app-kpimon-go/ric-app-kpimon-go.yaml b/jjb/ric-app-kpimon-go/ric-app-kpimon-go.yaml
new file mode 100644 (file)
index 0000000..2169c38
--- /dev/null
+++ b/jjb/ric-app-kpimon-go/ric-app-kpimon-go.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+    name: ric-app-kpimon-go-project-view
+    project-name: ric-app-kpimon-go
+    views:
+      - project-view
+
+- project:
+    name: ric-app-kpimon-go-info
+    project: ric-app/kpimon-go
+    project-name: ric-app-kpimon-go
+    build-node: centos7-builder-1c-1g
+    branch: master
+    jobs:
+      - gerrit-info-yaml-verify
\ No newline at end of file

diff --git a/jjb/ric-plt-xapp-frame-rust/ric-plt-xapp-frame-rust.yaml b/jjb/ric-plt-xapp-frame-rust/ric-plt-xapp-frame-rust.yaml
new file mode 100644 (file)
index 0000000..fec72ae
--- /dev/null
+++ b/jjb/ric-plt-xapp-frame-rust/ric-plt-xapp-frame-rust.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+    name: ric-plt-xapp-frame-rust-project-view
+    project-name: ric-plt-xapp-frame-rust
+    views:
+      - project-view
+
+- project:
+    name: ric-plt-xapp-frame-rust-info
+    project: ric-plt/xapp-frame-rust
+    project-name: ric-plt-xapp-frame-rust
+    build-node: centos7-builder-1c-1g
+    branch: master
+    jobs:
+      - gerrit-info-yaml-verify
\ No newline at end of file

diff --git a/jjb/smo-pkg/smo-pkg.yaml b/jjb/smo-pkg/smo-pkg.yaml
new file mode 100644 (file)
index 0000000..0d120d2
--- /dev/null
+++ b/jjb/smo-pkg/smo-pkg.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+    name: smo-pkg-project-view
+    project-name: smo-pkg
+    views:
+      - project-view
+
+- project:
+    name: smo-pkg-info
+    project: smo/pkg
+    project-name: smo-pkg
+    build-node: centos7-builder-1c-1g
+    branch: master
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/smo-ves/smo-ves.yaml b/jjb/smo-ves/smo-ves.yaml
index ec3c643..3630cb0 100644 (file)
--- a/jjb/smo-ves/smo-ves.yaml
+++ b/jjb/smo-ves/smo-ves.yaml
@@ -130,8 +130,8 @@
     python-version: python3
     # the install script assumes an ubuntu image
     build-node: ubuntu1804-builder-2c-2g
-    pre-build-script: !include-raw-escape:
-      - ../shell/install-deb-rmr.sh
+    #pre-build-script: !include-raw-escape:
+    #  - ../shell/install-deb-rmr.sh
     # impt for verify and tox etc
     tox-envs: code,flake8
     sonar-project-file: ""

diff --git a/packer/common-packer b/packer/common-packer
index 3dcae18..1bbdb3b 160000 (submodule)
--- a/packer/common-packer
+++ b/packer/common-packer
@@ -1 +1 @@
-Subproject commit 3dcae183d810816f31950afbe1fa08fa948e61fe
+Subproject commit 1bbdb3b9477f25d71bc75862d9fb6f3aa69a924a