Revert "Refactor!: Update JJB code to comply 5.x"

This reverts commit 3bcdb1f34221f271df9da070c693efabba5ac004.
The CR was merged by mistake reverting this until the next
official global-jjb release.

Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
Change-Id: I5888b9af7c6181099b1e1aeedfe215cd8a5cac30
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/global-jjb b/global-jjb
index 9e8d3b3..ac8fb0e 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 9e8d3b3d5040add588d9d0884a367a622fa3cb41
+Subproject commit ac8fb0e75cdcbeb4812e620ecc68f9631b90e507

diff --git a/jjb/aiml-fw-athp-data-extraction/aiml-fw-athp-data-extraction.yaml b/jjb/aiml-fw-athp-data-extraction/aiml-fw-athp-data-extraction.yaml
index d758041..ffed792 100644 (file)
--- a/jjb/aiml-fw-athp-data-extraction/aiml-fw-athp-data-extraction.yaml
+++ b/jjb/aiml-fw-athp-data-extraction/aiml-fw-athp-data-extraction.yaml
@@ -14,7 +14,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _aiml_de_docker_common: &aiml_de_docker_common
+- aiml_de_docker_common: &aiml_de_docker_common
     # values apply to all training manager projects
     name: aiml-fw-athp-data-extraction-docker-common
     # git repo
@@ -51,7 +51,7 @@
     stream:
       - master:
           branch: master
-
+          
 - project:
     <<: *aiml_de_docker_common
     name: aiml-fw-athp-data-extraction-tox-verify

diff --git a/jjb/aiml-fw-athp-sdk-feature-store/aiml-fw-athp-sdk-feature-store.yaml b/jjb/aiml-fw-athp-sdk-feature-store/aiml-fw-athp-sdk-feature-store.yaml
index 6a05800..22b9b8a 100644 (file)
--- a/jjb/aiml-fw-athp-sdk-feature-store/aiml-fw-athp-sdk-feature-store.yaml
+++ b/jjb/aiml-fw-athp-sdk-feature-store/aiml-fw-athp-sdk-feature-store.yaml
@@ -14,7 +14,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _aiml_fssdk_docker_common: &aiml_fssdk_docker_common
+- aiml_fssdk_docker_common: &aiml_fssdk_docker_common
     # values apply to all training manager projects
     name: aiml-fw-athp-sdk-feature-store-docker-common
     # git repo
@@ -66,4 +66,4 @@
         sonar.sources=featurestoresdk
         sonar.python.coverage.reportPaths=coverage.xml
     jobs:
-      - gerrit-tox-sonarqube
+      - gerrit-tox-sonarqube
\ No newline at end of file

diff --git a/jjb/aiml-fw-athp-sdk-model-storage/aiml-fw-athp-sdk-model-storage.yaml b/jjb/aiml-fw-athp-sdk-model-storage/aiml-fw-athp-sdk-model-storage.yaml
index d54bc2b..8a3c87d 100644 (file)
--- a/jjb/aiml-fw-athp-sdk-model-storage/aiml-fw-athp-sdk-model-storage.yaml
+++ b/jjb/aiml-fw-athp-sdk-model-storage/aiml-fw-athp-sdk-model-storage.yaml
@@ -13,8 +13,8 @@
     branch: master
     jobs:
       - gerrit-info-yaml-verify
-
-- _aiml_mssdk_docker_common: &aiml_mssdk_docker_common
+      
+- aiml_mssdk_docker_common: &aiml_mssdk_docker_common
     # values apply to all training manager projects
     name: aiml-fw-athp-sdk-model-storage-docker-common
     # git repo
@@ -66,4 +66,4 @@
         sonar.sources=modelmetricsdk
         sonar.python.coverage.reportPaths=coverage.xml
     jobs:
-      - gerrit-tox-sonarqube
+      - gerrit-tox-sonarqube
\ No newline at end of file

diff --git a/jjb/aiml-fw-athp-tps-kubeflow-adapter/aiml-fw-athp-tps-kubeflow-adapter.yaml b/jjb/aiml-fw-athp-tps-kubeflow-adapter/aiml-fw-athp-tps-kubeflow-adapter.yaml
index ca92c12..850d035 100644 (file)
--- a/jjb/aiml-fw-athp-tps-kubeflow-adapter/aiml-fw-athp-tps-kubeflow-adapter.yaml
+++ b/jjb/aiml-fw-athp-tps-kubeflow-adapter/aiml-fw-athp-tps-kubeflow-adapter.yaml
@@ -14,7 +14,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _aiml_kfc_docker_common: &aiml_kfc_docker_common
+- aiml_kfc_docker_common: &aiml_kfc_docker_common
     # values apply to all training manager projects
     name: aiml-fw-athp-tps-kubeflow-adapter-docker-common
     # git repo

diff --git a/jjb/aiml-fw-awmf-tm/aiml-fw-awmf-tm.yaml b/jjb/aiml-fw-awmf-tm/aiml-fw-awmf-tm.yaml
index adf8900..197809e 100644 (file)
--- a/jjb/aiml-fw-awmf-tm/aiml-fw-awmf-tm.yaml
+++ b/jjb/aiml-fw-awmf-tm/aiml-fw-awmf-tm.yaml
@@ -14,7 +14,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _aiml_tm_docker_common: &aiml_tm_docker_common
+- aiml_tm_docker_common: &aiml_tm_docker_common
     # values apply to all training manager projects
     name: aiml-fw-awmf-tm-docker-common
     # git repo

diff --git a/jjb/ci-management/ci-docker.yaml b/jjb/ci-management/ci-docker.yaml
index 7aa82c9..253758f 100644 (file)
--- a/jjb/ci-management/ci-docker.yaml
+++ b/jjb/ci-management/ci-docker.yaml
@@ -2,7 +2,7 @@
 # Job configurations for base docker build images
 
 # This macro factors out common configuration
-- _ci_docker_common: &ci_docker_common
+- ci_docker_common: &ci_docker_common
     name: ci-docker-common
     # git repo
     project: ci-management

diff --git a/jjb/ci-management/ci-jobs.yaml b/jjb/ci-management/ci-jobs.yaml
index 7c80658..59b0dbc 100644 (file)
--- a/jjb/ci-management/ci-jobs.yaml
+++ b/jjb/ci-management/ci-jobs.yaml
@@ -1,5 +1,5 @@
 ---
-- _ci_jobs_common: &ci_jobs_common
+- ci_jobs_common: &ci_jobs_common
     name: ci-jobs-common
     # Defines common ci-jobs configuration
 

diff --git a/jjb/ci-management/ci-packer.yaml b/jjb/ci-management/ci-packer.yaml
index 8c8315d..4181e58 100644 (file)
--- a/jjb/ci-management/ci-packer.yaml
+++ b/jjb/ci-management/ci-packer.yaml
@@ -1,5 +1,5 @@
 ---
-- _ci_packer_common: &ci_packer_common
+- ci_packer_common: &ci_packer_common
     name: ci-packer-common
     # Defines common ci-packer configuration
 

diff --git a/jjb/com-golog/com-golog.yaml b/jjb/com-golog/com-golog.yaml
index 9501407..207293c 100644 (file)
--- a/jjb/com-golog/com-golog.yaml
+++ b/jjb/com-golog/com-golog.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _golog_docker_common: &golog_docker_common
+- golog_docker_common: &golog_docker_common
     # values apply to all golog docker projects
     name: golog-docker-common
     # git repo

diff --git a/jjb/com-log/com-log.yaml b/jjb/com-log/com-log.yaml
index 8ea3ce3..266ebaa 100644 (file)
--- a/jjb/com-log/com-log.yaml
+++ b/jjb/com-log/com-log.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _com_log_common: &com_log_common
+- com_log_common: &com_log_common
     # values apply to all com/log projects
     name: com-log-common
     # git repo
@@ -42,7 +42,7 @@
           branch: master
 
 # common settings for building DEB and RPM packages
-- _com_log_pkg_common: &com_log_pkg_common
+- com_log_pkg_common: &com_log_pkg_common
     name: com-log-pkg-common
     # directory with package files
     build-dir: pkg
@@ -107,3 +107,4 @@
     jobs:
       - gerrit-packagecloud-release-verify
       - gerrit-packagecloud-release-merge
+

diff --git a/jjb/com-pylog/com-pylog.yaml b/jjb/com-pylog/com-pylog.yaml
index 5f7839c..115b624 100644 (file)
--- a/jjb/com-pylog/com-pylog.yaml
+++ b/jjb/com-pylog/com-pylog.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _pylog_common: &pylog_common
+- pylog_common: &pylog_common
     name: pylog-common
     # git repo
     project: com/pylog
@@ -54,7 +54,7 @@
     # do not trigger on changes in docs, releases
 
 
-- _pylog_python: &pylog_python
+- pylog_python: &pylog_python
     # settings for python builds
     name: com-pylog-python
     # the install script assumes an ubuntu image

diff --git a/jjb/it-dep/it-dep.yaml b/jjb/it-dep/it-dep.yaml
index 7190f2e..56d9b9e 100644 (file)
--- a/jjb/it-dep/it-dep.yaml
+++ b/jjb/it-dep/it-dep.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _it_dep_common: &it_dep_common
+- it_dep_common: &it_dep_common
     # values apply to all it/dep projects
     name: it-dep-docker-common
     # git repo

diff --git a/jjb/it-dev/it-dev-docker.yaml b/jjb/it-dev/it-dev-docker.yaml
index fabc8f2..7cf1590 100644 (file)
--- a/jjb/it-dev/it-dev-docker.yaml
+++ b/jjb/it-dev/it-dev-docker.yaml
@@ -2,7 +2,7 @@
 # Job configurations for base docker build images
 
 # This macro factors out common configuration
-- _it_dev_docker_common: &it_dev_docker_common
+- it_dev_docker_common: &it_dev_docker_common
     name: it-dev-docker-common
     # git repo
     project: it/dev

diff --git a/jjb/it-dev/it-dev.yaml b/jjb/it-dev/it-dev.yaml
index d69f960..4dcbb96 100644 (file)
--- a/jjb/it-dev/it-dev.yaml
+++ b/jjb/it-dev/it-dev.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _it_dev_xo_common: &it_dev_xo_common
+- it_dev_xo_common: &it_dev_xo_common
     name: it-dev-xo-common
     # git repo
     project: it/dev
@@ -22,7 +22,7 @@
     # maven settings file has docker credentials
     mvn-settings: it-dev-settings
 
-- _it_dev_xo_py_common: &it_dev_xo_py_common
+- it_dev_xo_py_common: &it_dev_xo_py_common
     name: it-dev-xo-py-common
     python-version: python3.6
     tox-dir: xapp_onboarder

diff --git a/jjb/it-otf/it-otf.yaml b/jjb/it-otf/it-otf.yaml
index 75188be..db1c9b9 100644 (file)
--- a/jjb/it-otf/it-otf.yaml
+++ b/jjb/it-otf/it-otf.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _it_otf_common: &it_otf_common
+- it_otf_common: &it_otf_common
     # values apply to all it/otf docker projects
     name: it_otf_common
     # git repo

diff --git a/jjb/it-test/it-test.yaml b/jjb/it-test/it-test.yaml
index c67f685..5a492be 100644 (file)
--- a/jjb/it-test/it-test.yaml
+++ b/jjb/it-test/it-test.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _it_test_common: &it_test_common
+- it_test_common: &it_test_common
     # values apply to all it/test docker projects
     name: it-test-docker-common
     # git repo

diff --git a/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml b/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml
index 59df58a..7eb12fb 100644 (file)
--- a/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml
+++ b/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _nonrtric_jdk_common: &a1policymanagementservice_jdk_common
+- nonrtric_jdk_common: &a1policymanagementservice_jdk_common
     name: a1policymanagementservice-jdk-common
     # git repo
     project: nonrtric/plt/a1policymanagementservice
@@ -70,3 +70,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 a270e6b..21be3cd 100644 (file)
--- a/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml
+++ b/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _dmaapadapter_jdk_common: &dmaapadapter_jdk_common
+- dmaapadapter_jdk_common: &dmaapadapter_jdk_common
     name: dmaapadapter-jdk-common
     # git repo
     project: nonrtric/plt/dmaapadapter

diff --git a/jjb/nonrtric-plt-dmaapmediatorproducer/nonrtric-plt-dmaapmediatorproducer.yaml b/jjb/nonrtric-plt-dmaapmediatorproducer/nonrtric-plt-dmaapmediatorproducer.yaml
index 3886037..b3af76a 100644 (file)
--- a/jjb/nonrtric-plt-dmaapmediatorproducer/nonrtric-plt-dmaapmediatorproducer.yaml
+++ b/jjb/nonrtric-plt-dmaapmediatorproducer/nonrtric-plt-dmaapmediatorproducer.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _dmaapmediatorproducer_common: &dmaapmediatorproducer_common
+- dmaapmediatorproducer_common: &dmaapmediatorproducer_common
     name: dmaapmediatorproducer-common
     # git repo
     project: nonrtric/plt/dmaapmediatorproducer
@@ -69,6 +69,6 @@
     sonar-project-file: ""
     java-version: openjdk11
     # use sonarcloud values from defaults.yaml
-    sonar-properties: !include-raw-escape: sonar-project.properties
+    sonar-properties: !include-raw: sonar-project.properties
     jobs:
       - gerrit-sonar-prescan-script

diff --git a/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml b/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml
index c2e0372..ae042ee 100644 (file)
--- a/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml
+++ b/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _helmmanager_jdk_common: &helmmanager_jdk_common
+- helmmanager_jdk_common: &helmmanager_jdk_common
     name: helmmanager-jdk-common
     # git repo
     project: nonrtric/plt/helmmanager

diff --git a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml
index 79a5c28..c0011ce 100644 (file)
--- a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml
+++ b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _informationcoordinatorservice_jdk_common: &informationcoordinatorservice_jdk_common
+- informationcoordinatorservice_jdk_common: &informationcoordinatorservice_jdk_common
     name: informationcoordinatorservice-jdk-common
     # git repo
     project: nonrtric/plt/informationcoordinatorservice

diff --git a/jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml b/jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml
index 2a24590..ced8de8 100644 (file)
--- a/jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml
+++ b/jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml
@@ -14,7 +14,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _nonrtric-plt-ranpm_common: &nonrtric_plt_ranpm_jdk_common
+- nonrtric-plt-ranpm_common: &nonrtric_plt_ranpm_jdk_common
     name: nonrtric-plt-ranpm-common
     # git repo
     project: nonrtric/plt/ranpm
@@ -94,3 +94,4 @@
     stream:
       - master:
           branch: master
+

diff --git a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
index fe4c965..2e194f1 100644 (file)
--- a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
+++ b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _rappcatalogue_jdk_common: &rappcatalogue_jdk_common
+- rappcatalogue_jdk_common: &rappcatalogue_jdk_common
     name: rappcatalogue-jdk-common
     # git repo
     project: nonrtric/plt/rappcatalogue

diff --git a/jjb/nonrtric-plt-sdnca1controller/nonrtric-plt-sdnca1controller.yaml b/jjb/nonrtric-plt-sdnca1controller/nonrtric-plt-sdnca1controller.yaml
index 76ca52c..f512695 100644 (file)
--- a/jjb/nonrtric-plt-sdnca1controller/nonrtric-plt-sdnca1controller.yaml
+++ b/jjb/nonrtric-plt-sdnca1controller/nonrtric-plt-sdnca1controller.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _sdnca1controller_jdk_common: &sdnca1controller_jdk_common
+- sdnca1controller_jdk_common: &sdnca1controller_jdk_common
     name: sdnca1controller-jdk-common
     # git repo
     project: nonrtric/plt/sdnca1controller

diff --git a/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml b/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
index a033ded..9a7c599 100644 (file)
--- a/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
+++ b/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
@@ -15,7 +15,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _nonrtric_plt_sme_common: &nonrtric_plt_sme_common
+- nonrtric_plt_sme_common: &nonrtric_plt_sme_common
     # values apply to all projects here
     name: nonrtric-plt-sme-common
     # git repo
@@ -80,6 +80,6 @@
     sonar-project-file: ""
     java-version: openjdk11
     # use sonarcloud values from defaults.yaml
-    sonar-properties: !include-raw-escape: sonar-project.properties
+    sonar-properties: !include-raw: sonar-project.properties
     jobs:
       - gerrit-sonar-prescan-script

diff --git a/jjb/nonrtric-rapp-healthcheck/nonrtric-rapp-healthcheck.yaml b/jjb/nonrtric-rapp-healthcheck/nonrtric-rapp-healthcheck.yaml
index 423d5ff..ed48c33 100644 (file)
--- a/jjb/nonrtric-rapp-healthcheck/nonrtric-rapp-healthcheck.yaml
+++ b/jjb/nonrtric-rapp-healthcheck/nonrtric-rapp-healthcheck.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _nonrtric-rapp-healthcheck_common: &nonrtric_rapp_healthcheck_common
+- nonrtric-rapp-healthcheck_common: &nonrtric_rapp_healthcheck_common
     name: nonrtric-rapp-healthcheck-common
     # git repo
     project: nonrtric/rapp/healthcheck

diff --git a/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml b/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml
index 54f54d5..2459b36 100644 (file)
--- a/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml
+++ b/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _ransliceassurance_common: &ransliceassurance_common
+- ransliceassurance_common: &ransliceassurance_common
     name: ransliceassurance-common
     # git repo
     project: nonrtric/rapp/ransliceassurance
@@ -96,6 +96,6 @@
     sonar-project-file: ""
     java-version: openjdk11
     # use sonarcloud values from defaults.yaml
-    sonar-properties: !include-raw-escape: sonar-project.properties
+    sonar-properties: !include-raw: sonar-project.properties
     jobs:
       - gerrit-sonar-prescan-script

diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index 6f02f6d..b54e6ac 100644 (file)
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _nonrtric_jdk_common: &nonrtric_jdk_common
+- nonrtric_jdk_common: &nonrtric_jdk_common
     name: nonrtric-jdk-common
     # git repo
     project: nonrtric
@@ -205,7 +205,7 @@
     sonar-project-file: ""
     java-version: openjdk11
     # use sonarcloud values from defaults.yaml
-    sonar-properties: !include-raw-escape: sonar-project.properties
+    sonar-properties: !include-raw: sonar-project.properties
     jobs:
       - gerrit-sonar-prescan-script
 

diff --git a/jjb/o-du-l2/o-du-l2.yaml b/jjb/o-du-l2/o-du-l2.yaml
index f3fa7db..c574af7 100644 (file)
--- a/jjb/o-du-l2/o-du-l2.yaml
+++ b/jjb/o-du-l2/o-du-l2.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _o_du_l2_common: &o_du_l2_common
+- o_du_l2_common: &o_du_l2_common
     # values apply to all o-du/l2 docker projects
     name: o-du-l2-common
     # git repo

diff --git a/jjb/o-du-phy/o-du-phy.yaml b/jjb/o-du-phy/o-du-phy.yaml
index 9f3cd1a..118f5af 100644 (file)
--- a/jjb/o-du-phy/o-du-phy.yaml
+++ b/jjb/o-du-phy/o-du-phy.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _o_du_phy_common: &o_du_phy_common
+- o_du_phy_common: &o_du_phy_common
     # values apply to all o-du/phy docker projects
     name: o-du-phy-docker-common
     # git repo
@@ -41,3 +41,4 @@
     stream:
       - master:
           branch: master
+

diff --git a/jjb/oam-nf-oam-adopter/oam-nf-adopter.yaml b/jjb/oam-nf-oam-adopter/oam-nf-adopter.yaml
index faa1f4c..e615443 100644 (file)
--- a/jjb/oam-nf-oam-adopter/oam-nf-adopter.yaml
+++ b/jjb/oam-nf-oam-adopter/oam-nf-adopter.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _oam-nf-oam-adopter: &oam-nf-oam-adopter
+- oam-nf-oam-adopter: &oam-nf-oam-adopter
    name: oam-nf-oam-adopter
    project: oam/nf-oam-adopter
    project-name: oam-nf-oam-adopter
@@ -70,4 +70,4 @@
     branch: 'master'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-params: '-f ves-nf-oam-adopter/pom.xml -Ddocker.skip=true'
+    mvn-params: '-f ves-nf-oam-adopter/pom.xml -Ddocker.skip=true'
\ No newline at end of file

diff --git a/jjb/oam-tr069-adapter/oam-tr069-adapter.yaml b/jjb/oam-tr069-adapter/oam-tr069-adapter.yaml
index 348e66b..dedb939 100644 (file)
--- a/jjb/oam-tr069-adapter/oam-tr069-adapter.yaml
+++ b/jjb/oam-tr069-adapter/oam-tr069-adapter.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _tr069-adapter-jdk08: &tr069-adapter-jdk08
+- tr069-adapter-jdk08: &tr069-adapter-jdk08
     # values apply to all projects here
     name: tr069-adapter-jdk08
     # git repo
@@ -56,3 +56,4 @@
     build-node: centos7-docker-2c-8g
     jobs:
       - '{project-name}-gerrit-release-jobs'
+

diff --git a/jjb/oran-templates/oran-docker-ci-jobs.yaml b/jjb/oran-templates/oran-docker-ci-jobs.yaml
index 55f3f25..93c431b 100644 (file)
--- a/jjb/oran-templates/oran-docker-ci-jobs.yaml
+++ b/jjb/oran-templates/oran-docker-ci-jobs.yaml
@@ -33,7 +33,7 @@
           - ../shell/export-packages.sh
 
 # Different name, same content as lf_docker_common
-- _oran_docker_common: &oran_docker_common
+- oran_docker_common: &oran_docker_common
     name: oran-docker-ci-common
 
     project-type: freestyle
@@ -84,7 +84,7 @@
     publishers:
       - lf-infra-publish
 
-- _oran_docker_ci_pc_merge_common: &oran_docker_ci_pc_merge_common
+- oran_docker_ci_pc_merge_common: &oran_docker_ci_pc_merge_common
     name: oran-docker-ci-pc-merge-common
     cron: ""
 

diff --git a/jjb/oran-templates/oran-shell-jobs.yaml b/jjb/oran-templates/oran-shell-jobs.yaml
index a303200..f4a236c 100644 (file)
--- a/jjb/oran-templates/oran-shell-jobs.yaml
+++ b/jjb/oran-templates/oran-shell-jobs.yaml
@@ -12,7 +12,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 ---
-- _oran_shell_common: &oran_shell_common
+- oran_shell_common: &oran_shell_common
     name: oran-shell-common
 
     ######################
@@ -223,3 +223,4 @@
                 - branch-compare-type: ANT
                   branch-pattern: '**/{branch}'
               file-paths: '{obj:gerrit_release_file_paths}'
+

diff --git a/jjb/portal-aiml-dashboard/portal-aiml-dashboard.yaml b/jjb/portal-aiml-dashboard/portal-aiml-dashboard.yaml
index 64119ca..0553139 100644 (file)
--- a/jjb/portal-aiml-dashboard/portal-aiml-dashboard.yaml
+++ b/jjb/portal-aiml-dashboard/portal-aiml-dashboard.yaml
@@ -14,7 +14,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _aiml_dashboard_docker_common: &aiml_dashboard_docker_common
+- aiml_dashboard_docker_common: &aiml_dashboard_docker_common
     # values apply to all training manager projects
     name: portal-aiml-dashboard-docker-common
     # git repo
@@ -70,4 +70,4 @@
       - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
-          branch: master
+          branch: master
\ No newline at end of file

diff --git a/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
index 0181138..25863bb 100644 (file)
--- a/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
+++ b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _portal_nonrtric_controlpanel_common: &portal_nonrtric_controlpanel_common
+- portal_nonrtric_controlpanel_common: &portal_nonrtric_controlpanel_common
     # values apply to all projects here
     name: portal-nonrtric-controlpanel-common
     # git repo
@@ -135,3 +135,4 @@
       - g-release:
           java-version: openjdk11
           branch: g-release
+

diff --git a/jjb/pti-o2/pti-o2.yaml b/jjb/pti-o2/pti-o2.yaml
index e77a07b..d5b43a4 100644 (file)
--- a/jjb/pti-o2/pti-o2.yaml
+++ b/jjb/pti-o2/pti-o2.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _pti_o2_common: &pti_o2_common
+- pti_o2_common: &pti_o2_common
     # values apply to all pti/o2 projects
     name: pti-o2-common
     # git repo
@@ -23,7 +23,7 @@
     # maven settings file has credentials
     mvn-settings: pti-o2-settings
 
-- _pti_o2_python: &pti_o2_python
+- pti_o2_python: &pti_o2_python
     # settings for python builds
     name: pti-o2-python
     # the install script assumes an ubuntu image
@@ -47,7 +47,7 @@
       - master:
           branch: master
 
-- _pti_o2_docker: &pti_o2_docker_common
+- pti_o2_docker: &pti_o2_docker_common
     <<: *pti_o2_common
     # values apply to all pti/o2 docker projects
     # maven settings file has docker credentials

diff --git a/jjb/pti-rtp/pti-rtp.yaml b/jjb/pti-rtp/pti-rtp.yaml
index 689a16e..ed339b4 100644 (file)
--- a/jjb/pti-rtp/pti-rtp.yaml
+++ b/jjb/pti-rtp/pti-rtp.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _pti_rtp_common: &pti_rtp_common
+- pti_rtp_common: &pti_rtp_common
     name: pti-rtp-common
     # git repo
     project: pti/rtp

diff --git a/jjb/ric-app-ad/ric-app-ad.yaml b/jjb/ric-app-ad/ric-app-ad.yaml
index 423acb5..2120653 100644 (file)
--- a/jjb/ric-app-ad/ric-app-ad.yaml
+++ b/jjb/ric-app-ad/ric-app-ad.yaml
@@ -5,7 +5,7 @@
     views:
       - project-view
 
-- _ad_common: &ad_common
+- ad_common: &ad_common
     # required even though overridden everywhere
     name: ad-common
     # git repo
@@ -51,7 +51,7 @@
     jobs:
       - '{project-name}-gerrit-release-jobs'
 
-- _ad_python: &ad_python
+- ad_python: &ad_python
     # settings for python builds
     name: ad-python
     # the install script assumes an ubuntu image

diff --git a/jjb/ric-app-bouncer/ric-app-bouncer.yaml b/jjb/ric-app-bouncer/ric-app-bouncer.yaml
index cd7a992..f0a7d22 100644 (file)
--- a/jjb/ric-app-bouncer/ric-app-bouncer.yaml
+++ b/jjb/ric-app-bouncer/ric-app-bouncer.yaml
@@ -5,7 +5,7 @@
     views:
       - project-view
 
-- _bouncer_common: &bouncer_common
+- bouncer_common: &bouncer_common
     # values apply to all projects
     name: bouncer-common
     # git repo

diff --git a/jjb/ric-app-hw-go/ric-app-hw-go.yaml b/jjb/ric-app-hw-go/ric-app-hw-go.yaml
index 77dc8f0..0e8693b 100644 (file)
--- a/jjb/ric-app-hw-go/ric-app-hw-go.yaml
+++ b/jjb/ric-app-hw-go/ric-app-hw-go.yaml
@@ -5,7 +5,7 @@
     views:
       - project-view
 
-- _hw-go_common: &hw-go_common
+- hw-go_common: &hw-go_common
     # values apply to all projects
     name: hw-go-common
     # git repo

diff --git a/jjb/ric-app-hw-python/ric-app-hw-python.yaml b/jjb/ric-app-hw-python/ric-app-hw-python.yaml
index d0b3f5e..e3f0fff 100644 (file)
--- a/jjb/ric-app-hw-python/ric-app-hw-python.yaml
+++ b/jjb/ric-app-hw-python/ric-app-hw-python.yaml
@@ -5,7 +5,7 @@
     views:
       - project-view
 
-- _hw-python_common: &hw-python_common
+- hw-python_common: &hw-python_common
     # values apply to all projects
     name: hw-python-common
     # git repo
@@ -52,3 +52,4 @@
     build-node: centos7-docker-2c-8g
     jobs:
       - '{project-name}-gerrit-release-jobs'
+

diff --git a/jjb/ric-app-hw/ric-app-hw.yaml b/jjb/ric-app-hw/ric-app-hw.yaml
index 2545e6f..afb6297 100644 (file)
--- a/jjb/ric-app-hw/ric-app-hw.yaml
+++ b/jjb/ric-app-hw/ric-app-hw.yaml
@@ -5,7 +5,7 @@
     views:
       - project-view
 
-- _hw_common: &hw_common
+- hw_common: &hw_common
     # values apply to all projects
     name: hw-common
     # git repo

diff --git a/jjb/ric-app-kpimon-go/ric-app-kpimon-go.yaml b/jjb/ric-app-kpimon-go/ric-app-kpimon-go.yaml
index 8d1ee36..232b176 100644 (file)
--- a/jjb/ric-app-kpimon-go/ric-app-kpimon-go.yaml
+++ b/jjb/ric-app-kpimon-go/ric-app-kpimon-go.yaml
@@ -5,7 +5,7 @@
     views:
       - project-view
 
-- _kpimon-go_common: &kpimon-go_common
+- kpimon-go_common: &kpimon-go_common
     # values apply to all projects
     name: kpimon-go-common
     # git repo
@@ -46,7 +46,7 @@
         - master:
             branch: master
 
-# push nexus image from staging to release
+# push nexus image from staging to release 
 - project:
     <<: *kpimon-go_common
     name: ric-app-kpimon-go-release

diff --git a/jjb/ric-app-lp/ric-app-lp.yaml b/jjb/ric-app-lp/ric-app-lp.yaml
index d40da66..9e98d30 100644 (file)
--- a/jjb/ric-app-lp/ric-app-lp.yaml
+++ b/jjb/ric-app-lp/ric-app-lp.yaml
@@ -5,7 +5,7 @@
     views:
       - project-view
 
-- _lp_common: &lp_common
+- lp_common: &lp_common
     # required even though overridden everywhere
     name: lp-common
     # git repo
@@ -51,7 +51,7 @@
     jobs:
       - '{project-name}-gerrit-release-jobs'
 
-- _lp_python: &lp_python
+- lp_python: &lp_python
     # settings for python builds
     name: lp-python
     # the install script assumes an ubuntu image

diff --git a/jjb/ric-app-mc/ric-app-mc.yaml b/jjb/ric-app-mc/ric-app-mc.yaml
index 44c9bf6..a42b5ac 100644 (file)
--- a/jjb/ric-app-mc/ric-app-mc.yaml
+++ b/jjb/ric-app-mc/ric-app-mc.yaml
@@ -13,7 +13,7 @@
     jobs:
         - gerrit-info-yaml-verify
 
-- _mc_common: &mc_common
+- mc_common: &mc_common
     # values apply to all MC projects
     name: mc-common
     # git repo

diff --git a/jjb/ric-app-qp-aimlfw/ric-app-qp-aimlfw.yaml b/jjb/ric-app-qp-aimlfw/ric-app-qp-aimlfw.yaml
index 807e2d4..863e77d 100644 (file)
--- a/jjb/ric-app-qp-aimlfw/ric-app-qp-aimlfw.yaml
+++ b/jjb/ric-app-qp-aimlfw/ric-app-qp-aimlfw.yaml
@@ -11,10 +11,10 @@
     project-name: ric-app-qp-aimlfw
     build-node: centos7-builder-1c-1g
     branch: master
-    jobs:
+    jobs: 
       - gerrit-info-yaml-verify
 
-- _qp_aimlfw_docker_common: &qp_aimlfw_docker_common
+- qp_aimlfw_docker_common: &qp_aimlfw_docker_common
     # values apply to all training manager projects
     name: ric-app-qp-aimlfw-docker-common
     # git repo
@@ -69,3 +69,4 @@
     build-node: centos7-docker-2c-8g
     jobs:
       - '{project-name}-gerrit-release-jobs'
+  

diff --git a/jjb/ric-app-qp/ric-app-qp.yaml b/jjb/ric-app-qp/ric-app-qp.yaml
index 42025d3..9226660 100644 (file)
--- a/jjb/ric-app-qp/ric-app-qp.yaml
+++ b/jjb/ric-app-qp/ric-app-qp.yaml
@@ -5,7 +5,7 @@
     views:
       - project-view
 
-- _qp_common: &qp_common
+- qp_common: &qp_common
     # required even though overridden everywhere
     name: qp-common
     # git repo
@@ -51,7 +51,7 @@
     jobs:
       - '{project-name}-gerrit-release-jobs'
 
-- _qp_python: &qp_python
+- qp_python: &qp_python
     # settings for python builds
     name: qp-python
     # the install script assumes an ubuntu image

diff --git a/jjb/ric-app-rc/ric-app-rc.yaml b/jjb/ric-app-rc/ric-app-rc.yaml
index 125de68..273a25a 100644 (file)
--- a/jjb/ric-app-rc/ric-app-rc.yaml
+++ b/jjb/ric-app-rc/ric-app-rc.yaml
@@ -5,7 +5,7 @@
     views:
       - project-view
 
-- _rc_common: &rc_common
+- rc_common: &rc_common
     # values apply to all projects
     name: rc-common
     # git repo

diff --git a/jjb/ric-app-ts/ric-app-ts.yaml b/jjb/ric-app-ts/ric-app-ts.yaml
index ca95f6d..e5f8a48 100644 (file)
--- a/jjb/ric-app-ts/ric-app-ts.yaml
+++ b/jjb/ric-app-ts/ric-app-ts.yaml
@@ -5,7 +5,7 @@
     views:
       - project-view
 
-- _ts_common: &ts_common
+- ts_common: &ts_common
     # values apply to all projects
     name: ts-common
     # git repo

diff --git a/jjb/ric-plt-a1/ric-plt-a1.yaml b/jjb/ric-plt-a1/ric-plt-a1.yaml
index 983b890..8c8cc4e 100644 (file)
--- a/jjb/ric-plt-a1/ric-plt-a1.yaml
+++ b/jjb/ric-plt-a1/ric-plt-a1.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _a1_common: &a1_common
+- a1_common: &a1_common
     # values apply to all A1 projects
     name: a1-common
     # git repo

diff --git a/jjb/ric-plt-alarm-go/ric-plt-alarm-go.yaml b/jjb/ric-plt-alarm-go/ric-plt-alarm-go.yaml
index c489dfc..dae9206 100755 (executable)
--- a/jjb/ric-plt-alarm-go/ric-plt-alarm-go.yaml
+++ b/jjb/ric-plt-alarm-go/ric-plt-alarm-go.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _alarm_go_common: &alarm_go_common
+- alarm_go_common: &alarm_go_common
     # values apply to all projects
     name: alarm-go-common
     # git repo

diff --git a/jjb/ric-plt-appmgr/ric-plt-appmgr.yaml b/jjb/ric-plt-appmgr/ric-plt-appmgr.yaml
index 478ba8b..af88f95 100644 (file)
--- a/jjb/ric-plt-appmgr/ric-plt-appmgr.yaml
+++ b/jjb/ric-plt-appmgr/ric-plt-appmgr.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _appmgr_docker_common: &appmgr_docker_common
+- appmgr_docker_common: &appmgr_docker_common
     # values apply to all appmgr docker projects
     name: appmgr-docker-common
     # git repo
@@ -75,3 +75,4 @@
     build-node: centos7-docker-2c-8g
     jobs:
       - '{project-name}-gerrit-release-jobs'
+

diff --git a/jjb/ric-plt-dbaas/ric-plt-dbaas.yaml b/jjb/ric-plt-dbaas/ric-plt-dbaas.yaml
index 11c0468..4af3a47 100644 (file)
--- a/jjb/ric-plt-dbaas/ric-plt-dbaas.yaml
+++ b/jjb/ric-plt-dbaas/ric-plt-dbaas.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _dbaas_docker_common: &dbaas_docker_common
+- dbaas_docker_common: &dbaas_docker_common
     # values apply to all dbaas docker projects
     name: dbaas-docker-common
     # git repo

diff --git a/jjb/ric-plt-e2/ric-plt-e2.yaml b/jjb/ric-plt-e2/ric-plt-e2.yaml
index fce7565..a7fdb80 100644 (file)
--- a/jjb/ric-plt-e2/ric-plt-e2.yaml
+++ b/jjb/ric-plt-e2/ric-plt-e2.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _e2_docker_common: &e2_docker_common
+- e2_docker_common: &e2_docker_common
     # values apply to all E2 docker projects
     name: e2-docker-common
     # git repo

diff --git a/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml b/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml
index 666ed3f..1aa1f9c 100644 (file)
--- a/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml
+++ b/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _e2mgr_docker_common: &e2mgr_docker_common
+- e2mgr_docker_common: &e2mgr_docker_common
     # values apply to all E2MGR docker projects
     name: e2mgr-docker-common
     # git repo

diff --git a/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml b/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
index 6542c84..3a3687a 100644 (file)
--- a/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
+++ b/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
@@ -14,7 +14,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _rmr_common: &rmr_common
+- rmr_common: &rmr_common
     name: rmr-common
     # git repo
     project: ric-plt/lib/rmr

diff --git a/jjb/ric-plt-libe2ap/ric-plt-libe2ap.yaml b/jjb/ric-plt-libe2ap/ric-plt-libe2ap.yaml
index 3a88197..520ab78 100644 (file)
--- a/jjb/ric-plt-libe2ap/ric-plt-libe2ap.yaml
+++ b/jjb/ric-plt-libe2ap/ric-plt-libe2ap.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _libe2ap_common: &libe2ap_common
+- libe2ap_common: &libe2ap_common
     name: libe2ap-common
     # git repo
     project: ric-plt/libe2ap

diff --git a/jjb/ric-plt-nodeb-rnib/ric-plt-nodeb-rnib.yaml b/jjb/ric-plt-nodeb-rnib/ric-plt-nodeb-rnib.yaml
index f6659bf..8060cc9 100644 (file)
--- a/jjb/ric-plt-nodeb-rnib/ric-plt-nodeb-rnib.yaml
+++ b/jjb/ric-plt-nodeb-rnib/ric-plt-nodeb-rnib.yaml
@@ -5,7 +5,7 @@
     views:
       - project-view
 
-- _nodeb_rnib_common: &nodeb_rnib_common
+- nodeb_rnib_common: &nodeb_rnib_common
     # values apply to all projects
     name: nodeb-rnib-common
     # git repo

diff --git a/jjb/ric-plt-o1/ric-plt-o1.yaml b/jjb/ric-plt-o1/ric-plt-o1.yaml
index 0b81e3d..853e852 100644 (file)
--- a/jjb/ric-plt-o1/ric-plt-o1.yaml
+++ b/jjb/ric-plt-o1/ric-plt-o1.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _o1_docker_common: &o1_docker_common
+- o1_docker_common: &o1_docker_common
     # values apply to all docker projects
     name: o1-docker-common
     # git repo

diff --git a/jjb/ric-plt-ric-dep/ric-plt-ric-dep.yaml b/jjb/ric-plt-ric-dep/ric-plt-ric-dep.yaml
index e418739..89b48cf 100644 (file)
--- a/jjb/ric-plt-ric-dep/ric-plt-ric-dep.yaml
+++ b/jjb/ric-plt-ric-dep/ric-plt-ric-dep.yaml
@@ -5,7 +5,7 @@
     views:
       - project-view
 
-- _dep_common: &dep_common
+- dep_common: &dep_common
     name: dep-common
     # git repo
     project: ric-plt/ric-dep

diff --git a/jjb/ric-plt-ricdms/ric-plt-ricdms.yaml b/jjb/ric-plt-ricdms/ric-plt-ricdms.yaml
index cc6cb82..f4c5a6f 100644 (file)
--- a/jjb/ric-plt-ricdms/ric-plt-ricdms.yaml
+++ b/jjb/ric-plt-ricdms/ric-plt-ricdms.yaml
@@ -5,7 +5,7 @@
     views:
       - project-view
 
-- _ricdms_common: &ricdms_common
+- ricdms_common: &ricdms_common
     # values apply to all projects
     name: ricdms-common
     # git repo
@@ -51,4 +51,4 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - '{project-name}-gerrit-release-jobs'
\ No newline at end of file

diff --git a/jjb/ric-plt-rtmgr/ric-plt-rtmgr.yaml b/jjb/ric-plt-rtmgr/ric-plt-rtmgr.yaml
index dc7b73a..d958997 100644 (file)
--- a/jjb/ric-plt-rtmgr/ric-plt-rtmgr.yaml
+++ b/jjb/ric-plt-rtmgr/ric-plt-rtmgr.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _rtmgr_docker_common: &rtmgr_docker_common
+- rtmgr_docker_common: &rtmgr_docker_common
     # values apply to all rtmgr docker projects
     name: rtmgr-docker-common
     # git repo
@@ -76,3 +76,4 @@
         sonar.exclusions=cmd/**.go,pkg/stub/**.go,pkg/**/**_test.go
     jobs:
       - gerrit-sonar-prescan-script
+

diff --git a/jjb/ric-plt-sdl/ric-plt-sdl.yaml b/jjb/ric-plt-sdl/ric-plt-sdl.yaml
index 969d937..f242545 100644 (file)
--- a/jjb/ric-plt-sdl/ric-plt-sdl.yaml
+++ b/jjb/ric-plt-sdl/ric-plt-sdl.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _sdl_common: &sdl_common
+- sdl_common: &sdl_common
     # values apply to all ric-plt/sdl projects
     name: sdl-common
     # git repo
@@ -37,7 +37,7 @@
           branch: master
 
 # common settings for building DEB and RPM packages
-- _sdl_pkg_common: &sdl_pkg_common
+- sdl_pkg_common: &sdl_pkg_common
     name: ric-plt-pkg-cmn
     pre-build: !include-raw-escape: setup-sdl-build-deb.sh
     # directory with package files

diff --git a/jjb/ric-plt-sdlgo/ric-plt-sdlgo.yaml b/jjb/ric-plt-sdlgo/ric-plt-sdlgo.yaml
index 60ae371..41592ab 100644 (file)
--- a/jjb/ric-plt-sdlgo/ric-plt-sdlgo.yaml
+++ b/jjb/ric-plt-sdlgo/ric-plt-sdlgo.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _sdlgo_docker_common: &sdlgo_docker_common
+- sdlgo_docker_common: &sdlgo_docker_common
     # values apply to all sdlgo docker projects
     name: sdlgo-docker-common
     # git repo

diff --git a/jjb/ric-plt-sdlpy/ric-plt-sdlpy.yaml b/jjb/ric-plt-sdlpy/ric-plt-sdlpy.yaml
index 7228942..59b206a 100644 (file)
--- a/jjb/ric-plt-sdlpy/ric-plt-sdlpy.yaml
+++ b/jjb/ric-plt-sdlpy/ric-plt-sdlpy.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _sdlpy_common: &sdlpy_common
+- sdlpy_common: &sdlpy_common
     name: sdlpy-common
     # git repo
     project: ric-plt/sdlpy

diff --git a/jjb/ric-plt-streaming-protobufs/ric-plt-streaming-protobufs.yaml b/jjb/ric-plt-streaming-protobufs/ric-plt-streaming-protobufs.yaml
index 46ec306..11c2d6a 100644 (file)
--- a/jjb/ric-plt-streaming-protobufs/ric-plt-streaming-protobufs.yaml
+++ b/jjb/ric-plt-streaming-protobufs/ric-plt-streaming-protobufs.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _streaming-protobufs_docker_common: &streaming-protobufs_docker_common
+- streaming-protobufs_docker_common: &streaming-protobufs_docker_common
     # values apply to all streaming-protobufs docker projects
     name: streaming-protobufs-docker-common
     # git repo
@@ -76,3 +76,4 @@
     build-node: centos7-docker-2c-8g
     jobs:
       - '{project-name}-gerrit-release-jobs'
+

diff --git a/jjb/ric-plt-submgr/ric-plt-submgr.yaml b/jjb/ric-plt-submgr/ric-plt-submgr.yaml
index dd04134..f6605e9 100644 (file)
--- a/jjb/ric-plt-submgr/ric-plt-submgr.yaml
+++ b/jjb/ric-plt-submgr/ric-plt-submgr.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _submgr_docker_common: &submgr_docker_common
+- submgr_docker_common: &submgr_docker_common
     # values apply to all submgr docker projects
     name: submgr-docker-common
     # git repo
@@ -75,3 +75,4 @@
     build-node: centos7-docker-2c-8g
     jobs:
       - '{project-name}-gerrit-release-jobs'
+

diff --git a/jjb/ric-plt-tracelibcpp/ric-plt-tracelibcpp.yaml b/jjb/ric-plt-tracelibcpp/ric-plt-tracelibcpp.yaml
index 20d0b67..a1b306a 100644 (file)
--- a/jjb/ric-plt-tracelibcpp/ric-plt-tracelibcpp.yaml
+++ b/jjb/ric-plt-tracelibcpp/ric-plt-tracelibcpp.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _tracelibcpp_common: &tracelibcpp_common
+- tracelibcpp_common: &tracelibcpp_common
     name: tracelibcpp-common
     # git  repo
     project: ric-plt/tracelibcpp

diff --git a/jjb/ric-plt-tracelibgo/ric-plt-tracelibgo.yaml b/jjb/ric-plt-tracelibgo/ric-plt-tracelibgo.yaml
index 7da3445..06a4281 100644 (file)
--- a/jjb/ric-plt-tracelibgo/ric-plt-tracelibgo.yaml
+++ b/jjb/ric-plt-tracelibgo/ric-plt-tracelibgo.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _tracelibgo_docker_common: &tracelibgo_docker_common
+- tracelibgo_docker_common: &tracelibgo_docker_common
     # values apply to all tracelibgo docker projects
     name: tracelibgo-docker-common
     # git repo

diff --git a/jjb/ric-plt-utils/ric-plt-utils.yaml b/jjb/ric-plt-utils/ric-plt-utils.yaml
index a50251c..3735fc6 100644 (file)
--- a/jjb/ric-plt-utils/ric-plt-utils.yaml
+++ b/jjb/ric-plt-utils/ric-plt-utils.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _utils_common: &utils_common
+- utils_common: &utils_common
     name: utils-common
     # git repo
     project: ric-plt/utils

diff --git a/jjb/ric-plt-vespamgr/ric-plt-vespamgr.yaml b/jjb/ric-plt-vespamgr/ric-plt-vespamgr.yaml
index 7401c8b..5c9bb2e 100644 (file)
--- a/jjb/ric-plt-vespamgr/ric-plt-vespamgr.yaml
+++ b/jjb/ric-plt-vespamgr/ric-plt-vespamgr.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _vespamgr_docker_common: &vespamgr_docker_common
+- vespamgr_docker_common: &vespamgr_docker_common
     # values apply to all vespamgr docker projects
     name: vespamgr-docker-common
     # git repo
@@ -75,3 +75,4 @@
     build-node: centos7-docker-2c-8g
     jobs:
       - '{project-name}-gerrit-release-jobs'
+

diff --git a/jjb/ric-plt-xapp-frame-cpp/ric-plt-xapp-frame-cpp.yaml b/jjb/ric-plt-xapp-frame-cpp/ric-plt-xapp-frame-cpp.yaml
index 41e9d43..f40a99e 100644 (file)
--- a/jjb/ric-plt-xapp-frame-cpp/ric-plt-xapp-frame-cpp.yaml
+++ b/jjb/ric-plt-xapp-frame-cpp/ric-plt-xapp-frame-cpp.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _xapp_frame_cpp_common: &xapp_frame_cpp_common
+- xapp_frame_cpp_common: &xapp_frame_cpp_common
     name: xapp-frame-cpp-common
     # git repo
     project: ric-plt/xapp-frame-cpp

diff --git a/jjb/ric-plt-xapp-frame-py/ric-plt-xapp-frame-py.yaml b/jjb/ric-plt-xapp-frame-py/ric-plt-xapp-frame-py.yaml
index 451cbdd..8fb5807 100644 (file)
--- a/jjb/ric-plt-xapp-frame-py/ric-plt-xapp-frame-py.yaml
+++ b/jjb/ric-plt-xapp-frame-py/ric-plt-xapp-frame-py.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _py_common: &py_common
+- py_common: &py_common
     name: xapp-frame-py-common
     # git repo
     project: ric-plt/xapp-frame-py

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
index fb5a8fd..108261b 100644 (file)
--- 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
@@ -14,7 +14,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _xapp_frame_rust_docker_common: &xapp_frame_rust_docker_common
+- xapp_frame_rust_docker_common: &xapp_frame_rust_docker_common
     # values apply to all xapp-frame docker projects
     name: xapp-frame-rust-docker-common
     # git repo

diff --git a/jjb/ric-plt-xapp-frame/ric-plt-xapp-frame.yaml b/jjb/ric-plt-xapp-frame/ric-plt-xapp-frame.yaml
index f02e383..b9b7b09 100644 (file)
--- a/jjb/ric-plt-xapp-frame/ric-plt-xapp-frame.yaml
+++ b/jjb/ric-plt-xapp-frame/ric-plt-xapp-frame.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _xapp_frame_docker_common: &xapp_frame_docker_common
+- xapp_frame_docker_common: &xapp_frame_docker_common
     # values apply to all xapp-frame docker projects
     name: xapp-frame-docker-common
     # git repo

diff --git a/jjb/scp-ric-app-kpimon/scp-ric-app-kpimon.yaml b/jjb/scp-ric-app-kpimon/scp-ric-app-kpimon.yaml
index 3747271..b7bdc5f 100644 (file)
--- a/jjb/scp-ric-app-kpimon/scp-ric-app-kpimon.yaml
+++ b/jjb/scp-ric-app-kpimon/scp-ric-app-kpimon.yaml
@@ -5,7 +5,7 @@
     views:
       - project-view
 
-- _kpimon_common: &kpimon_common
+- kpimon_common: &kpimon_common
     # values apply to all projects
     name: kpimon-common
     # git repo

diff --git a/jjb/sim-a1-interface/sim-a1-interface.yaml b/jjb/sim-a1-interface/sim-a1-interface.yaml
index 98e6db0..ab3d017 100644 (file)
--- a/jjb/sim-a1-interface/sim-a1-interface.yaml
+++ b/jjb/sim-a1-interface/sim-a1-interface.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _sim_a1_interface_common: &sim_a1_interface_common
+- sim_a1_interface_common: &sim_a1_interface_common
     # values apply to all projects here
     name: sim-a1-interface-common
     # git repo

diff --git a/jjb/sim-e2-interface/sim-e2-interface.yaml b/jjb/sim-e2-interface/sim-e2-interface.yaml
index dd2e789..43fd59d 100644 (file)
--- a/jjb/sim-e2-interface/sim-e2-interface.yaml
+++ b/jjb/sim-e2-interface/sim-e2-interface.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _sim_e2_interface_common: &sim_e2_interface_common
+- sim_e2_interface_common: &sim_e2_interface_common
     # values apply to all projects here
     name: sim-e2-interface-common
     # git repo

diff --git a/jjb/sim-o1-interface/sim-o1-interface.yaml b/jjb/sim-o1-interface/sim-o1-interface.yaml
index d173fe2..e549ef8 100644 (file)
--- a/jjb/sim-o1-interface/sim-o1-interface.yaml
+++ b/jjb/sim-o1-interface/sim-o1-interface.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _sim_o1_interface_docker: &sim_o1_interface_docker
+- sim_o1_interface_docker: &sim_o1_interface_docker
     # values apply to all sim/o1-interface docker projects
     name: sim-o1-interface-common
     # git repo

diff --git a/jjb/smo-o1/smo-o1.yaml b/jjb/smo-o1/smo-o1.yaml
index de77260..04b9ef5 100644 (file)
--- a/jjb/smo-o1/smo-o1.yaml
+++ b/jjb/smo-o1/smo-o1.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _smo_o1_common: &smo_o1_common
+- smo_o1_common: &smo_o1_common
     # values apply to all projects
     name: smo-o1-common
     # git repo

diff --git a/jjb/smo-o2/smo-o2.yaml b/jjb/smo-o2/smo-o2.yaml
index 1c5d44f..409a386 100644 (file)
--- a/jjb/smo-o2/smo-o2.yaml
+++ b/jjb/smo-o2/smo-o2.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _smo_o2_common: &smo_o2_common
+- smo_o2_common: &smo_o2_common
     # values apply to all projects
     name: smo-o2-common
     # git repo

diff --git a/jjb/smo-ves/smo-ves.yaml b/jjb/smo-ves/smo-ves.yaml
index 99b72ab..bb34461 100644 (file)
--- a/jjb/smo-ves/smo-ves.yaml
+++ b/jjb/smo-ves/smo-ves.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _ves_docker_common: &ves_docker_common
+- ves_docker_common: &ves_docker_common
     # values apply to all docker projects
     name: ves-docker-common
     # git repo