Refactor: JJB code 36/11036/5
authorAnil Belur <abelur@linuxfoundation.org>
Sun, 7 May 2023 02:39:38 +0000 (12:39 +1000)
committerAnil Belur <abelur@linuxfoundation.org>
Wed, 10 May 2023 00:46:29 +0000 (10:46 +1000)
- Fix shellcheck errors: SC1090, SC2164 and warnings
- Refactor yaml to standardize it across the repo with prettier
- Refactor with yamllint

Change-Id: Ie36c4a3af173fa3609cd4e904775be54b4a56990
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
163 files changed:
.yamllint.conf [deleted file]
README.md
jenkins-config/managed-config-files/custom/.packagecloud/config-params.yaml
jenkins-config/managed-config-files/custom/.packagecloud/customizedCredentialMappings.yaml
jenkins-config/managed-config-files/custom/clouds-yaml/config-params.yaml
jenkins-config/managed-config-files/custom/clouds-yaml/customizedCredentialMappings.yaml
jenkins-config/managed-config-files/custom/jjbini/config-params.yaml
jenkins-config/managed-config-files/custom/jjbini/customizedCredentialMappings.yaml
jenkins-config/managed-config-files/custom/lftoolsini/config-params.yaml
jenkins-config/managed-config-files/custom/lftoolsini/customizedCredentialMappings.yaml
jenkins-config/managed-config-files/custom/npmrc/config-params.yaml
jenkins-config/managed-config-files/custom/packagecloud-account/config-params.yaml
jenkins-config/managed-config-files/custom/packagecloud_api/config-params.yaml
jenkins-config/managed-config-files/custom/packagecloud_api/customizedCredentialMappings.yaml
jenkins-config/managed-config-files/custom/packer-cloud-env/config-params.yaml
jenkins-config/managed-config-files/custom/packer-cloud-env/customizedCredentialMappings.yaml
jenkins-config/managed-config-files/custom/pipconf/config-params.yaml
jenkins-config/managed-config-files/custom/pypirc/config-params.yaml
jenkins-config/managed-config-files/custom/pypirc/customizedCredentialMappings.yaml
jenkins-config/managed-config-files/custom/signing-pubkey/config-params.yaml
jenkins-config/managed-config-files/custom/signing-pubkey/customizedCredentialMappings.yaml
jenkins-config/managed-config-files/custom/sigul-config/config-params.yaml
jenkins-config/managed-config-files/custom/sigul-config/customizedCredentialMappings.yaml
jenkins-config/managed-config-files/custom/sigul-password/config-params.yaml
jenkins-config/managed-config-files/custom/sigul-password/customizedCredentialMappings.yaml
jenkins-config/managed-config-files/custom/sigul-pki/config-params.yaml
jenkins-config/managed-config-files/custom/sigul-pki/customizedCredentialMappings.yaml
jenkins-config/managed-config-files/globalMavenSettings/global-settings/config-params.yaml
jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-ips-kserve-adapter/config-params.yaml
jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-ips-kserve-adapter/serverCredentialMappings.yaml
jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter-settings/config-params.yaml
jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter-settings/serverCredentialMappings.yaml
jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction-settings/config-params.yaml
jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction-settings/serverCredentialMappings.yaml
jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-feature-store-settings/config-params.yaml
jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-feature-store-settings/serverCredentialMappings.yaml
jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-model-storage-settings/config-params.yaml
jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-sdk-model-storage-settings/serverCredentialMappings.yaml
jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-tps-kubeflow-adapter-settings/config-params.yaml
jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-tps-kubeflow-adapter-settings/serverCredentialMappings.yaml
jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-tm-settings/config-params.yaml
jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-tm-settings/serverCredentialMappings.yaml
jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-ranpm/config-params.yaml
jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-ranpm/serverCredentialMappings.yaml
jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-sme-settings/config-params.yaml
jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-sme-settings/serverCredentialMappings.yaml
jenkins-config/managed-config-files/mavenSettings/portal-aiml-dashboard-settings/config-params.yaml
jenkins-config/managed-config-files/mavenSettings/portal-aiml-dashboard-settings/serverCredentialMappings.yaml
jenkins-config/managed-config-files/mavenSettings/ric-app-ad-cell/config-params.yaml
jenkins-config/managed-config-files/mavenSettings/ric-app-ad-cell/serverCredentialMappings.yaml
jenkins-config/managed-config-files/mavenSettings/ric-app-qp-aimlfw-settings/config-params.yaml
jenkins-config/managed-config-files/mavenSettings/ric-app-qp-aimlfw-settings/serverCredentialMappings.yaml
jenkins-config/managed-config-files/openstackUserData/jenkins-init-script/config-params.yaml
jjb/aiml-fw-aihp-ips-kserve-adapter/aiml-fw-aihp-ips-kserve-adapter.yaml
jjb/aiml-fw-aihp-tps-kserve-adapter/aiml-fw-aihp-tps-kserve-adapter.yaml
jjb/aiml-fw-athp-data-extraction/aiml-fw-athp-data-extraction.yaml
jjb/aiml-fw-athp-sdk-feature-store/aiml-fw-athp-sdk-feature-store.yaml
jjb/aiml-fw-athp-sdk-model-storage/aiml-fw-athp-sdk-model-storage.yaml
jjb/aiml-fw-athp-tps-kubeflow-adapter/aiml-fw-athp-tps-kubeflow-adapter.yaml
jjb/aiml-fw-awmf-tm/aiml-fw-awmf-tm.yaml
jjb/aiml-fw/aiml-fw.yaml
jjb/ci-management/ci-docker.yaml
jjb/ci-management/ci-jobs.yaml
jjb/ci-management/ci-packer.yaml
jjb/com-golog/com-golog.yaml
jjb/com-golog/prescan-golog-go-ubuntu.sh
jjb/com-gs-lite/prescan-com-gs-lite-ubuntu.sh
jjb/com-log/com-log.yaml
jjb/com-pylog/com-pylog.yaml
jjb/common-views.yaml
jjb/defaults.yaml
jjb/it-dep/it-dep.yaml
jjb/it-dev/it-dev-docker.yaml
jjb/it-dev/it-dev.yaml
jjb/it-otf/it-otf.yaml
jjb/it-test/it-test.yaml
jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml
jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml
jjb/nonrtric-plt-dmaapmediatorproducer/nonrtric-plt-dmaapmediatorproducer.yaml
jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml
jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml
jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml
jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
jjb/nonrtric-plt-sdnca1controller/nonrtric-plt-sdnca1controller.yaml
jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
jjb/nonrtric-rapp-healthcheck/nonrtric-rapp-healthcheck.yaml
jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml
jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml
jjb/nonrtric-rapp-ransliceassurance/sonar-project.properties
jjb/nonrtric/nonrtric.yaml
jjb/o-du-l2/o-du-l2.yaml
jjb/o-du-phy/o-du-phy.yaml
jjb/oam-nf-oam-adopter/oam-nf-adopter.yaml
jjb/oam-tr069-adapter/oam-tr069-adapter.yaml
jjb/oran-templates/oran-shell-jobs.yaml
jjb/portal-aiml-dashboard/portal-aiml-dashboard.yaml
jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
jjb/pti-o2/pti-o2.yaml
jjb/pti-rtp/install-yocto-prereq-centos.sh
jjb/pti-rtp/pti-rtp.yaml
jjb/pti-rtp/upload-inf.sh
jjb/ric-app-ad-cell/ric-app-ad-cell.yaml
jjb/ric-app-ad/ric-app-ad.yaml
jjb/ric-app-bouncer/ric-app-bouncer.yaml
jjb/ric-app-hw-go/ric-app-hw-go.yaml
jjb/ric-app-hw-python/ric-app-hw-python.yaml
jjb/ric-app-hw-rust/ric-app-hw-rust.yaml
jjb/ric-app-hw/ric-app-hw.yaml
jjb/ric-app-kpimon-go/ric-app-kpimon-go.yaml
jjb/ric-app-lp/ric-app-lp.yaml
jjb/ric-app-mc/ric-app-mc.yaml
jjb/ric-app-qp-aimlfw/prescan-ric-app-qp-aimlfw-ubuntu.sh
jjb/ric-app-qp-aimlfw/ric-app-qp-aimlfw.yaml
jjb/ric-app-qp/ric-app-qp.yaml
jjb/ric-app-rc/ric-app-rc.yaml
jjb/ric-app-ts/ric-app-ts.yaml
jjb/ric-plt-a1/ric-plt-a1.yaml
jjb/ric-plt-alarm-go/ric-plt-alarm-go.yaml
jjb/ric-plt-appmgr/prescan-ric-plt-appmgr-ubuntu.sh
jjb/ric-plt-appmgr/ric-plt-appmgr.yaml
jjb/ric-plt-dbaas/ric-plt-dbaas.yaml
jjb/ric-plt-dbaas/setup-dbaas-build-deb.sh
jjb/ric-plt-e2/ric-plt-e2.yaml
jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml
jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
jjb/ric-plt-libe2ap/ric-plt-libe2ap.yaml
jjb/ric-plt-nodeb-rnib/ric-plt-nodeb-rnib.yaml
jjb/ric-plt-o1/ric-plt-o1.yaml
jjb/ric-plt-ric-dep/ric-plt-ric-dep.yaml
jjb/ric-plt-ricdms/ric-plt-ricdms.yaml
jjb/ric-plt-rtmgr/ric-plt-rtmgr.yaml
jjb/ric-plt-sdl/ric-plt-sdl.yaml
jjb/ric-plt-sdlgo/prescan-sdlgo-go-ubuntu.sh
jjb/ric-plt-sdlgo/ric-plt-sdlgo.yaml
jjb/ric-plt-sdlpy/ric-plt-sdlpy.yaml
jjb/ric-plt-streaming-protobufs/prescan-ric-plt-streaming-protobufs-ubuntu.sh
jjb/ric-plt-streaming-protobufs/ric-plt-streaming-protobufs.yaml
jjb/ric-plt-submgr/prescan-ric-plt-submgr-ubuntu.sh
jjb/ric-plt-submgr/ric-plt-submgr.yaml
jjb/ric-plt-tracelibcpp/ric-plt-tracelibcpp.yaml
jjb/ric-plt-tracelibgo/ric-plt-tracelibgo.yaml
jjb/ric-plt-utils/cmake-sonarqube.sh
jjb/ric-plt-utils/ric-plt-utils.yaml
jjb/ric-plt-vespamgr/prescan-ric-plt-vespamgr-ubuntu.sh
jjb/ric-plt-vespamgr/ric-plt-vespamgr.yaml
jjb/ric-plt-xapp-frame-cpp/ric-plt-xapp-frame-cpp.yaml
jjb/ric-plt-xapp-frame-py/ric-plt-xapp-frame-py.yaml
jjb/ric-plt-xapp-frame-rust/ric-plt-xapp-frame-rust.yaml
jjb/ric-plt-xapp-frame/prescan-ric-plt-xapp-frame-ubuntu.sh
jjb/ric-plt-xapp-frame/ric-plt-xapp-frame.yaml
jjb/rtdv3/rtdv3.yaml
jjb/scp-ric-app-kpimon/scp-ric-app-kpimon.yaml
jjb/shell/install-deb-e2ap.sh
jjb/shell/install-deb-rmr.sh
jjb/sim-a1-interface/sim-a1-interface.yaml
jjb/sim-e2-interface/sim-e2-interface.yaml
jjb/sim-ns3-o-ran-e2/sim-ns3-o-ran-e2.yaml
jjb/sim-o1-interface/sim-o1-interface.yaml
jjb/smo-o1/smo-o1.yaml
jjb/smo-o2/smo-o2.yaml
jjb/smo-ves/smo-ves.yaml
packer/README.md
packer/provision/local-docker.yaml

diff --git a/.yamllint.conf b/.yamllint.conf
deleted file mode 100644 (file)
index b821cb8..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-extends: default
-
-rules:
-  empty-lines:
-    max-end: 1
-  line-length:
-    max: 120
index e4b821f..2f70774 100644 (file)
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ are defined in the defaults.yaml file.
 
 Custom JJB templates are defined for projects that use Docker to
 compile code and build DEB/RPM packages, then push the packages to
-PackageCloud.io.  These projects should use the following jobs in
+PackageCloud.io. These projects should use the following jobs in
 their respective project.yaml file::
 
     jobs:
@@ -22,7 +22,7 @@ their respective project.yaml file::
 ## Testing the templates
 
 These instructions explain how to test the templates using the Jenkins
-sandbox.  This catches errors before submitting the changes as Gerrit
+sandbox. This catches errors before submitting the changes as Gerrit
 reviews.
 
 ### Prerequisites
@@ -49,10 +49,10 @@ oran-jenkins-sandbox-access) at the Jenkins sandbox:
     https://jenkins.o-ran-sc.org/sandbox
 
 Get the authentication token from the sandbox:
-    a) click on your user name (top right)
-    b) click Configure (left menu)
-    c) under API Token, click Add new Token (button)
-    d) copy the token string
+a) click on your user name (top right)
+b) click Configure (left menu)
+c) under API Token, click Add new Token (button)
+d) copy the token string
 
 Create a config file jenkins.ini using the following template and your
 credentials (user name and API token from above)::
@@ -82,13 +82,13 @@ parameters" in left menu.
 ### How to build from a Gerrit review branch
 
 This explains how to launch a "verify" job in the Sandbox on an open
-review.  Most "verify" jobs accept parameters to build code in a
-review submitted to Gerrit.  You must specify the change ref spec,
-which is a Git branch name.  Get this by inspecting Gerrit's
-"download" links at the top right.  The branch name will be something
+review. Most "verify" jobs accept parameters to build code in a
+review submitted to Gerrit. You must specify the change ref spec,
+which is a Git branch name. Get this by inspecting Gerrit's
+"download" links at the top right. The branch name will be something
 like this:
 
-       refs/changes/78/578/2
+    refs/changes/78/578/2
 
 The first number is a mystery to me; the second number is the Gerrit
 change number; the third number is the patch set within the change.
index 84a8970..998b4b5 100644 (file)
@@ -1,3 +1,3 @@
 ---
 name: ".packagecloud"
-comment: "packagecloud credentials to publish packages"
\ No newline at end of file
+comment: "packagecloud credentials to publish packages"
index 87d04b4..cb9cdaf 100644 (file)
@@ -3,4 +3,4 @@ customizedCredentialMappings:
   - credentialsId: "jobbuilder-prod"
     tokenKey: "JOBBUILDER_PROD"
   - credentialsId: "jobbuilder-sandbox"
-    tokenKey: "JOBBUILDER_SANDBOX"
\ No newline at end of file
+    tokenKey: "JOBBUILDER_SANDBOX"
index e9bd9d2..e5f1ff9 100644 (file)
@@ -5,4 +5,4 @@ customizedCredentialMappings:
   - credentialsId: "lftoolsini-nexus"
     tokenKey: "LFTOOLSINI_NEXUS"
   - credentialsId: "lftoolsini-nexus-oran-sc"
-    tokenKey: "LFTOOLSINI_NEXUS_ORAN_SC"
\ No newline at end of file
+    tokenKey: "LFTOOLSINI_NEXUS_ORAN_SC"
index a0f796d..bf12e8c 100644 (file)
@@ -3,4 +3,4 @@ customizedCredentialMappings:
   - credentialsId: "pypi-release"
     tokenKey: "PYPI_RELEASE"
   - credentialsId: "pypi-test"
-    tokenKey: "PYPI_TEST"
\ No newline at end of file
+    tokenKey: "PYPI_TEST"
index d2832cf..1093310 100644 (file)
@@ -15,4 +15,4 @@ serverCredentialMappings:
   - serverId: "nexus3.o-ran-sc.org:10003"
     credentialsId: "aiml-fw-aihp-ips-kserve-adapter"
   - serverId: "nexus3.o-ran-sc.org:10004"
-    credentialsId: "aiml-fw-aihp-ips-kserve-adapter"
\ No newline at end of file
+    credentialsId: "aiml-fw-aihp-ips-kserve-adapter"
index 300e05a..dfc68f7 100644 (file)
@@ -15,4 +15,4 @@ serverCredentialMappings:
   - serverId: "nexus3.o-ran-sc.org:10003"
     credentialsId: "aiml-fw-aihp-tps-kserve-adapter"
   - serverId: "nexus3.o-ran-sc.org:10004"
-    credentialsId: "aiml-fw-aihp-tps-kserve-adapter"
\ No newline at end of file
+    credentialsId: "aiml-fw-aihp-tps-kserve-adapter"
index 1e9edf1..65cd8ac 100644 (file)
@@ -15,4 +15,4 @@ serverCredentialMappings:
   - serverId: "nexus3.o-ran-sc.org:10003"
     credentialsId: "aiml-fw-athp-data-extraction"
   - serverId: "nexus3.o-ran-sc.org:10004"
-    credentialsId: "aiml-fw-athp-data-extraction"
\ No newline at end of file
+    credentialsId: "aiml-fw-athp-data-extraction"
index d4a91f1..5a5a31e 100644 (file)
@@ -15,4 +15,4 @@ serverCredentialMappings:
   - serverId: "nexus3.o-ran-sc.org:10003"
     credentialsId: "aiml-fw-athp-sdk-feature-store"
   - serverId: "nexus3.o-ran-sc.org:10004"
-    credentialsId: "aiml-fw-athp-sdk-feature-store"
\ No newline at end of file
+    credentialsId: "aiml-fw-athp-sdk-feature-store"
index 6329502..bb1cb67 100644 (file)
@@ -15,4 +15,4 @@ serverCredentialMappings:
   - serverId: "nexus3.o-ran-sc.org:10003"
     credentialsId: "aiml-fw-athp-sdk-model-storage"
   - serverId: "nexus3.o-ran-sc.org:10004"
-    credentialsId: "aiml-fw-athp-sdk-model-storage"
\ No newline at end of file
+    credentialsId: "aiml-fw-athp-sdk-model-storage"
index dffdc89..448083f 100644 (file)
@@ -15,4 +15,4 @@ serverCredentialMappings:
   - serverId: "nexus3.o-ran-sc.org:10003"
     credentialsId: "aiml-fw-athp-tps-kubeflow-adapter"
   - serverId: "nexus3.o-ran-sc.org:10004"
-    credentialsId: "aiml-fw-athp-tps-kubeflow-adapter"
\ No newline at end of file
+    credentialsId: "aiml-fw-athp-tps-kubeflow-adapter"
index b8e02d2..5a0cef4 100644 (file)
@@ -15,4 +15,4 @@ serverCredentialMappings:
   - serverId: "nexus3.o-ran-sc.org:10003"
     credentialsId: "aiml-fw-awmf-tm"
   - serverId: "nexus3.o-ran-sc.org:10004"
-    credentialsId: "aiml-fw-awmf-tm"
\ No newline at end of file
+    credentialsId: "aiml-fw-awmf-tm"
index c0d2598..c046c4b 100644 (file)
@@ -15,4 +15,4 @@ serverCredentialMappings:
   - serverId: "nexus3.o-ran-sc.org:10003"
     credentialsId: "nonrtric-plt-ranpm"
   - serverId: "nexus3.o-ran-sc.org:10004"
-    credentialsId: "nonrtric-plt-ranpm"
\ No newline at end of file
+    credentialsId: "nonrtric-plt-ranpm"
index 29dbfdc..1787bb9 100644 (file)
@@ -15,4 +15,4 @@ serverCredentialMappings:
   - serverId: "nexus3.o-ran-sc.org:10003"
     credentialsId: "nonrtric-plt-sme"
   - serverId: "nexus3.o-ran-sc.org:10004"
-    credentialsId: "nonrtric-plt-sme"
\ No newline at end of file
+    credentialsId: "nonrtric-plt-sme"
index 6f85f16..e08df25 100644 (file)
@@ -15,4 +15,4 @@ serverCredentialMappings:
   - serverId: "nexus3.o-ran-sc.org:10003"
     credentialsId: "portal-aiml-dashboard"
   - serverId: "nexus3.o-ran-sc.org:10004"
-    credentialsId: "portal-aiml-dashboard"
\ No newline at end of file
+    credentialsId: "portal-aiml-dashboard"
index 6799801..badf592 100644 (file)
@@ -15,4 +15,4 @@ serverCredentialMappings:
   - serverId: "nexus3.o-ran-sc.org:10003"
     credentialsId: "ric-app-ad-cell"
   - serverId: "nexus3.o-ran-sc.org:10004"
-    credentialsId: "ric-app-ad-cell"
\ No newline at end of file
+    credentialsId: "ric-app-ad-cell"
index b90cef9..07c66c7 100644 (file)
@@ -15,4 +15,4 @@ serverCredentialMappings:
   - serverId: "nexus3.o-ran-sc.org:10003"
     credentialsId: "ric-app-qp-aimlfw"
   - serverId: "nexus3.o-ran-sc.org:10004"
-    credentialsId: "ric-app-qp-aimlfw"
\ No newline at end of file
+    credentialsId: "ric-app-qp-aimlfw"
index 9a9c767..4ca1aad 100644 (file)
@@ -12,4 +12,4 @@
     build-node: centos7-builder-1c-1g
     branch: master
     jobs:
-      - gerrit-info-yaml-verify
\ No newline at end of file
+      - gerrit-info-yaml-verify
index 118779f..c66ef76 100644 (file)
@@ -12,4 +12,4 @@
     build-node: centos7-builder-1c-1g
     branch: master
     jobs:
-      - gerrit-info-yaml-verify
\ No newline at end of file
+      - gerrit-info-yaml-verify
index d758041..c497f92 100644 (file)
@@ -14,8 +14,8 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _aiml_de_docker_common: &aiml_de_docker_common
-    # values apply to all training manager projects
+- _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
     project: aiml-fw/athp/data-extraction
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 
 - project:
     <<: *aiml_de_docker_common
     name: aiml-fw-athp-data-extraction-docker
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # Dockerfile is in a subdir
-    docker-root: '.'
+    docker-root: "."
     # source of docker tag
     # dockerfile is in subdir of docker root
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     container-tag-method: yaml-file
     build-node: ubuntu1804-docker-4c-4g
     jobs:
     python-version: python3
     # skip docs on verify
     tox-envs: code
-    tox-dir: '.'
+    tox-dir: "."
     # do not trigger on changes in docs, releases
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'dataextraction/.*'
+        pattern: "dataextraction/.*"
     stream:
       # run verify on all branches
       # the ANT pattern is **/{branch}, we are exploiting that.
     <<: *aiml_de_docker_common
     name: aiml-fw-athp-data-extraction-sonarqube
     python-version: python3
-    tox-dir: '.'
+    tox-dir: "."
     # the install script assumes an ubuntu image
     build-node: ubuntu1804-builder-2c-2g
     # do not trigger on changes in docs, releases
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'dataextraction/.*'
+        pattern: "dataextraction/.*"
     sonar-project-file: ""
     sonar-properties: |
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        sonar.build.sourceEncoding=UTF-8
-        sonar.sources=dataextraction
-        sonar.python.coverage.reportPaths=coverage.xml
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      sonar.build.sourceEncoding=UTF-8
+      sonar.sources=dataextraction
+      sonar.python.coverage.reportPaths=coverage.xml
     jobs:
       - gerrit-tox-sonarqube
index 6a05800..218c608 100644 (file)
@@ -14,8 +14,8 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _aiml_fssdk_docker_common: &aiml_fssdk_docker_common
-    # values apply to all training manager projects
+- _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
     project: aiml-fw/athp/sdk/feature-store
     python-version: python3
     # skip docs on verify
     tox-envs: code
-    tox-dir: '.'
+    tox-dir: "."
     # do not trigger on changes in docs, releases
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'featurestoresdk/.*'
+        pattern: "featurestoresdk/.*"
     stream:
       # run verify on all branches
       # the ANT pattern is **/{branch}, we are exploiting that.
     <<: *aiml_fssdk_docker_common
     name: aiml-fw-athp-sdk-feature-store-sonarqube
     python-version: python3
-    tox-dir: '.'
+    tox-dir: "."
     # the install script assumes an ubuntu image
     build-node: ubuntu1804-builder-2c-2g
     # do not trigger on changes in docs, releases
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'featurestoresdk/.*'
+        pattern: "featurestoresdk/.*"
     sonar-project-file: ""
     sonar-properties: |
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        sonar.build.sourceEncoding=UTF-8
-        sonar.sources=featurestoresdk
-        sonar.python.coverage.reportPaths=coverage.xml
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      sonar.build.sourceEncoding=UTF-8
+      sonar.sources=featurestoresdk
+      sonar.python.coverage.reportPaths=coverage.xml
     jobs:
       - gerrit-tox-sonarqube
index d54bc2b..a953755 100644 (file)
@@ -14,8 +14,8 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _aiml_mssdk_docker_common: &aiml_mssdk_docker_common
-    # values apply to all training manager projects
+- _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
     project: aiml-fw/athp/sdk/model-storage
     python-version: python3
     # skip docs on verify
     tox-envs: code
-    tox-dir: '.'
+    tox-dir: "."
     # do not trigger on changes in docs, releases
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'modelmetricsdk/.*'
+        pattern: "modelmetricsdk/.*"
     stream:
       # run verify on all branches
       # the ANT pattern is **/{branch}, we are exploiting that.
     <<: *aiml_mssdk_docker_common
     name: aiml-fw-athp-sdk-model-storage-sonarqube
     python-version: python3
-    tox-dir: '.'
+    tox-dir: "."
     # the install script assumes an ubuntu image
     build-node: ubuntu1804-builder-2c-2g
     # do not trigger on changes in docs, releases
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'modelmetricsdk/.*'
+        pattern: "modelmetricsdk/.*"
     sonar-project-file: ""
     sonar-properties: |
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        sonar.build.sourceEncoding=UTF-8
-        sonar.sources=modelmetricsdk
-        sonar.python.coverage.reportPaths=coverage.xml
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      sonar.build.sourceEncoding=UTF-8
+      sonar.sources=modelmetricsdk
+      sonar.python.coverage.reportPaths=coverage.xml
     jobs:
       - gerrit-tox-sonarqube
index ca92c12..464628a 100644 (file)
@@ -14,8 +14,8 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _aiml_kfc_docker_common: &aiml_kfc_docker_common
-    # values apply to all training manager projects
+- _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
     project: aiml-fw/athp/tps/kubeflow-adapter
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 
 - project:
     <<: *aiml_kfc_docker_common
     name: aiml-fw-athp-tps-kubeflow-adapter-docker
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # Dockerfile is in a subdir
-    docker-root: '.'
+    docker-root: "."
     # source of docker tag
     # dockerfile is in subdir of docker root
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     container-tag-method: yaml-file
     build-node: ubuntu1804-docker-4c-4g
     jobs:
     python-version: python3
     # skip docs on verify
     tox-envs: code
-    tox-dir: '.'
+    tox-dir: "."
     # do not trigger on changes in docs, releases
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'kfadapter/.*'
+        pattern: "kfadapter/.*"
     stream:
       # run verify on all branches
       # the ANT pattern is **/{branch}, we are exploiting that.
     <<: *aiml_kfc_docker_common
     name: aiml-fw-athp-tps-kubeflow-adapter-sonarqube
     python-version: python3
-    tox-dir: '.'
+    tox-dir: "."
     # the install script assumes an ubuntu image
     build-node: ubuntu1804-builder-2c-2g
     # do not trigger on changes in docs, releases
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'kfadapter/.*'
+        pattern: "kfadapter/.*"
     sonar-project-file: ""
     sonar-properties: |
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        sonar.build.sourceEncoding=UTF-8
-        sonar.sources=kfadapter
-        sonar.python.coverage.reportPaths=coverage.xml
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      sonar.build.sourceEncoding=UTF-8
+      sonar.sources=kfadapter
+      sonar.python.coverage.reportPaths=coverage.xml
     jobs:
       - gerrit-tox-sonarqube
index adf8900..8c604e7 100644 (file)
@@ -14,8 +14,8 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _aiml_tm_docker_common: &aiml_tm_docker_common
-    # values apply to all training manager projects
+- _aiml_tm_docker_common:
+    &aiml_tm_docker_common # values apply to all training manager projects
     name: aiml-fw-awmf-tm-docker-common
     # git repo
     project: aiml-fw/awmf/tm
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 
 - project:
     <<: *aiml_tm_docker_common
     name: aiml-fw-awmf-tm-docker
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # Dockerfile is in a subdir
-    docker-root: '.'
+    docker-root: "."
     # source of docker tag
     # dockerfile is in subdir of docker root
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     container-tag-method: yaml-file
     build-node: ubuntu1804-docker-4c-4g
     jobs:
     python-version: python3
     # skip docs on verify
     tox-envs: code
-    tox-dir: '.'
+    tox-dir: "."
     # do not trigger on changes in docs, releases
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'trainingmgr/.*'
+        pattern: "trainingmgr/.*"
     stream:
       # run verify on all branches
       # the ANT pattern is **/{branch}, we are exploiting that.
     <<: *aiml_tm_docker_common
     name: aiml-fw-awmf-tm-sonarqube
     python-version: python3
-    tox-dir: '.'
+    tox-dir: "."
     # the install script assumes an ubuntu image
     build-node: ubuntu1804-builder-2c-2g
     # do not trigger on changes in docs, releases
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'trainingmgr/.*'
+        pattern: "trainingmgr/.*"
     sonar-project-file: ""
     sonar-properties: |
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        sonar.build.sourceEncoding=UTF-8
-        sonar.sources=trainingmgr
-        sonar.python.coverage.reportPaths=coverage.xml
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      sonar.build.sourceEncoding=UTF-8
+      sonar.sources=trainingmgr
+      sonar.python.coverage.reportPaths=coverage.xml
     jobs:
       - gerrit-tox-sonarqube
index aeb6e02..74beea1 100644 (file)
@@ -12,4 +12,4 @@
     build-node: centos7-builder-1c-1g
     branch: master
     jobs:
-      - gerrit-info-yaml-verify
\ No newline at end of file
+      - gerrit-info-yaml-verify
index 7aa82c9..ef5d7d3 100644 (file)
@@ -9,25 +9,25 @@
     # maven settings file has docker credentials
     mvn-settings: ci-management-settings
     # build every Saturday
-    cron: 'H H * * 6'
+    cron: "H H * * 6"
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # get tag from YAML
     container-tag-method: yaml-file
     # name key is overridden by project template
     # Jenkins job prefix
-    project-name: '{project}-{name}'
+    project-name: "{project}-{name}"
     # Docker image name
-    docker-name: '{name}'
+    docker-name: "{name}"
     # Directory with Dockerfile
-    docker-root: 'docker/{name}'
+    docker-root: "docker/{name}"
     # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'docker/{name}/.*'
+        pattern: "docker/{name}/.*"
     # Includes verify and merge jobs
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     # Only build master branch
     stream:
       - master:
index 7c80658..d25ac6f 100644 (file)
@@ -14,7 +14,7 @@
     build-node-label-list: ""
 
     jobs:
-      - 'gerrit-info-yaml-verify'
+      - "gerrit-info-yaml-verify"
       - gerrit-jenkins-cfg-verify
       - gerrit-jenkins-sandbox-cleanup
       - gerrit-jjb-deploy-job
@@ -35,6 +35,6 @@
     <<: *ci_jobs_common
 
     jenkins-urls: >
-        https://jenkins.o-ran-sc.org/
-        https://jenkins.o-ran-sc.org/sandbox
+      https://jenkins.o-ran-sc.org/
+      https://jenkins.o-ran-sc.org/sandbox
     openstack-cloud: vex
index 8c8315d..a7e8f4d 100644 (file)
@@ -16,7 +16,6 @@
 
     <<: *ci_packer_common
 
-
 - project:
     name: packer-builder-jobs
     jobs:
index 9501407..bf1c31a 100644 (file)
@@ -13,8 +13,8 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _golog_docker_common: &golog_docker_common
-    # values apply to all golog docker projects
+- _golog_docker_common:
+    &golog_docker_common # values apply to all golog docker projects
     name: golog-docker-common
     # git repo
     project: com/golog
@@ -28,9 +28,9 @@
     <<: *golog_docker_common
     name: com-golog
     # image name, altho it is never pushed
-    docker-name: '{name}'
+    docker-name: "{name}"
     # use host network
-    docker-build-args: '--network=host -f ci/Dockerfile'
+    docker-build-args: "--network=host -f ci/Dockerfile"
     # image tag; use a fixed value
     container-tag-method: latest
     jobs:
     sonar-project-file: ""
     # use sonarcloud values from defaults.yaml
     sonar-properties: |
-        # Required metadata
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        # Encoding
-        sonar.build.sourceEncoding=UTF-8
-        # Language
-        sonar.language=go
-        # Source
-        sonar.sources=.
-        # Unit tests
-        sonar.go.coverage.reportPaths=**/cover.out
-        # Inclusions
-        sonar.inclusions=**/*.go
-        # Exclusions
-        sonar.exclusions=**/*_test.go
+      # Required metadata
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      # Encoding
+      sonar.build.sourceEncoding=UTF-8
+      # Language
+      sonar.language=go
+      # Source
+      sonar.sources=.
+      # Unit tests
+      sonar.go.coverage.reportPaths=**/cover.out
+      # Inclusions
+      sonar.inclusions=**/*.go
+      # Exclusions
+      sonar.exclusions=**/*_test.go
     jobs:
       - gerrit-sonar-prescan-script
 
@@ -73,4 +73,4 @@
     name: com-golog-go-release
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index dc20070..59b9930 100644 (file)
@@ -44,6 +44,7 @@ export PATH=$GOPATH/bin:$PATH
 export CFG_FILE=../config/config-file.json
 export RMR_SEED_RT=../config/uta_rtg.rt
 
+# shellcheck disable=SC2034
 GO111MODULE=on GO_ENABLED=0 GOOS=linux
 
 # setup version tag
index df5c570..0a443a9 100644 (file)
@@ -3,12 +3,13 @@
 echo "---> cmake-sonarqube.sh starts"
 
 CMAKE_OPTS=
-BUILD_DIR=$WORKSPACE/src
-BUILD_WRAP_DIR=$WORKSPACE/bw-output
+BUILD_DIR="${WORKSPACE}"/src
+BUILD_WRAP_DIR="${WORKSPACE}"/bw-output
 
 
-build_dir="${BUILD_DIR:-$WORKSPACE/build}"
-build_wrap_dir="${BUILD_WRAP_DIR:-$WORKSPACE/bw-output}"
+build_dir="${BUILD_DIR:-${WORKSPACE}/build}"
+build_wrap_dir="${BUILD_WRAP_DIR:-${WORKSPACE}/bw-output}"
+# shellcheck disable=SC2034
 cmake_opts="${CMAKE_OPTS:-}"
 make_opts="${MAKE_OPTS:-}"
 
index 8ea3ce3..f127090 100644 (file)
@@ -13,8 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _com_log_common: &com_log_common
-    # values apply to all com/log projects
+- _com_log_common: &com_log_common # values apply to all com/log projects
     name: com-log-common
     # git repo
     project: com/log
@@ -33,8 +32,8 @@
     make-opts: -j 2 test
     # do not trigger on changes in docs, releases
     gerrit_trigger_file_paths:
-        - compare-type: REG_EXP
-          pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
+      - compare-type: REG_EXP
+        pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
     jobs:
       - gerrit-autotools-verify
     stream:
@@ -59,7 +58,7 @@
     <<: *com_log_common
     <<: *com_log_pkg_common
     name: com-log-deb
-    project-name: '{name}'
+    project-name: "{name}"
     configure-opts: --with-deb-dir={build-dir}
     make-opts: -j4 deb-pkg
 
@@ -68,7 +67,7 @@
     <<: *com_log_common
     <<: *com_log_pkg_common
     name: com-log-rpm
-    project-name: '{name}'
+    project-name: "{name}"
     configure-opts: --with-rpm-dir={build-dir}
     # parallel jobs (option -j) fail on rpm build
     # https://bugzilla.redhat.com/show_bug.cgi?id=1398405
     make-opts: -j4 test_gcov
     sonar-project-file: ""
     sonar-properties: |
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        sonar.build.sourceEncoding=UTF-8
-        sonar.sources=src
-        sonar.cfamily.build-wrapper-output=$WORKSPACE/bw-output
-        sonar.cfamily.cache.enabled=false
-        sonar.cfamily.gcov.reportsPath=gcov_report
-        sonar.cfamily.threads=4
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      sonar.build.sourceEncoding=UTF-8
+      sonar.sources=src
+      sonar.cfamily.build-wrapper-output=$WORKSPACE/bw-output
+      sonar.cfamily.cache.enabled=false
+      sonar.cfamily.gcov.reportsPath=gcov_report
+      sonar.cfamily.threads=4
     jobs:
       - gerrit-autotools-sonarqube
 
index 5f7839c..3de9499 100644 (file)
@@ -32,7 +32,7 @@
     tox-dir: mdclogpy
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'mdclogpy/.*'
+        pattern: "mdclogpy/.*"
     stream:
       - master:
           branch: master
     # source of docker tag
     container-tag-method: yaml-file
     # use host network
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     build-node: centos7-docker-2c-8g
     # do not trigger on changes in docs, releases
 
-
-- _pylog_python: &pylog_python
-    # settings for python builds
+- _pylog_python: &pylog_python # settings for python builds
     name: com-pylog-python
     # the install script assumes an ubuntu image
     build-node: ubuntu1804-builder-2c-2g
@@ -65,7 +63,6 @@
     tox-envs: py3
     tox-dir: mdclogpy
 
-
 # promote package from test.pypi.org to pypi.org
 - project:
     <<: *pylog_python
@@ -76,7 +73,7 @@
       - compare-type: REG_EXP
         pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
     jobs:
-      - '{project-name}-gerrit-pypi-release-jobs'
+      - "{project-name}-gerrit-pypi-release-jobs"
       - gerrit-tox-verify
     stream:
       - master:
     name: com-pylog-sonarqube
     sonar-project-file: ""
     sonar-properties: |
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        sonar.build.sourceEncoding=UTF-8
-        sonar.sources=mdclogpy
-        sonar.python.coverage.reportPaths=$TOX_DIR/coverage.xml
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      sonar.build.sourceEncoding=UTF-8
+      sonar.sources=mdclogpy
+      sonar.python.coverage.reportPaths=$TOX_DIR/coverage.xml
     jobs:
       - gerrit-tox-sonarqube
index 96dbcda..6cae441 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - view:
-    name: '00-Empty View'
+    name: "00-Empty View"
     description: >
       Empty job view. This is used as the default landing view to keep the
       Jenkins UI responding better while a) under high load and b) when there
@@ -9,11 +9,11 @@
     filter-executors: false
     filter-queue: false
     recurse: false
-    regex: ''
+    regex: ""
 
 - view:
     name: CLM
-    description: 'List of CLM jobs'
+    description: "List of CLM jobs"
     view-type: list
     filter-executors: false
     filter-queue: false
@@ -26,4 +26,4 @@
       - last-duration
       - build-button
     recurse: false
-    regex: '.*-clm-.*'
+    regex: ".*-clm-.*"
index a3d48b3..d401488 100644 (file)
@@ -13,7 +13,7 @@
     build-days-to-keep: 30
 
     # pattern for build files to archive
-    archive-artifacts: ''
+    archive-artifacts: ""
 
     # most jobs invoke docker
     build-node: ubuntu1804-docker-4c-4g
     container-staging-registry: nexus3.o-ran-sc.org:10004
     # templates use the push registry key;
     # counter-intuitively, the quotes here are REQUIRED
-    container-push-registry: '{container-staging-registry}'
+    container-push-registry: "{container-staging-registry}"
 
     # Don't define default java version here,
     # it will not be used by lf-maven-jobs.
     # Default maven version
     mvn-version: mvn35
     # Default maven goals
-    mvn-goals: 'clean install'
+    mvn-goals: "clean install"
     # Default JVM invocation options
-    mvn-opts: ''
+    mvn-opts: ""
     mvn-site-id: site
     mvn-staging-id: staging
     mvn-snapshot-id: snapshots
index 7190f2e..dd9fd0e 100644 (file)
@@ -13,8 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _it_dep_common: &it_dep_common
-    # values apply to all it/dep projects
+- _it_dep_common: &it_dep_common # values apply to all it/dep projects
     name: it-dep-docker-common
     # git repo
     project: it/dep
@@ -23,7 +22,7 @@
     # maven settings file has docker credentials
     mvn-settings: it-dep-settings
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # source of docker tag
     container-tag-method: yaml-file
 
@@ -34,9 +33,9 @@
     name: it-dep-helm
     # jenkins job name prefix
     build-timeout: 120
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # dockerfile is in subdir
     docker-build-args: -f ci/Dockerfile
     # any tag will do
@@ -46,7 +45,7 @@
       - gerrit-docker-verify
     stream:
       - all:
-          branch: '*'
+          branch: "*"
 
 - project:
     <<: *it_dep_common
@@ -55,9 +54,9 @@
     name: it-dep-smo-install
     # jenkins job name prefix
     build-timeout: 120
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # dockerfile is in subdir
     docker-build-args: -f ci/Dockerfile-smo-install
     # any tag will do
       - gerrit-docker-verify
     stream:
       - all:
-          branch: '*'
+          branch: "*"
 
 # build and publish packages to PackageCloud.io
 - project:
     <<: *it_dep_common
     name: it-dep-package
     # jenkins job name prefix
-    project-name: '{name}'
+    project-name: "{name}"
     # image is not pushed, use trivial tag
     container-tag-method: latest
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # use host network for network resources
-    docker-build-args: '--network=host -f ci/Dockerfile-package'
+    docker-build-args: "--network=host -f ci/Dockerfile-package"
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'ci/package-tag.yaml'
+        pattern: "ci/package-tag.yaml"
     jobs:
       - gerrit-docker-verify
       - oran-gerrit-docker-ci-pc-merge
     <<: *it_dep_common
     name: it-dep-secret
     # jenkins job name prefix
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # root of docker build
     docker-root: ci/tiller-secret-gen
     # build only on relevant changes
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: '{docker-root}/.*'
+        pattern: "{docker-root}/.*"
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
     <<: *it_dep_common
     name: it-dep-init
     # jenkins job name prefix
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # root of docker build
     docker-root: ric-common/Initcontainer/docker
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: '{docker-root}/.*'
+        pattern: "{docker-root}/.*"
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
-
+      - "{project-name}-gerrit-release-jobs"
 
 - project:
     <<: *it_dep_common
     name: it-dep-packagecloud-release
     jobs:
-      - 'gerrit-packagecloud-release-verify'
-      - 'gerrit-packagecloud-release-merge'
+      - "gerrit-packagecloud-release-verify"
+      - "gerrit-packagecloud-release-merge"
index fabc8f2..a9660dc 100644 (file)
@@ -9,24 +9,24 @@
     # maven settings file has docker credentials
     mvn-settings: it-dev-settings
     # build every Saturday
-    cron: 'H H * * 6'
+    cron: "H H * * 6"
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # get tag from YAML
     container-tag-method: yaml-file
     # Jenkins job prefix
-    project-name: 'it-dev-{name}'
+    project-name: "it-dev-{name}"
     # Docker image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # Directory with Dockerfile
-    docker-root: 'bldr-imgs/{name}'
+    docker-root: "bldr-imgs/{name}"
     # Limit build trigger to appropriate files;
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'bldr-imgs/{name}/.*'
+        pattern: "bldr-imgs/{name}/.*"
     # Includes verify and merge jobs
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     # Only build master branch
     stream:
       - master:
index d69f960..99291dd 100644 (file)
@@ -32,7 +32,7 @@
     <<: *it_dev_xo_common
     name: it-dev-xapp-onboarder-docker
     # image name
-    docker-name: 'o-ran-sc/xapp-onboarder'
+    docker-name: "o-ran-sc/xapp-onboarder"
     # source of docker tag
     container-tag-method: yaml-file
     # dockerfile is in subdir
@@ -41,9 +41,9 @@
     container-tag-yaml-dir: ci/xapp_onboarder
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'xapp_onboarder/.*'
+        pattern: "xapp_onboarder/.*"
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
@@ -57,7 +57,7 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 
 - project:
     <<: *it_dev_xo_common
     name: it-dev-xapp-onboarder-sonarqube
     sonar-project-file: ""
     sonar-properties: |
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        sonar.build.sourceEncoding=UTF-8
-        sonar.sources=xapp_onboarder
-        sonar.exclusions=setup.py,xapp_onboarder/tests/*.py
-        sonar.python.coverage.reportPaths=xapp_onboarder/coverage.xml
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      sonar.build.sourceEncoding=UTF-8
+      sonar.sources=xapp_onboarder
+      sonar.exclusions=setup.py,xapp_onboarder/tests/*.py
+      sonar.python.coverage.reportPaths=xapp_onboarder/coverage.xml
     jobs:
       - gerrit-tox-sonarqube
 
@@ -81,8 +81,8 @@
     <<: *it_dev_xo_py_common
     name: it-dev-xapp-onboarder-pypi
     gerrit_trigger_file_paths:
-     - compare-type: REG_EXP
-       pattern: 'xapp_onboarder/.*'
+      - compare-type: REG_EXP
+        pattern: "xapp_onboarder/.*"
     parallel: false
     jobs:
       - gerrit-pypi-verify
index 75188be..13443c8 100644 (file)
     jobs:
       - gerrit-info-yaml-verify
 
-- _it_otf_common: &it_otf_common
-    # values apply to all it/otf docker projects
+- _it_otf_common: &it_otf_common # values apply to all it/otf docker projects
     name: it_otf_common
     # git repo
     project: it/otf
     # jenkins job name prefix
-    project-name: '{name}'
+    project-name: "{name}"
     # source of docker tag
     container-tag-method: yaml-file
     # maven settings file has docker credentials
     mvn-settings: it-otf-settings
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # dockerfile is in subdir of docker root
-    docker-build-args: '--network=host -f ./docker/Dockerfile'
+    docker-build-args: "--network=host -f ./docker/Dockerfile"
     # tag file is in subdir
-    container-tag-yaml-dir: '{docker-root}/docker'
+    container-tag-yaml-dir: "{docker-root}/docker"
     # build only on relevant changes
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: '{docker-root}/.*'
+        pattern: "{docker-root}/.*"
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
@@ -46,9 +45,9 @@
     # start in parent directory with shared files
     docker-root: oran-ric-test-head
     # dockerfile is in subdir of docker root
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # tag file is in subdir
-    container-tag-yaml-dir: '{docker-root}'
+    container-tag-yaml-dir: "{docker-root}"
 
 - project:
     <<: *it_otf_common
@@ -56,9 +55,9 @@
     # start in parent directory with shared files
     docker-root: otf-frontend
     # dockerfile is in subdir of docker root
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # tag file is in subdir
-    container-tag-yaml-dir: '{docker-root}'
+    container-tag-yaml-dir: "{docker-root}"
 
 - project:
     <<: *it_otf_common
@@ -66,9 +65,9 @@
     # start in parent directory with shared files
     docker-root: otf-ping-test-head
     # dockerfile is in subdir of docker root
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # tag file is in subdir
-    container-tag-yaml-dir: '{docker-root}'
+    container-tag-yaml-dir: "{docker-root}"
 
 - project:
     <<: *it_otf_common
@@ -76,9 +75,9 @@
     # start in parent directory with shared files
     docker-root: otf-robot-test-head
     # dockerfile is in subdir of docker root
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # tag file is in subdir
-    container-tag-yaml-dir: '{docker-root}'
+    container-tag-yaml-dir: "{docker-root}"
 
 - project:
     <<: *it_otf_common
@@ -86,9 +85,9 @@
     # start in parent directory with shared files
     docker-root: otf-ssh-test-head
     # dockerfile is in subdir of docker root
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # tag file is in subdir
-    container-tag-yaml-dir: '{docker-root}'
+    container-tag-yaml-dir: "{docker-root}"
 
 - project:
     <<: *it_otf_common
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index c67f685..f2a1d14 100644 (file)
@@ -13,8 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _it_test_common: &it_test_common
-    # values apply to all it/test docker projects
+- _it_test_common: &it_test_common # values apply to all it/test docker projects
     name: it-test-docker-common
     # git repo
     project: it/test
     # source of docker tag
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # maven settings file has docker credentials
     mvn-settings: it-test-settings
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
     <<: *it_test_common
     name: it-test-nanobot
     # jenkins job name prefix
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # start in parent directory with shared files
     docker-root: ric_robot_suite
     # dockerfile is in subdir of docker root
-    docker-build-args: '--network=host -f docker/nanobot/Dockerfile'
+    docker-build-args: "--network=host -f docker/nanobot/Dockerfile"
     # tag file is in subdir
     container-tag-yaml-dir: ric_robot_suite/docker/nanobot
     # build only on relevant changes
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: '{docker-root}/.*'
+        pattern: "{docker-root}/.*"
 
 - project:
     <<: *it_test_common
     name: it-test-ric-robot
     # jenkins job name prefix
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # start in parent directory with shared files
     docker-root: ric_robot_suite
     # dockerfile is in subdir of docker root
-    docker-build-args: '--network=host -f docker/ric-robot/Dockerfile'
+    docker-build-args: "--network=host -f docker/ric-robot/Dockerfile"
     # tag file is in subdir
     container-tag-yaml-dir: ric_robot_suite/docker/ric-robot
     # build only on relevant changes
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: '{docker-root}/.*'
+        pattern: "{docker-root}/.*"
 
 - project:
     <<: *it_test_common
     name: it-test-ric-benchmarking
     # jenkins job name prefix
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # start in parent directory with shared files
-    docker-root:  ric_benchmarking/e2-interface/e2sim/e2sm_examples/kpm_e2sm
+    docker-root: ric_benchmarking/e2-interface/e2sim/e2sm_examples/kpm_e2sm
     # dockerfile is in subdir of docker root
-    docker-build-args: '--network=host -f Dockerfile'
+    docker-build-args: "--network=host -f Dockerfile"
     # tag file is in subdir
     container-tag-yaml-dir: ric_benchmarking/e2-interface/e2sim/docker
     # build only on relevant changes
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'ric_benchmarking/e2-interface/.*'
+        pattern: "ric_benchmarking/e2-interface/.*"
 
 - project:
     <<: *it_test_common
@@ -93,4 +92,4 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index 59df58a..5e9e936 100644 (file)
@@ -46,8 +46,8 @@
 - project:
     <<: *a1policymanagementservice_jdk_common
     name: nonrtric-plt-a1policymanagementservice
-    project-name: '{name}'
-    mvn-opts: '-Ddocker.skip=true'
+    project-name: "{name}"
+    mvn-opts: "-Ddocker.skip=true"
     build-node: ubuntu1804-builder-4c-4g
     jobs:
       - gerrit-maven-stage
@@ -69,4 +69,4 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index a270e6b..71b8f81 100644 (file)
@@ -46,8 +46,8 @@
 - project:
     <<: *dmaapadapter_jdk_common
     name: nonrtric-plt-dmaapadapter
-    project-name: '{name}'
-    mvn-opts: '-Ddocker.skip=true'
+    project-name: "{name}"
+    mvn-opts: "-Ddocker.skip=true"
     build-node: ubuntu1804-builder-4c-4g
     jobs:
       - gerrit-maven-stage
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 
 - project:
     <<: *dmaapadapter_jdk_common
     name: nonrtric-plt-dmaapadapter-sonar
     project-name: nonrtric-plt-dmaapadapter
     # template goal install builds docker image unnecessarily
-    mvn-params: '-Ddocker.skip=true'
+    mvn-params: "-Ddocker.skip=true"
     sonarcloud: true
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: 'nonrtric-plt-dmaapadapter'
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "nonrtric-plt-dmaapadapter"
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
     jobs:
       - gerrit-maven-sonar
index 3886037..3335540 100644 (file)
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 
 - project:
     <<: *dmaapmediatorproducer_common
     name: nonrtric-plt-dmaapmediatorproducer
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/nonrtric-plt-dmaapmediatorproducer'
+    docker-name: "o-ran-sc/nonrtric-plt-dmaapmediatorproducer"
     # get tag from YAML
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # Directory with Dockerfile
-    docker-root: '.'
+    docker-root: "."
     # Directory where go test should be run
-    go-root: '.'
+    go-root: "."
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
index c2e0372..d3fccb1 100644 (file)
@@ -46,8 +46,8 @@
 - project:
     <<: *helmmanager_jdk_common
     name: nonrtric-plt-helmmanager
-    project-name: '{name}'
-    mvn-opts: '-Ddocker.skip=true'
+    project-name: "{name}"
+    mvn-opts: "-Ddocker.skip=true"
     build-node: ubuntu1804-builder-4c-4g
     jobs:
       - gerrit-maven-stage
@@ -69,4 +69,4 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index 79a5c28..94fb15d 100644 (file)
@@ -13,7 +13,8 @@
     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
@@ -46,8 +47,8 @@
 - project:
     <<: *informationcoordinatorservice_jdk_common
     name: nonrtric-plt-informationcoordinatorservice
-    project-name: '{name}'
-    mvn-opts: '-Ddocker.skip=true'
+    project-name: "{name}"
+    mvn-opts: "-Ddocker.skip=true"
     build-node: ubuntu1804-builder-4c-4g
     jobs:
       - gerrit-maven-stage
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 
 - project:
     <<: *informationcoordinatorservice_jdk_common
     name: nonrtric-plt-informationcoordinatorservice-sonar
     project-name: nonrtric-plt-informationcoordinatorservice
     # template goal install builds docker image unnecessarily
-    mvn-params: '-Ddocker.skip=true'
+    mvn-params: "-Ddocker.skip=true"
     sonarcloud: true
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: 'nonrtric-plt-informationcoordinatorservice'
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "nonrtric-plt-informationcoordinatorservice"
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
     jobs:
       - gerrit-maven-sonar
index 2a24590..cf958c5 100644 (file)
@@ -33,7 +33,7 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 
 # Jobs for nonrtric-plt-ranpm-datafilecollector
 - project:
     name: nonrtric-plt-ranpm-datafilecollector-gerrit-maven-docker
     #job name prefix
     project-name: nonrtric-plt-ranpm-datafilecollector
-    mvn-params: '-f datafilecollector -Dbuild.number=${{BUILD_NUMBER}}'
+    mvn-params: "-f datafilecollector -Dbuild.number=${{BUILD_NUMBER}}"
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'datafilecollector/.*'
+        pattern: "datafilecollector/.*"
     jobs:
       - gerrit-maven-clm
       - gerrit-maven-verify-dependencies
     name: nonrtric-plt-ranpm-pmproducer-gerrit-maven-docker
     #job name prefix
     project-name: nonrtric-plt-ranpm-pmproducer
-    mvn-params: '-f pmproducer -Dbuild.number=${{BUILD_NUMBER}}'
+    mvn-params: "-f pmproducer -Dbuild.number=${{BUILD_NUMBER}}"
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'pmproducer/.*'
+        pattern: "pmproducer/.*"
     jobs:
       - gerrit-maven-clm
       - gerrit-maven-verify-dependencies
     name: nonrtric-plt-ranpm-influxlogger-gerrit-maven-docker
     #job name prefix
     project-name: nonrtric-plt-ranpm-influxlogger
-    mvn-params: '-f influxlogger -Dbuild.number=${{BUILD_NUMBER}}'
+    mvn-params: "-f influxlogger -Dbuild.number=${{BUILD_NUMBER}}"
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'influxlogger/.*'
+        pattern: "influxlogger/.*"
     jobs:
       - gerrit-maven-clm
       - gerrit-maven-verify-dependencies
index fe4c965..182fad7 100644 (file)
@@ -46,8 +46,8 @@
 - project:
     <<: *rappcatalogue_jdk_common
     name: nonrtric-plt-rappcatalogue
-    project-name: '{name}'
-    mvn-opts: '-Ddocker.skip=true'
+    project-name: "{name}"
+    mvn-opts: "-Ddocker.skip=true"
     build-node: ubuntu1804-builder-4c-4g
     jobs:
       - gerrit-maven-stage
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 
 - project:
     <<: *rappcatalogue_jdk_common
     name: nonrtric-plt-rappcatalogue-sonar
     project-name: nonrtric-plt-rappcatalogue
     # template goal install builds docker image unnecessarily
-    mvn-params: '-Ddocker.skip=true'
+    mvn-params: "-Ddocker.skip=true"
     sonarcloud: true
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: 'nonrtric_plt_rappcatalogue'
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "nonrtric_plt_rappcatalogue"
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
     jobs:
       - gerrit-maven-sonar
 
@@ -97,7 +97,7 @@
     # do not trigger on changes in docs, releases
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'catalogue-enhanced/.*'
+        pattern: "catalogue-enhanced/.*"
     stream:
       - master:
           branch: master
     name: nonrtric-plt-rappcatalogue-enhanced
     project-name: nonrtric-plt-rappcatalogue-enhanced
     # image name
-    docker-name: 'o-ran-sc/nonrtric-plt-rappcatalogue-enhanced'
+    docker-name: "o-ran-sc/nonrtric-plt-rappcatalogue-enhanced"
     # source of docker tag
     container-tag-method: yaml-file
     # use host network
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # Directory with Dockerfile
-    docker-root: 'catalogue-enhanced'
+    docker-root: "catalogue-enhanced"
     build-node: ubuntu1804-docker-4c-4g
     # do not trigger on changes in docs, releases
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'catalogue-enhanced/.*'
+        pattern: "catalogue-enhanced/.*"
     stream:
       - master:
           branch: master
       - g-release:
           branch: g-release
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
 
 - project:
     <<: *rappcatalogue_jdk_common
     # do not trigger on changes in docs, releases
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'catalogue-enhanced/.*'
+        pattern: "catalogue-enhanced/.*"
     sonar-project-file: ""
     sonar-properties: |
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        sonar.build.sourceEncoding=UTF-8
-        sonar.sources=catalogue-enhanced/
-        sonar.python.coverage.reportPaths=catalogue-enhanced/coverage.xml
-        sonar.inclusions=catalogue-enhanced/src/**.py
-        sonar.exclusions=catalogue-enhanced/tests/**.py
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      sonar.build.sourceEncoding=UTF-8
+      sonar.sources=catalogue-enhanced/
+      sonar.python.coverage.reportPaths=catalogue-enhanced/coverage.xml
+      sonar.inclusions=catalogue-enhanced/src/**.py
+      sonar.exclusions=catalogue-enhanced/tests/**.py
     jobs:
       - gerrit-tox-sonarqube
index 76ca52c..ea902c6 100644 (file)
@@ -40,8 +40,8 @@
 - project:
     <<: *sdnca1controller_jdk_common
     name: nonrtric-plt-sdnca1controller
-    project-name: '{name}'
-    mvn-opts: '-Ddocker.skip=true'
+    project-name: "{name}"
+    mvn-opts: "-Ddocker.skip=true"
     build-node: ubuntu1804-builder-4c-4g
     jobs:
       - gerrit-maven-stage
@@ -57,4 +57,4 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index a033ded..c38271c 100644 (file)
@@ -15,8 +15,8 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _nonrtric_plt_sme_common: &nonrtric_plt_sme_common
-    # values apply to all projects here
+- _nonrtric_plt_sme_common:
+    &nonrtric_plt_sme_common # values apply to all projects here
     name: nonrtric-plt-sme-common
     # git repo
     project: nonrtric/plt/sme
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 
 - project:
     <<: *nonrtric_plt_sme_common
     name: nonrtric-plt-sme-capifcore
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/nonrtric-plt-capifcore'
+    docker-name: "o-ran-sc/nonrtric-plt-capifcore"
     # get tag from YAML
     container-tag-method: yaml-file
     container-tag-yaml-dir: capifcore
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # Directory with Dockerfile
-    docker-root: 'capifcore'
+    docker-root: "capifcore"
     # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'capifcore/.*'
+        pattern: "capifcore/.*"
     # Directory where go test should be run
-    go-root: 'capifcore'
+    go-root: "capifcore"
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
@@ -75,7 +75,7 @@
     build-node: ubuntu1804-docker-4c-4g
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'capifcore/.*'
+        pattern: "capifcore/.*"
     sonar-prescan-script: !include-raw-escape: prescan-capifcore-ubuntu.sh
     sonar-project-file: ""
     java-version: openjdk11
index 423d5ff..b2af6bd 100644 (file)
 - project:
     <<: *nonrtric_rapp_healthcheck_common
     name: nonrtric-rapp-healthcheck-verify
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/nonrtric-rapp-healthcheck'
+    docker-name: "o-ran-sc/nonrtric-rapp-healthcheck"
     # get tag from YAML
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
index bc1c6b2..b4e0cf1 100644 (file)
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 
 - project:
     <<: *orufhrecovery_common
     name: nonrtric-rapp-orufhrecovery
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/nonrtric-rapp-orufhrecovery'
+    docker-name: "o-ran-sc/nonrtric-rapp-orufhrecovery"
     # get tag from YAML
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # Directory with Dockerfile
-    docker-root: 'scriptversion/app'
+    docker-root: "scriptversion/app"
     # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'scriptversion/app/.*'
+        pattern: "scriptversion/app/.*"
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
 - project:
     <<: *orufhrecovery_common
     name: nonrtric-rapp-orufhrecovery-consumer
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/nonrtric-rapp-orufhrecovery-consumer'
+    docker-name: "o-ran-sc/nonrtric-rapp-orufhrecovery-consumer"
     # get tag from YAML
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # Directory with Dockerfile
-    docker-root: 'goversion'
+    docker-root: "goversion"
     # Directory where go test should be run
-    go-root: 'goversion'
+    go-root: "goversion"
     # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'goversion/.*'
+        pattern: "goversion/.*"
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
 - project:
     <<: *orufhrecovery_common
     name: nonrtric-rapp-orufhrecovery-consumer-sonar
-    project-name: 'nonrtric-rapp-orufhrecovery-consumer'
+    project-name: "nonrtric-rapp-orufhrecovery-consumer"
     # prescan script requires ubuntu
     # golang is only on docker-enabled nodes
     build-node: ubuntu1804-docker-4c-4g
-    sonar-prescan-script: !include-raw-escape: prescan-oruclosedloopconsumer-ubuntu.sh
+    sonar-prescan-script: !include-raw-escape:
+      - prescan-oruclosedloopconsumer-ubuntu.sh
     sonar-project-file: ""
     java-version: openjdk11
     # use sonarcloud values from defaults.yaml
     sonar-properties: |
-        # Required metadata
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey=nonrtric-rapp-orufhrecovery-consumer
-        sonar.organization={sonarcloud_project_organization}
-        # Encoding
-        sonar.build.sourceEncoding=UTF-8
-        # Language
-        sonar.language=go
-        # Source
-        sonar.sources=.
-        # Unit tests
-        sonar.go.coverage.reportPaths=goversion/coverage.txt
-        # Inclusions
-        sonar.inclusions=goversion/internal/**/**.go,goversion/**.go
-        # Exclusions
-        sonar.exclusions=goversion/mocks/**.go,goversion/internal/**/**_test.go,goversion/**_test.go,goversion/simulator/**.go
+      # Required metadata
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey=nonrtric-rapp-orufhrecovery-consumer
+      sonar.organization={sonarcloud_project_organization}
+      # Encoding
+      sonar.build.sourceEncoding=UTF-8
+      # Language
+      sonar.language=go
+      # Source
+      sonar.sources=.
+      # Unit tests
+      sonar.go.coverage.reportPaths=goversion/coverage.txt
+      # Inclusions
+      sonar.inclusions=goversion/internal/**/**.go,goversion/**.go
+      # Exclusions
+      sonar.exclusions=goversion/mocks/**.go,goversion/internal/**/**_test.go,goversion/**_test.go,goversion/simulator/**.go
     jobs:
       - gerrit-sonar-prescan-script
index 54f54d5..10cb9d1 100644 (file)
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 
 - project:
     <<: *ransliceassurance_common
     name: nonrtric-rapp-ransliceassurance
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/nonrtric-rapp-ransliceassurance'
+    docker-name: "o-ran-sc/nonrtric-rapp-ransliceassurance"
     # get tag from YAML
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # Directory with Dockerfile
-    docker-root: 'smoversion'
+    docker-root: "smoversion"
     # Directory where go test should be run
-    go-root: 'smoversion'
+    go-root: "smoversion"
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
 - project:
     <<: *ransliceassurance_common
     name: nonrtric-rapp-ransliceassurance-icsversion
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/nonrtric-rapp-ransliceassurance-icsversion'
+    docker-name: "o-ran-sc/nonrtric-rapp-ransliceassurance-icsversion"
     # get tag from YAML
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # Directory with Dockerfile
-    docker-root: 'icsversion'
+    docker-root: "icsversion"
     # Directory where go test should be run
-    go-root: 'icsversion'
+    go-root: "icsversion"
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
index 1c0543c..055dbe1 100644 (file)
@@ -11,6 +11,6 @@ sonar.sources=.
 # Unit tests
 sonar.go.coverage.reportPaths=smoversion/coverage.txt, icsversion/coverage.txt
 # Inclusions
-sonar.inclusions=smoversion/internal/**/**.go, icsversion/internal/**/**.go 
+sonar.inclusions=smoversion/internal/**/**.go, icsversion/internal/**/**.go
 # Exclusions
 sonar.exclusions=smoversion/main.go,smoversion/stub/**.go,smoversion/internal/**/**_test.go, smoversion/main.go, icsversion/stub/**.go, icsversion/internal/**/**_test.go
index 6f02f6d..285faff 100644 (file)
 - project:
     <<: *nonrtric_jdk_common
     name: nonrtric-test-kafka-procon
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'kafka-procon'
+    docker-name: "kafka-procon"
     # get tag from YAML
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # Directory with Dockerfile
-    docker-root: 'test/kafka-procon'
-    # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-root: "test/kafka-procon"
     # Directory where go test should be run
     # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'test/kafka-procon/.*'
+        pattern: "test/kafka-procon/.*"
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
 - project:
     <<: *nonrtric_jdk_common
     name: nonrtric-test-http-https-proxy
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'http-https-proxy'
+    docker-name: "http-https-proxy"
     # get tag from YAML
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # Directory with Dockerfile
-    docker-root: 'test/http-https-proxy'
-    # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-root: "test/http-https-proxy"
     # Directory where go test should be run
     # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'test/http-https-proxy/.*'
+        pattern: "test/http-https-proxy/.*"
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
 - project:
     <<: *nonrtric_jdk_common
     name: nonrtric-test-cr
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'cr'
+    docker-name: "cr"
     # get tag from YAML
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # Directory with Dockerfile
-    docker-root: 'test/cr'
-    # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-root: "test/cr"
     # Directory where go test should be run
     # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'test/cr/.*'
+        pattern: "test/cr/.*"
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
 - project:
     <<: *nonrtric_jdk_common
     name: nonrtric-test-prodstub
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'prodstub'
+    docker-name: "prodstub"
     # get tag from YAML
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # Directory with Dockerfile
-    docker-root: 'test/prodstub'
-    # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-root: "test/prodstub"
     # Directory where go test should be run
     # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'test/prodstub/.*'
+        pattern: "test/prodstub/.*"
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
 - project:
     <<: *nonrtric_jdk_common
     name: nonrtric-test-mrstub
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'mrstub'
+    docker-name: "mrstub"
     # get tag from YAML
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # Directory with Dockerfile
-    docker-root: 'test/mrstub'
-    # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-root: "test/mrstub"
     # Directory where go test should be run
     # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'test/mrstub/.*'
+        pattern: "test/mrstub/.*"
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
 - project:
     <<: *nonrtric_jdk_common
     name: nonrtric-plt-auth-token-fetch
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/nonrtric-plt-auth-token-fetch'
+    docker-name: "o-ran-sc/nonrtric-plt-auth-token-fetch"
     # get tag from YAML
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # Directory with Dockerfile
-    docker-root: 'auth-token-fetch'
-    # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-root: "auth-token-fetch"
     # Directory where go test should be run
-    go-root: 'auth-token-fetch'
+    go-root: "auth-token-fetch"
     # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'auth-token-fetch/.*'
+        pattern: "auth-token-fetch/.*"
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index f3fa7db..0cc3273 100644 (file)
@@ -13,8 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _o_du_l2_common: &o_du_l2_common
-    # values apply to all o-du/l2 docker projects
+- _o_du_l2_common: &o_du_l2_common # values apply to all o-du/l2 docker projects
     name: o-du-l2-common
     # git repo
     project: o-du/l2
     <<: *o_du_l2_common
     name: o-du-l2
     # jenkins job name prefix
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/{name}'
-    docker-build-args: '--network=host'
+    docker-name: "o-ran-sc/{name}"
+    docker-build-args: "--network=host"
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
     <<: *o_du_l2_common
     name: o-du-l2-cu-stub
     # jenkins job name prefix
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/{name}'
-    docker-build-args: '--network=host -f Dockerfile-cu-stub'
+    docker-name: "o-ran-sc/{name}"
+    docker-build-args: "--network=host -f Dockerfile-cu-stub"
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
@@ -64,7 +63,7 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 
 - project:
     <<: *o_du_l2_common
index 9f3cd1a..651fd52 100644 (file)
@@ -13,8 +13,8 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _o_du_phy_common: &o_du_phy_common
-    # values apply to all o-du/phy docker projects
+- _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
     project: o-du/phy
     <<: *o_du_phy_common
     name: o-du-phy-package
     # jenkins job name prefix
-    project-name: '{name}'
+    project-name: "{name}"
     # image is not pushed, use trivial tag
     container-tag-method: latest
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # use host network for network resources
-    docker-build-args: '--network=host -f Dockerfile'
+    docker-build-args: "--network=host -f Dockerfile"
     jobs:
       - gerrit-docker-verify
     #  - oran-gerrit-docker-ci-pc-merge
index faa1f4c..5e0cb92 100644 (file)
       - gerrit-info-yaml-verify
 
 - _oam-nf-oam-adopter: &oam-nf-oam-adopter
-   name: oam-nf-oam-adopter
-   project: oam/nf-oam-adopter
-   project-name: oam-nf-oam-adopter
-   java-version: openjdk11
-   mvn-pom: 'ves-nf-oam-adopter/pom.xml'
-   mvn-params: '-f ves-nf-oam-adopter/pom.xml -P docker -Dbuild.number=${{BUILD_NUMBER}}'
-   mvn-version: "mvn36"
-   mvn-settings: 'oam-nf-oam-adopter-settings'
-   build-node: centos7-docker-2c-8g
+    name: oam-nf-oam-adopter
+    project: oam/nf-oam-adopter
+    project-name: oam-nf-oam-adopter
+    java-version: openjdk11
+    mvn-pom: "ves-nf-oam-adopter/pom.xml"
+    mvn-params: "-f ves-nf-oam-adopter/pom.xml -P docker -Dbuild.number=${{BUILD_NUMBER}}"
+    mvn-version: "mvn36"
+    mvn-settings: "oam-nf-oam-adopter-settings"
+    build-node: centos7-docker-2c-8g
 
 - project:
     <<: *oam-nf-oam-adopter
     name: oam-nf-oam-adopter-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'oran-'
-    branch: 'master'
+    nexus-iq-namespace: "oran-"
+    branch: "master"
 
 - project:
     <<: *oam-nf-oam-adopter
           maven-versions-plugin: true
           container-public-registry: nexus3.o-ran-sc.org:10001
           container-staging-registry: nexus3.o-ran-sc.org:10004
-      - '{project-name}-gerrit-release-jobs':
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-8g
     stream:
-      - 'master':
-          branch: 'master'
-    files: '**'
-    archive-artifacts: ''
+      - "master":
+          branch: "master"
+    files: "**"
+    archive-artifacts: ""
 
 - project:
     <<: *oam-nf-oam-adopter
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar.build.sourceEncoding: 'UTF-8'
-    cron: '@daily'
-    branch: 'master'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-params: '-f ves-nf-oam-adopter/pom.xml -Ddocker.skip=true'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar.build.sourceEncoding: "UTF-8"
+    cron: "@daily"
+    branch: "master"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    mvn-params: "-f ves-nf-oam-adopter/pom.xml -Ddocker.skip=true"
index 348e66b..1f23edf 100644 (file)
@@ -13,8 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _tr069-adapter-jdk08: &tr069-adapter-jdk08
-    # values apply to all projects here
+- _tr069-adapter-jdk08: &tr069-adapter-jdk08 # values apply to all projects here
     name: tr069-adapter-jdk08
     # git repo
     project: oam/tr069-adapter
@@ -42,9 +41,9 @@
     # template goal install builds docker image unnecessarily
     mvn-params: -Ddocker.skip=true
     sonarcloud: true
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
     jobs:
       - gerrit-maven-sonar
 
@@ -55,4 +54,4 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index a303200..f5f3878 100644 (file)
     branch: master
     build-days-to-keep: 30
     build-timeout: 15
-    cron: ''
+    cron: ""
     concurrent: false
     disable-job: false
     gerrit-skip-vote: false
-    git-url: '$GIT_URL/$GERRIT_PROJECT'
+    git-url: "$GIT_URL/$GERRIT_PROJECT"
     mvn-global-settings: global-settings
     stream: master
     submodule-disable: false
 
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: '.*'
+        pattern: ".*"
 
     #####################
     # Job Configuration #
     #####################
 
     project-type: freestyle
-    node: '{build-node}'
-    disabled: '{disable-job}'
+    node: "{build-node}"
+    disabled: "{disable-job}"
 
     properties:
       - lf-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - lf-infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          stream: '{stream}'
+          project: "{project}"
+          branch: "{branch}"
+          stream: "{stream}"
       - string:
           name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
+          default: "{archive-artifacts}"
           description: Artifacts to archive to the logs server.
 
     wrappers:
       - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     builders:
       - lf-infra-pre-build
@@ -73,7 +73,7 @@
           settings-file: "{mvn-settings}"
       - lf-infra-create-netrc:
           server-id: "{mvn-site-id}"
-      - shell: '{script}'
+      - shell: "{script}"
       - lf-provide-maven-settings-cleanup
 
     publishers:
@@ -91,7 +91,7 @@
 #   branch:         git branch pattern, defaults to master
 #   stream:         friendly stream name (often same as branch), defaults to master
 - job-template:
-    name: '{project-name}-shell-verify-{stream}'
+    name: "{project-name}-shell-verify-{stream}"
     id: oran-shell-verify
     <<: *oran_shell_common
 
 
     scm:
       - lf-infra-gerrit-scm:
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-          git-url: '{git-url}'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '$GERRIT_BRANCH'
-          submodule-recursive: '{submodule-recursive}'
-          submodule-timeout: '{submodule-timeout}'
-          submodule-disable: '{submodule-disable}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+          git-url: "{git-url}"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "$GERRIT_BRANCH"
+          submodule-recursive: "{submodule-recursive}"
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
           choosing-strategy: gerrit
 
     triggers:
-      - timed: '{obj:cron}'
+      - timed: "{obj:cron}"
       - gerrit:
-          server-name: '{gerrit-server-name}'
-          trigger-on: '{obj:gerrit_verify_triggers}'
+          server-name: "{gerrit-server-name}"
+          trigger-on: "{obj:gerrit_verify_triggers}"
           projects:
             - project-compare-type: ANT
-              project-pattern: '{project}'
+              project-pattern: "{project}"
               branches:
                 - branch-compare-type: ANT
-                  branch-pattern: '**/{branch}'
-              file-paths: '{obj:gerrit_trigger_file_paths}'
+                  branch-pattern: "**/{branch}"
+              file-paths: "{obj:gerrit_trigger_file_paths}"
           skip-vote:
-            successful: '{gerrit-skip-vote}'
-            failed: '{gerrit-skip-vote}'
-            unstable: '{gerrit-skip-vote}'
-            notbuilt: '{gerrit-skip-vote}'
+            successful: "{gerrit-skip-vote}"
+            failed: "{gerrit-skip-vote}"
+            unstable: "{gerrit-skip-vote}"
+            notbuilt: "{gerrit-skip-vote}"
 
 # Build from gerrit by shell script.
 # Triggered automatically by merge; can be run on any branch.
 #   branch:         git branch pattern, defaults to master
 #   stream:         friendly stream name (often same as branch), defaults to master
 - job-template:
-    name: '{project-name}-shell-merge-{stream}'
+    name: "{project-name}-shell-merge-{stream}"
     id: oran-shell-merge
     <<: *oran_shell_common
 
 
     scm:
       - lf-infra-gerrit-scm:
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-          git-url: '{git-url}'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '$GERRIT_BRANCH'
-          submodule-recursive: '{submodule-recursive}'
-          submodule-timeout: '{submodule-timeout}'
-          submodule-disable: '{submodule-disable}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+          git-url: "{git-url}"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "$GERRIT_BRANCH"
+          submodule-recursive: "{submodule-recursive}"
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
           choosing-strategy: default
 
     triggers:
-      - timed: '{obj:cron}'
+      - timed: "{obj:cron}"
       - gerrit:
-          server-name: '{gerrit-server-name}'
-          trigger-on: '{obj:gerrit_merge_triggers}'
+          server-name: "{gerrit-server-name}"
+          trigger-on: "{obj:gerrit_merge_triggers}"
           projects:
             - project-compare-type: ANT
-              project-pattern: '{project}'
+              project-pattern: "{project}"
               branches:
                 - branch-compare-type: ANT
-                  branch-pattern: '**/{branch}'
-              file-paths: '{obj:gerrit_trigger_file_paths}'
+                  branch-pattern: "**/{branch}"
+              file-paths: "{obj:gerrit_trigger_file_paths}"
 
 # Build and publish artifact from gerrit by shell script.
 # Triggered automatically by merging specific release file;
 #   stream:         friendly stream name (often same as branch), defaults to master
 #   gerrit_release_file_paths: Pathname pattern of the release file to trigger this job
 - job-template:
-    name: '{project-name}-shell-release-{stream}'
+    name: "{project-name}-shell-release-{stream}"
     id: oran-shell-release
     <<: *oran_shell_common
 
 
     scm:
       - lf-infra-gerrit-scm:
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-          git-url: '{git-url}'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '$GERRIT_BRANCH'
-          submodule-recursive: '{submodule-recursive}'
-          submodule-timeout: '{submodule-timeout}'
-          submodule-disable: '{submodule-disable}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+          git-url: "{git-url}"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "$GERRIT_BRANCH"
+          submodule-recursive: "{submodule-recursive}"
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
           choosing-strategy: default
 
     triggers:
       - gerrit:
-          server-name: '{gerrit-server-name}'
+          server-name: "{gerrit-server-name}"
           trigger-on:
             - change-merged-event
           projects:
             - project-compare-type: ANT
-              project-pattern: '{project}'
+              project-pattern: "{project}"
               branches:
                 - branch-compare-type: ANT
-                  branch-pattern: '**/{branch}'
-              file-paths: '{obj:gerrit_release_file_paths}'
+                  branch-pattern: "**/{branch}"
+              file-paths: "{obj:gerrit_release_file_paths}"
index 64119ca..089b180 100644 (file)
@@ -14,8 +14,8 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _aiml_dashboard_docker_common: &aiml_dashboard_docker_common
-    # values apply to all training manager projects
+- _aiml_dashboard_docker_common:
+    &aiml_dashboard_docker_common # values apply to all training manager projects
     name: portal-aiml-dashboard-docker-common
     # git repo
     project: portal/aiml-dashboard
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 
 - project:
     <<: *aiml_dashboard_docker_common
     name: portal-aiml-dashboard-docker
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # Dockerfile is in a subdir
-    docker-root: '.'
+    docker-root: "."
     # source of docker tag
     # dockerfile is in subdir of docker root
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     container-tag-method: yaml-file
     build-node: ubuntu1804-docker-4c-4g
     jobs:
 - project:
     <<: *aiml_dashboard_docker_common
     name: portal-aiml-notebook-docker
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # Dockerfile is in a subdir
-    docker-root: 'kf-pipelines'
-    container-tag-yaml-dir: 'kf-pipelines'
+    docker-root: "kf-pipelines"
+    container-tag-yaml-dir: "kf-pipelines"
     # source of docker tag
     # dockerfile is in subdir of docker root
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     container-tag-method: yaml-file
     build-node: ubuntu1804-docker-4c-4g
     jobs:
index 0181138..b77b5e4 100644 (file)
@@ -13,8 +13,8 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _portal_nonrtric_controlpanel_common: &portal_nonrtric_controlpanel_common
-    # values apply to all projects here
+- _portal_nonrtric_controlpanel_common:
+    &portal_nonrtric_controlpanel_common # values apply to all projects here
     name: portal-nonrtric-controlpanel-common
     # git repo
     project: portal/nonrtric-controlpanel
     <<: *portal_nonrtric_controlpanel_common
     name: nonrtric-controlpanel-frontend
     # image name
-    docker-name: 'o-ran-sc/nonrtric-controlpanel'
+    docker-name: "o-ran-sc/nonrtric-controlpanel"
     # get tag from YAML
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # Directory with Dockerfile
-    docker-root: 'webapp-frontend'
+    docker-root: "webapp-frontend"
     # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'webapp-frontend/.*'
+        pattern: "webapp-frontend/.*"
       - compare-type: REG_EXP
-        pattern: 'docker-compose/.*'
+        pattern: "docker-compose/.*"
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 
 - project:
     <<: *portal_nonrtric_controlpanel_common
     name: portal-nonrtric-controlpanel-gateway-sonar
     # template goal install builds docker image unnecessarily
-    mvn-params: '-Ddocker.skip=true -f nonrtric-gateway'
+    mvn-params: "-Ddocker.skip=true -f nonrtric-gateway"
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'nonrtric-gateway/.*'
+        pattern: "nonrtric-gateway/.*"
     sonarcloud: true
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{project-name}-gateway'
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{project-name}-gateway"
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
     jobs:
       - gerrit-maven-sonar
 
@@ -85,7 +85,7 @@
     name: portal-nonrtric-controlpanel-frontend-sonar
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'webapp-frontend/.*'
+        pattern: "webapp-frontend/.*"
     build-node: ubuntu1804-docker-4c-4g
     java-version: openjdk11
     sonarcloud: true
 - project:
     <<: *portal_nonrtric_controlpanel_common
     name: portal-nonrtric-controlpanel-gateway
-    project-name: '{name}'
-    mvn-params: '-f nonrtric-gateway'
+    project-name: "{name}"
+    mvn-params: "-f nonrtric-gateway"
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'nonrtric-gateway/.*'
+        pattern: "nonrtric-gateway/.*"
     build-node: ubuntu1804-builder-4c-4g
     jobs:
       - gerrit-maven-verify
 - project:
     <<: *portal_nonrtric_controlpanel_common
     name: portal-nonrtric-controlpanel-gateway-docker
-    project-name: '{name}'
-    mvn-params: '-P docker -f nonrtric-gateway'
+    project-name: "{name}"
+    mvn-params: "-P docker -f nonrtric-gateway"
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'nonrtric-gateway/.*'
+        pattern: "nonrtric-gateway/.*"
       - compare-type: REG_EXP
-        pattern: 'docker-compose/.*'
+        pattern: "docker-compose/.*"
     build-node: ubuntu1804-docker-4c-4g
     jobs:
       - gerrit-maven-docker-verify
index e77a07b..ed74844 100644 (file)
@@ -13,8 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _pti_o2_common: &pti_o2_common
-    # values apply to all pti/o2 projects
+- _pti_o2_common: &pti_o2_common # values apply to all pti/o2 projects
     name: pti-o2-common
     # git repo
     project: pti/o2
@@ -23,8 +22,7 @@
     # maven settings file has credentials
     mvn-settings: pti-o2-settings
 
-- _pti_o2_python: &pti_o2_python
-    # settings for python builds
+- _pti_o2_python: &pti_o2_python # settings for python builds
     name: pti-o2-python
     # the install script assumes an ubuntu image
     build-node: ubuntu1804-builder-2c-2g
@@ -39,8 +37,8 @@
     name: pti-o2-imsdms-verify
     # do not trigger on changes in docs, releases
     gerrit_trigger_file_paths:
-        - compare-type: REG_EXP
-          pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
+      - compare-type: REG_EXP
+        pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
     jobs:
       - gerrit-tox-verify
     stream:
@@ -51,8 +49,8 @@
     <<: *pti_o2_common
     # values apply to all pti/o2 docker projects
     # maven settings file has docker credentials
-    docker-name: 'o-ran-sc/pti-o2imsdms'
-    docker-build-args: '--network=host -f Dockerfile'
+    docker-name: "o-ran-sc/pti-o2imsdms"
+    docker-build-args: "--network=host -f Dockerfile"
     # source of docker tag
     container-tag-method: yaml-file
     # docker-root: src
     name: pti-o2-imsdms
     # do not trigger on changes in docs, releases
     gerrit_trigger_file_paths:
-        - compare-type: REG_EXP
-          pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
+      - compare-type: REG_EXP
+        pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
@@ -87,7 +85,7 @@
       - compare-type: REG_EXP
         pattern: 'releases\/.*\.yaml'
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 
 - project:
     <<: *pti_o2_docker_common
index dc2c796..ba3feb8 100644 (file)
@@ -25,10 +25,10 @@ pkgs="gawk make wget tar bzip2 gzip python unzip perl patch \
      diffutils diffstat cpp gcc gcc-c++ glibc-devel texinfo chrpath socat \
      perl-Data-Dumper perl-Text-ParseWords perl-Thread-Queue perl-Digest-SHA \
      python3-pip xz which SDL-devel xterm"
-echo "INFO: installing epel-release and packages $pkgs"
+echo "INFO: installing epel-release and packages ${pkgs}"
 sudo yum install -y epel-release \
   && sudo yum makecache \
-  && sudo yum install -y $pkgs
+  && sudo yum install -y "${pkgs}"
 
 git config --global user.name "oran inf builder"
 git config --global user.email "oran.inf@windriver.com"
index 689a16e..ed4f088 100644 (file)
@@ -25,7 +25,7 @@
     # use a centos with big memory; docker not required
     build-node: centos7-docker-2c-8g
     # use a non-recursive pattern
-    archive-artifacts: '*.log'
+    archive-artifacts: "*.log"
 
 - project:
     <<: *pti_rtp_common
@@ -33,8 +33,8 @@
     # runs about 50~80 minutes
     build-timeout: 120
     script: !include-raw-escape:
-        - install-yocto-prereq-centos.sh
-        - verify-inf.sh
+      - install-yocto-prereq-centos.sh
+      - verify-inf.sh
     jobs:
       - oran-shell-verify
 
@@ -44,8 +44,8 @@
     # runs about 50~80 minutes
     build-timeout: 120
     script: !include-raw-escape:
-        - install-yocto-prereq-centos.sh
-        - verify-inf.sh
+      - install-yocto-prereq-centos.sh
+      - verify-inf.sh
     jobs:
       - oran-shell-merge
 
@@ -57,9 +57,9 @@
     # runs about 48 hours
     build-timeout: 2880
     script: !include-raw-escape:
-        - install-yocto-prereq-centos.sh
-        - build-inf.sh
-        - upload-inf.sh
+      - install-yocto-prereq-centos.sh
+      - build-inf.sh
+      - upload-inf.sh
     jobs:
       - oran-shell-release
     stream:
index 4d99944..a472e49 100644 (file)
@@ -22,13 +22,14 @@ echo "--> upload-inf.sh"
 set -eu -o pipefail
 
 if [[ -f ~/lf-env.sh ]]; then
-    source ~/lf-env.sh
+    # shellcheck source=/dev/null
+    . ~/lf-env.sh
     lf-activate-venv --python python3 lftools
 else
     echo "INFO: creating virtual environment"
     virtualenv -p python3 /tmp/venv
     PATH=/tmp/venv/bin:$PATH
-    
+
     pip_pkgs="pip setuptools lftools"
     for pkg in $pip_pkgs; do
         cmd_pip="python -m pip install --upgrade $pkg"
index 41cce03..c5323f3 100644 (file)
@@ -12,4 +12,4 @@
     build-node: centos7-builder-1c-1g
     branch: master
     jobs:
-      - gerrit-info-yaml-verify
\ No newline at end of file
+      - gerrit-info-yaml-verify
index 423acb5..51cad32 100644 (file)
@@ -5,8 +5,7 @@
     views:
       - project-view
 
-- _ad_common: &ad_common
-    # required even though overridden everywhere
+- _ad_common: &ad_common # required even though overridden everywhere
     name: ad-common
     # git repo
     project: ric-app/ad
     # source of docker tag
     container-tag-method: yaml-file
     # use host network
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     build-node: ubuntu1804-docker-4c-4g
     # do not trigger on changes in docs, releases
     gerrit_trigger_file_paths:
-        - compare-type: REG_EXP
-          pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
+      - compare-type: REG_EXP
+        pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 
-- _ad_python: &ad_python
-    # settings for python builds
+- _ad_python: &ad_python # settings for python builds
     name: ad-python
     # the install script assumes an ubuntu image
     build-node: ubuntu1804-builder-2c-2g
@@ -69,8 +67,8 @@
     name: ric-app-ad-py-verify
     # do not trigger on changes in docs, releases
     gerrit_trigger_file_paths:
-        - compare-type: REG_EXP
-          pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
+      - compare-type: REG_EXP
+        pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
     jobs:
       - gerrit-tox-verify
     stream:
     name: ric-app-ad-sonarqube
     sonar-project-file: ""
     sonar-properties: |
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        sonar.build.sourceEncoding=UTF-8
-        sonar.sources=ad
-        sonar.python.coverage.reportPaths=coverage.xml
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      sonar.build.sourceEncoding=UTF-8
+      sonar.sources=ad
+      sonar.python.coverage.reportPaths=coverage.xml
     jobs:
       - gerrit-tox-sonarqube
index cd7a992..a772f33 100644 (file)
@@ -5,8 +5,7 @@
     views:
       - project-view
 
-- _bouncer_common: &bouncer_common
-    # values apply to all projects
+- _bouncer_common: &bouncer_common # values apply to all projects
     name: bouncer-common
     # git repo
     project: ric-app/bouncer
     # also used as image name
     name: ric-app-bouncer
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # docker root
     docker-root: Bouncer
     # source type of image tag
     container-tag-method: yaml-file
     # use host network
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # tag file is in subdir
     container-tag-yaml-dir: Bouncer
     # trigger on any change other than a file in ./docs
     gerrit_trigger_file_paths:
-        - compare-type: REG_EXP
-          pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
-        - compare-type: REG_EXP
-          pattern: 'bouncer/.*'
+      - compare-type: REG_EXP
+        pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
+      - compare-type: REG_EXP
+        pattern: "bouncer/.*"
     jobs:
-        - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
-        - master:
-            branch: master
+      - master:
+          branch: master
 
 # push nexus image from staging to release
 - project:
@@ -58,4 +57,4 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index 77dc8f0..920fcc5 100644 (file)
@@ -5,8 +5,7 @@
     views:
       - project-view
 
-- _hw-go_common: &hw-go_common
-    # values apply to all projects
+- _hw-go_common: &hw-go_common # values apply to all projects
     name: hw-go-common
     # git repo
     project: ric-app/hw-go
     <<: *hw-go_common
     name: ric-app-hw-go
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # source of docker tag
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # trigger on any change other than a file in ./docs
     gerrit_trigger_file_paths:
-        - compare-type: REG_EXP
-          pattern: '^((?!docs/|\/COMMIT_MSG).)*$'
+      - compare-type: REG_EXP
+        pattern: '^((?!docs/|\/COMMIT_MSG).)*$'
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
@@ -51,4 +50,4 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index d0b3f5e..32d7f12 100644 (file)
@@ -5,8 +5,7 @@
     views:
       - project-view
 
-- _hw-python_common: &hw-python_common
-    # values apply to all projects
+- _hw-python_common: &hw-python_common # values apply to all projects
     name: hw-python-common
     # git repo
     project: ric-app/hw-python
     <<: *hw-python_common
     name: ric-app-hw-python
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # source of docker tag
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # trigger on any change other than a file in ./docs
     gerrit_trigger_file_paths:
-        - compare-type: REG_EXP
-          pattern: '^((?!docs/|\/COMMIT_MSG).)*$'
+      - compare-type: REG_EXP
+        pattern: '^((?!docs/|\/COMMIT_MSG).)*$'
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
@@ -51,4 +50,4 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index a44c36a..b69c770 100644 (file)
     <<: *hw-rust_common
     name: ric-app-hw-rust
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # source of docker tag
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # trigger on any change other than a file in ./docs
     gerrit_trigger_file_paths:
-        - compare-type: REG_EXP
-          pattern: '^((?!docs/|\/COMMIT_MSG).)*$'
+      - compare-type: REG_EXP
+        pattern: '^((?!docs/|\/COMMIT_MSG).)*$'
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
@@ -50,4 +50,4 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index 2545e6f..7ecfa75 100644 (file)
@@ -5,8 +5,7 @@
     views:
       - project-view
 
-- _hw_common: &hw_common
-    # values apply to all projects
+- _hw_common: &hw_common # values apply to all projects
     name: hw-common
     # git repo
     project: ric-app/hw
     # also used as image name
     name: ric-app-hw
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # source type of image tag
     container-tag-method: yaml-file
     # use host network
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # trigger on any change other than a file in ./docs
     gerrit_trigger_file_paths:
-        - compare-type: REG_EXP
-          pattern: '^((?!docs/|\/COMMIT_MSG).)*$'
+      - compare-type: REG_EXP
+        pattern: '^((?!docs/|\/COMMIT_MSG).)*$'
     jobs:
-        - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
-        - master:
-            branch: master
+      - master:
+          branch: master
 
 # push nexus image from staging to release
 - project:
@@ -52,4 +51,4 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index 8d1ee36..fe49939 100644 (file)
@@ -5,8 +5,7 @@
     views:
       - project-view
 
-- _kpimon-go_common: &kpimon-go_common
-    # values apply to all projects
+- _kpimon-go_common: &kpimon-go_common # values apply to all projects
     name: kpimon-go-common
     # git repo
     project: ric-app/kpimon-go
     # also used as image name
     name: ric-app-kpimon-go
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # source type of image tag
     container-tag-method: yaml-file
     # use host network
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # trigger on any change other than a file in ./docs
     gerrit_trigger_file_paths:
-        - compare-type: REG_EXP
-          pattern: '^((?!docs/|\/COMMIT_MSG).)*$'
+      - compare-type: REG_EXP
+        pattern: '^((?!docs/|\/COMMIT_MSG).)*$'
     jobs:
-        - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
-        - master:
-            branch: master
+      - master:
+          branch: master
 
 # push nexus image from staging to release
 - project:
@@ -54,4 +53,4 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index d40da66..c64e41b 100644 (file)
@@ -5,8 +5,7 @@
     views:
       - project-view
 
-- _lp_common: &lp_common
-    # required even though overridden everywhere
+- _lp_common: &lp_common # required even though overridden everywhere
     name: lp-common
     # git repo
     project: ric-app/lp
     # source of docker tag
     container-tag-method: yaml-file
     # use host network
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     build-node: ubuntu1804-docker-4c-4g
     # do not trigger on changes in docs, releases
     gerrit_trigger_file_paths:
-        - compare-type: REG_EXP
-          pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
+      - compare-type: REG_EXP
+        pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 
-- _lp_python: &lp_python
-    # settings for python builds
+- _lp_python: &lp_python # settings for python builds
     name: lp-python
     # the install script assumes an ubuntu image
     build-node: ubuntu1804-builder-2c-2g
@@ -69,8 +67,8 @@
     name: ric-app-lp-py-verify
     # do not trigger on changes in docs, releases
     gerrit_trigger_file_paths:
-        - compare-type: REG_EXP
-          pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
+      - compare-type: REG_EXP
+        pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
     jobs:
       - gerrit-tox-verify
     stream:
     name: ric-app-lp-sonarqube
     sonar-project-file: ""
     sonar-properties: |
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        sonar.build.sourceEncoding=UTF-8
-        sonar.sources=lp
-        sonar.python.coverage.reportPaths=coverage.xml
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      sonar.build.sourceEncoding=UTF-8
+      sonar.sources=lp
+      sonar.python.coverage.reportPaths=coverage.xml
     jobs:
       - gerrit-tox-sonarqube
index 44c9bf6..1d41414 100644 (file)
@@ -3,7 +3,7 @@
     name: ric-app-mc-project-view
     project-name: ric-app-mc
     views:
-        - project-view
+      - project-view
 
 - project:
     name: ric-app-mc-info
     project-name: ric-app-mc
     build-node: centos7-builder-1c-1g
     jobs:
-        - gerrit-info-yaml-verify
+      - gerrit-info-yaml-verify
 
-- _mc_common: &mc_common
-    # values apply to all MC projects
+- _mc_common: &mc_common # values apply to all MC projects
     name: mc-common
     # git repo
     project: ric-app/mc
     <<: *mc_common
     name: ric-app-mc
     # jenkins job name prefix
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     docker-root: mc-core
     # source of docker tag
     container-tag-method: yaml-file
-    container-tag-yaml-dir: '{docker-root}'
+    container-tag-yaml-dir: "{docker-root}"
     # use host network
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     gerrit_trigger_file_paths:
-        - compare-type: REG_EXP
-          pattern: '{docker-root}/.*'
+      - compare-type: REG_EXP
+        pattern: "{docker-root}/.*"
     jobs:
-        - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
-        - master:
-            branch: master
+      - master:
+          branch: master
 
 - project:
     <<: *mc_common
     name: ric-app-mc-listener
     # jenkins job name prefix
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     docker-root: sidecars/listener
     # source of docker tag
     container-tag-method: yaml-file
-    container-tag-yaml-dir: '{docker-root}'
+    container-tag-yaml-dir: "{docker-root}"
     # use host network
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     gerrit_trigger_file_paths:
-        - compare-type: REG_EXP
-          pattern: '{docker-root}/.*'
+      - compare-type: REG_EXP
+        pattern: "{docker-root}/.*"
     jobs:
-        - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
-        - master:
-            branch: master
+      - master:
+          branch: master
 
 - project:
     <<: *mc_common
@@ -80,7 +79,7 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 
 # drive unit tests from root CMake file to gen/analyse coverage data
 - project:
     make-opts: test ARGS=-V
     sonar-project-file: ""
     sonar-properties: |
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        sonar.build.sourceEncoding=UTF-8
-        sonar.sources=sidecars/listener/src,mc-core/mc/mcnib
-        sonar.cfamily.build-wrapper-output=$WORKSPACE/bw-output
-        sonar.cfamily.gcov.reportsPath=/tmp/gcov_rpts
-        sonar.cfamily.threads=2
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      sonar.build.sourceEncoding=UTF-8
+      sonar.sources=sidecars/listener/src,mc-core/mc/mcnib
+      sonar.cfamily.build-wrapper-output=$WORKSPACE/bw-output
+      sonar.cfamily.gcov.reportsPath=/tmp/gcov_rpts
+      sonar.cfamily.threads=2
     jobs:
       - gerrit-cmake-sonarqube
index 22edab6..62fe3d1 100644 (file)
@@ -1,3 +1,4 @@
+#!/bin/sh
 #==================================================================================
 #      Copyright (c) 2022 Samsung Electronics Co., Ltd. All Rights Reserved.
 #
@@ -19,12 +20,12 @@ echo "--> prescan-ric-app-qp-aimlfw-ubuntu.sh"
 
 docker --version
 echo "Unit Test"
-cd $WORKSPACE
+cd "${WORKSPACE}" || return
 
 
 docker build --network=host -t tmpimg --target=qpaimlfwbuild .
 CONTAINER=$(docker create tmpimg)
-docker cp $CONTAINER:/tmp/qp_cover.out cover.out
-docker rm $CONTAINER
+docker cp "${CONTAINER}":/tmp/qp_cover.out cover.out
+docker rm "${CONTAINER}"
 
 echo "--> prescan-ric-app-qp-aimlfw.sh ends"
index 807e2d4..91b9656 100644 (file)
@@ -14,8 +14,8 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _qp_aimlfw_docker_common: &qp_aimlfw_docker_common
-    # values apply to all training manager projects
+- _qp_aimlfw_docker_common:
+    &qp_aimlfw_docker_common # values apply to all training manager projects
     name: ric-app-qp-aimlfw-docker-common
     # git repo
     project: ric-app/qp-aimlfw
 - project:
     <<: *qp_aimlfw_docker_common
     name: ric-app-qp-aimlfw
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # Dockerfile is in a subdir
-    docker-root: '.'
+    docker-root: "."
     # source of docker tag
     # dockerfile is in subdir of docker root
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     container-tag-method: yaml-file
     jobs:
       - "{project-name}-gerrit-docker-jobs"
     sonar-prescan-script: !include-raw-escape: prescan-ric-app-qp-aimlfw-ubuntu.sh
     sonar-project-file: ""
     sonar-properties: |
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        sonar.build.sourceEncoding=UTF-8
-        sonar.sources=.
-        sonar.language=go
-        sonar.go.coverage.reportPaths=**/cover.out
-        sonar.inclusions=**/*.go
-        sonar.exclusions=**/*_test.go
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      sonar.build.sourceEncoding=UTF-8
+      sonar.sources=.
+      sonar.language=go
+      sonar.go.coverage.reportPaths=**/cover.out
+      sonar.inclusions=**/*.go
+      sonar.exclusions=**/*_test.go
     jobs:
       - gerrit-sonar-prescan-script
 
@@ -68,4 +68,4 @@
     name: ric-app-qp-aimlfw-release
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index 42025d3..2151903 100644 (file)
@@ -5,8 +5,7 @@
     views:
       - project-view
 
-- _qp_common: &qp_common
-    # required even though overridden everywhere
+- _qp_common: &qp_common # required even though overridden everywhere
     name: qp-common
     # git repo
     project: ric-app/qp
     # source of docker tag
     container-tag-method: yaml-file
     # use host network
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     build-node: ubuntu1804-docker-4c-4g
     # do not trigger on changes in docs, releases
     gerrit_trigger_file_paths:
-        - compare-type: REG_EXP
-          pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
+      - compare-type: REG_EXP
+        pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 
-- _qp_python: &qp_python
-    # settings for python builds
+- _qp_python: &qp_python # settings for python builds
     name: qp-python
     # the install script assumes an ubuntu image
     build-node: ubuntu1804-builder-2c-2g
@@ -69,8 +67,8 @@
     name: ric-app-qp-py-verify
     # do not trigger on changes in docs, releases
     gerrit_trigger_file_paths:
-        - compare-type: REG_EXP
-          pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
+      - compare-type: REG_EXP
+        pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
     jobs:
       - gerrit-tox-verify
     stream:
     name: ric-app-qp-sonarqube
     sonar-project-file: ""
     sonar-properties: |
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        sonar.build.sourceEncoding=UTF-8
-        sonar.sources=qp
-        sonar.python.coverage.reportPaths=coverage.xml
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      sonar.build.sourceEncoding=UTF-8
+      sonar.sources=qp
+      sonar.python.coverage.reportPaths=coverage.xml
     jobs:
       - gerrit-tox-sonarqube
index 125de68..4b17a19 100644 (file)
@@ -5,8 +5,7 @@
     views:
       - project-view
 
-- _rc_common: &rc_common
-    # values apply to all projects
+- _rc_common: &rc_common # values apply to all projects
     name: rc-common
     # git repo
     project: ric-app/rc
     # also used as image name
     name: ric-app-rc
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # source type of image tag
     container-tag-method: yaml-file
     # use host network
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # trigger on any change other than a file in ./docs
     gerrit_trigger_file_paths:
-        - compare-type: REG_EXP
-          pattern: '^((?!docs/|\/COMMIT_MSG).)*$'
+      - compare-type: REG_EXP
+        pattern: '^((?!docs/|\/COMMIT_MSG).)*$'
     jobs:
-        - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
-        - master:
-            branch: master
+      - master:
+          branch: master
 
 # push nexus image from staging to release
 - project:
@@ -52,4 +51,4 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index ca95f6d..cf2dd9f 100644 (file)
@@ -5,8 +5,7 @@
     views:
       - project-view
 
-- _ts_common: &ts_common
-    # values apply to all projects
+- _ts_common: &ts_common # values apply to all projects
     name: ts-common
     # git repo
     project: ric-app/ts
     # also used as image name
     name: ric-app-ts
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # source type of image tag
     container-tag-method: yaml-file
     # use host network
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # trigger on any change other than a file in ./docs
     gerrit_trigger_file_paths:
-        - compare-type: REG_EXP
-          pattern: '^((?!docs/|\/COMMIT_MSG).)*$'
+      - compare-type: REG_EXP
+        pattern: '^((?!docs/|\/COMMIT_MSG).)*$'
     jobs:
-        - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
-        - master:
-            branch: master
+      - master:
+          branch: master
 
 # push nexus image from staging to release
 - project:
@@ -52,4 +51,4 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index 983b890..c388bcb 100644 (file)
@@ -13,8 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _a1_common: &a1_common
-    # values apply to all A1 projects
+- _a1_common: &a1_common # values apply to all A1 projects
     name: a1-common
     # git repo
     project: ric-plt/a1
     <<: *a1_common
     name: ric-plt-a1-docker
     # image name
-    docker-name: 'o-ran-sc/ric-plt-a1'
+    docker-name: "o-ran-sc/ric-plt-a1"
     # source of docker tag
     container-tag-method: yaml-file
     # use host network
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     build-node: ubuntu1804-docker-4c-4g
     # do not trigger on changes in docs, releases
     gerrit_trigger_file_paths:
-        - compare-type: REG_EXP
-          pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
+      - compare-type: REG_EXP
+        pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
     stream:
       - master:
           branch: master
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
 
 - project:
     <<: *a1_common
@@ -50,4 +49,4 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index c489dfc..e936ae8 100755 (executable)
@@ -13,8 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _alarm_go_common: &alarm_go_common
-    # values apply to all projects
+- _alarm_go_common: &alarm_go_common # values apply to all projects
     name: alarm-go-common
     # git repo
     project: ric-plt/alarm-go
     <<: *alarm_go_common
     name: ric-plt-alarm-go-docker
     # image name
-    docker-name: 'o-ran-sc/ric-plt-alarmmanager'
+    docker-name: "o-ran-sc/ric-plt-alarmmanager"
     # source of docker tag
     container-tag-method: yaml-file
     container-tag-yaml-dir: build
     # use host network
-    docker-build-args: '-f build/Dockerfile --network=host'
+    docker-build-args: "-f build/Dockerfile --network=host"
     build-node: ubuntu1804-docker-4c-4g
     stream:
       - master:
           branch: master
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
 
 - project:
     <<: *alarm_go_common
     sonar-project-file: ""
     # use sonarcloud values from defaults.yaml
     sonar-properties: |
-        # Required metadata
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        # Encoding
-        sonar.build.sourceEncoding=UTF-8
-        # Language
-        sonar.language=go
-        # Source
-        sonar.sources=.
-        # Unit tests
-        sonar.go.coverage.reportPaths=manager/cover.out,alarm/cover.out
-        # Inclusions
-        sonar.inclusions=**/*.go
-        # Exclusions
-        sonar.exclusions=**/*_test.go
+      # Required metadata
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      # Encoding
+      sonar.build.sourceEncoding=UTF-8
+      # Language
+      sonar.language=go
+      # Source
+      sonar.sources=.
+      # Unit tests
+      sonar.go.coverage.reportPaths=manager/cover.out,alarm/cover.out
+      # Inclusions
+      sonar.inclusions=**/*.go
+      # Exclusions
+      sonar.exclusions=**/*_test.go
     jobs:
       - gerrit-sonar-prescan-script
 
@@ -75,4 +74,4 @@
     name: ric-plt-alarm-go-release
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index 98809ee..b0d4736 100644 (file)
@@ -1,3 +1,4 @@
+#!/bin/sh
 #
 #   Copyright (c) 2020 HCL Technology Pvt Ltd
 #
 
 
 echo "--> prescan-ric-plt-appmgr-ubuntu.sh starts"
-cd $WORKSPACE
+cd "${WORKSPACE}" || return
 #docker build --network=host -t nexus3.o-ran-sc.org:10004/o-ran-sc/ric-plt-appmgr:0.5.0 .
 
 sed -i 's,-cover,-coverprofile cover.out,' Dockerfile
 
 docker  build --network=host -t tmpimg --target=appmgr-build .
 CONTAINER=$(docker create tmpimg)
-docker cp $CONTAINER:/go/src/ws/cover.out cover.out
-docker rm $CONTAINER
+docker cp "${CONTAINER}":/go/src/ws/cover.out cover.out
+docker rm "${CONTAINER}"
 
 echo "--> prescan-ric-plt-appmgr-ubuntu.sh ends"
index 478ba8b..b97fae0 100644 (file)
@@ -13,8 +13,8 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _appmgr_docker_common: &appmgr_docker_common
-    # values apply to all appmgr docker projects
+- _appmgr_docker_common:
+    &appmgr_docker_common # values apply to all appmgr docker projects
     name: appmgr-docker-common
     # git repo
     project: ric-plt/appmgr
     <<: *appmgr_docker_common
     name: ric-plt-appmgr
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # source of docker tag
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
     sonar-project-file: ""
     # use sonarcloud values from defaults.yaml
     sonar-properties: |
-        # Required metadata
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        # Encoding
-        sonar.build.sourceEncoding=UTF-8
-        # Language
-        sonar.language=go
-        # Source
-        sonar.sources=.
-        # Unit tests
-        sonar.go.coverage.reportPaths=**/cover.out
-        # Inclusions
-        sonar.inclusions=**/*.go
-        # Exclusions
-        sonar.exclusions=**/*_test.go
+      # Required metadata
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      # Encoding
+      sonar.build.sourceEncoding=UTF-8
+      # Language
+      sonar.language=go
+      # Source
+      sonar.sources=.
+      # Unit tests
+      sonar.go.coverage.reportPaths=**/cover.out
+      # Inclusions
+      sonar.inclusions=**/*.go
+      # Exclusions
+      sonar.exclusions=**/*_test.go
     jobs:
       - gerrit-sonar-prescan-script
 
@@ -74,4 +74,4 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index 11c0468..186ada7 100644 (file)
@@ -13,8 +13,8 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _dbaas_docker_common: &dbaas_docker_common
-    # values apply to all dbaas docker projects
+- _dbaas_docker_common:
+    &dbaas_docker_common # values apply to all dbaas docker projects
     name: dbaas-docker-common
     # git repo
     project: ric-plt/dbaas
     <<: *dbaas_docker_common
     name: ric-plt-dbaas
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # Specify docker file and host network
-    docker-build-args: '--network=host -f docker/Dockerfile.redis'
+    docker-build-args: "--network=host -f docker/Dockerfile.redis"
     # source of docker tag
     container-tag-method: yaml-file
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
@@ -45,7 +45,7 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 # analyze C code and test coverage
 - project:
     <<: *dbaas_docker_common
     make-opts: -j4 all
     sonar-project-file: ""
     sonar-properties: |
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        sonar.build.sourceEncoding=UTF-8
-        sonar.sources=src
-        sonar.cfamily.build-wrapper-output=$WORKSPACE/bw-output
-        sonar.cfamily.cache.enabled=false
-        sonar.cfamily.gcov.reportsPath=gcov_report
-        sonar.cfamily.threads=4
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      sonar.build.sourceEncoding=UTF-8
+      sonar.sources=src
+      sonar.cfamily.build-wrapper-output=$WORKSPACE/bw-output
+      sonar.cfamily.cache.enabled=false
+      sonar.cfamily.gcov.reportsPath=gcov_report
+      sonar.cfamily.threads=4
     jobs:
       - gerrit-autotools-sonarqube
index 54bb9a4..5c2fe75 100644 (file)
@@ -1,76 +1,76 @@
-#!/bin/bash\r
-##############################################################################\r
-#\r
-#   Copyright (c) 2020 AT&T Intellectual Property.\r
-#   Copyright (c) 2020 Nokia.\r
-#   Copyright (c) 2020 HCL Technologies\r
-#\r
-#   Licensed under the Apache License, Version 2.0 (the "License");\r
-#   you may not use this file except in compliance with the License.\r
-#   You may obtain a copy of the License at\r
-#\r
-#       http://www.apache.org/licenses/LICENSE-2.0\r
-#\r
-#   Unless required by applicable law or agreed to in writing, software\r
-#   distributed under the License is distributed on an "AS IS" BASIS,\r
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-#   See the License for the specific language governing permissions and\r
-#   limitations under the License.\r
-#\r
-##############################################################################\r
-\r
-# Installs prerequisites needed to compile & test SDL code\r
-# and build RPM/DEB packages on a Debian/Ubuntu machine.\r
-\r
-echo "--> setup-dbaas-build-deb.sh"\r
-\r
-# Ensure we fail the job if any steps fail.\r
-set -eux -o pipefail\r
-\r
-# NOTE: The valgrind false positive problem could also potentially be solved\r
-# with valgrind suppression files but that kind of approach may be fragile.\r
-\r
-# install prereqs\r
-sudo apt-get update && sudo apt-get -q -y install \\r
-   automake \\r
-    autoconf \\r
-    cmake \\r
-    curl \\r
-    g++ \\r
-    gcc \\r
-    libtool \\r
-    make \\r
-    pkg-config \\r
-    valgrind \\r
-    lcov\r
-\r
-# Cpputest built-in memory checks generate false positives in valgrind.\r
-# This is solved by compiling cpputest with memory checking disabled.\r
-\r
-mkdir -p cpputest/builddir\r
-cd cpputest\r
-\r
-curl -L https://github.com/cpputest/cpputest/releases/download/v3.8/cpputest-3.8.tar.gz | \\r
-    tar --strip-components=1 -xzf -\r
-cd builddir\r
-cmake -DMEMORY_LEAK_DETECTION=OFF .. && \\r
-sudo make install\r
-cd ../..\r
-# generate configure script\r
-cd redismodule\r
-./autogen.sh && \\r
-    ./configure && \\r
-sudo make test\r
-\r
-# generate configure script with memory checking disabled.\r
-\r
-./autogen.sh && \\r
-    ./configure --disable-unit-test-memcheck && \\r
-sudo make test\r
-cd ..\r
-\r
-#Copy configure to $WORKSPACE\r
-\r
-cp -r cpputest/* .\r
-\r
-echo "--> setup-dbaas-build-deb.sh ends"
\ No newline at end of file
+#!/bin/bash
+##############################################################################
+#
+#   Copyright (c) 2020 AT&T Intellectual Property.
+#   Copyright (c) 2020 Nokia.
+#   Copyright (c) 2020 HCL Technologies
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+##############################################################################
+
+# Installs prerequisites needed to compile & test SDL code
+# and build RPM/DEB packages on a Debian/Ubuntu machine.
+
+echo "--> setup-dbaas-build-deb.sh"
+
+# Ensure we fail the job if any steps fail.
+set -eux -o pipefail
+
+# NOTE: The valgrind false positive problem could also potentially be solved
+# with valgrind suppression files but that kind of approach may be fragile.
+
+# install prereqs
+sudo apt-get update && sudo apt-get -q -y install \
+   automake \
+    autoconf \
+    cmake \
+    curl \
+    g++ \
+    gcc \
+    libtool \
+    make \
+    pkg-config \
+    valgrind \
+    lcov
+
+# Cpputest built-in memory checks generate false positives in valgrind.
+# This is solved by compiling cpputest with memory checking disabled.
+
+mkdir -p cpputest/builddir
+cd cpputest
+
+curl -L https://github.com/cpputest/cpputest/releases/download/v3.8/cpputest-3.8.tar.gz | \
+    tar --strip-components=1 -xzf -
+cd builddir
+cmake -DMEMORY_LEAK_DETECTION=OFF .. && \
+sudo make install
+cd ../..
+# generate configure script
+cd redismodule
+./autogen.sh && \
+    ./configure && \
+sudo make test
+
+# generate configure script with memory checking disabled.
+
+./autogen.sh && \
+    ./configure --disable-unit-test-memcheck && \
+sudo make test
+cd ..
+
+#Copy configure to $WORKSPACE
+
+cp -r cpputest/* .
+
+echo "--> setup-dbaas-build-deb.sh ends"
index fce7565..fb5553a 100644 (file)
@@ -13,8 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _e2_docker_common: &e2_docker_common
-    # values apply to all E2 docker projects
+- _e2_docker_common: &e2_docker_common # values apply to all E2 docker projects
     name: e2-docker-common
     # git repo
     project: ric-plt/e2
     <<: *e2_docker_common
     name: ric-plt-e2
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # subdirectory
     docker-root: RIC-E2-TERMINATION
     # source of docker tag
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
@@ -47,4 +46,4 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index 666ed3f..8411f1a 100644 (file)
@@ -13,8 +13,8 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _e2mgr_docker_common: &e2mgr_docker_common
-    # values apply to all E2MGR docker projects
+- _e2mgr_docker_common:
+    &e2mgr_docker_common # values apply to all E2MGR docker projects
     name: e2mgr-docker-common
     # git repo
     project: ric-plt/e2mgr
     <<: *e2mgr_docker_common
     name: ric-plt-e2mgr
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # Dockerfile is in a subdir
     docker-root: E2Manager
     # source of docker tag
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
@@ -47,7 +47,7 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 
 - project:
     name: ric-plt-e2mgr-sonar
     sonar-project-file: ""
     # use sonarcloud values from defaults.yaml
     sonar-properties: |
-        # Required metadata
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        # Encoding
-        sonar.build.sourceEncoding=UTF-8
-        # Language
-        sonar.language=go
-        # Source
-        sonar.sources=E2Manager
-        # Unit tests
-        sonar.go.coverage.reportPaths=E2Manager/coverage.txt
-        # Inclusions
-        sonar.inclusions=**/**.go
-        # Exclusions
-        sonar.exclusions=**/mocks/**.go,**/tests/**.go
-        # Test inclusions
-        sonar.test.inclusions=**/*_test.go
+      # Required metadata
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      # Encoding
+      sonar.build.sourceEncoding=UTF-8
+      # Language
+      sonar.language=go
+      # Source
+      sonar.sources=E2Manager
+      # Unit tests
+      sonar.go.coverage.reportPaths=E2Manager/coverage.txt
+      # Inclusions
+      sonar.inclusions=**/**.go
+      # Exclusions
+      sonar.exclusions=**/mocks/**.go,**/tests/**.go
+      # Test inclusions
+      sonar.test.inclusions=**/*_test.go
     jobs:
       - gerrit-sonar-prescan-script
index 6542c84..ff05538 100644 (file)
     make-opts: package test ARGS=-V
     sonar-project-file: ""
     sonar-properties: |
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        sonar.build.sourceEncoding=UTF-8
-        sonar.sources=src/rmr
-        sonar.cfamily.build-wrapper-output=$WORKSPACE/bw-output
-        sonar.cfamily.gcov.reportsPath=test
-        sonar.cfamily.threads=2
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      sonar.build.sourceEncoding=UTF-8
+      sonar.sources=src/rmr
+      sonar.cfamily.build-wrapper-output=$WORKSPACE/bw-output
+      sonar.cfamily.gcov.reportsPath=test
+      sonar.cfamily.threads=2
     jobs:
       - gerrit-cmake-sonarqube
index 3a88197..b940288 100644 (file)
@@ -51,7 +51,7 @@
 - project:
     <<: *libe2ap_common
     name: ric-plt-libe2ap-dev
-    project-name: '{name}'
+    project-name: "{name}"
     cmake-opts: -DDEV_PKG=1
     make-opts: package
     install-prefix: /usr/local
@@ -65,7 +65,7 @@
 - project:
     <<: *libe2ap_common
     name: ric-plt-libe2ap-rt
-    project-name: '{name}'
+    project-name: "{name}"
     cmake-opts: -DDEV_PKG=0
     make-opts: package
     install-prefix: /usr/local
@@ -84,5 +84,4 @@
     jobs:
       - gerrit-packagecloud-release-verify
       - gerrit-packagecloud-release-merge
-
 # no sonar jobs as the library contains only generated code
index f6659bf..4f8548f 100644 (file)
@@ -5,8 +5,7 @@
     views:
       - project-view
 
-- _nodeb_rnib_common: &nodeb_rnib_common
-    # values apply to all projects
+- _nodeb_rnib_common: &nodeb_rnib_common # values apply to all projects
     name: nodeb-rnib-common
     # git repo
     project: ric-plt/nodeb-rnib
     # need docker
     build-node: ubuntu1804-docker-4c-4g
     # image is not pushed, use simple name and tag
-    docker-name: '{name}'
+    docker-name: "{name}"
     container-tag-method: latest
     # use host network for network resources
-    docker-build-args: '--network=host -f ci/Dockerfile'
+    docker-build-args: "--network=host -f ci/Dockerfile"
     jobs:
       - gerrit-docker-verify
       - oran-gerrit-docker-ci-pc-merge
index 0b81e3d..5f02cc0 100644 (file)
@@ -13,8 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _o1_docker_common: &o1_docker_common
-    # values apply to all docker projects
+- _o1_docker_common: &o1_docker_common # values apply to all docker projects
     name: o1-docker-common
     # git repo
     project: ric-plt/o1
     <<: *o1_docker_common
     name: ric-plt-o1
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # source of docker tag
     container-tag-method: yaml-file
     # use host for network access
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
@@ -45,4 +44,4 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index e418739..8d25fac 100644 (file)
 - project:
     <<: *dep_common
     name: ric-plt-ric-dep-chart
-    project-name: '{name}'
+    project-name: "{name}"
     build-node: ubuntu1804-builder-2c-2g
     script: "cd bin && bash verify-ric-charts"
     # limit scope to subdir with helm charts
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'helm/.*'
+        pattern: "helm/.*"
     jobs:
       - oran-shell-verify
index cc6cb82..aafee51 100644 (file)
@@ -5,8 +5,7 @@
     views:
       - project-view
 
-- _ricdms_common: &ricdms_common
-    # values apply to all projects
+- _ricdms_common: &ricdms_common # values apply to all projects
     name: ricdms-common
     # git repo
     project: ric-plt/ricdms
     <<: *ricdms_common
     name: ric-plt-ricdms
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # source of docker tag
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # trigger on any change other than a file in ./docs
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: '^((?!docs/|\/COMMIT_MSG).)*$'
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
@@ -51,4 +50,4 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index dc7b73a..d03f8ae 100644 (file)
@@ -13,8 +13,8 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _rtmgr_docker_common: &rtmgr_docker_common
-    # values apply to all rtmgr docker projects
+- _rtmgr_docker_common:
+    &rtmgr_docker_common # values apply to all rtmgr docker projects
     name: rtmgr-docker-common
     # git repo
     project: ric-plt/rtmgr
     <<: *rtmgr_docker_common
     name: ric-plt-rtmgr
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # source of docker tag
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
@@ -45,7 +45,7 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 
 - project:
     <<: *rtmgr_docker_common
     sonar-project-file: ""
     # use sonarcloud values from defaults.yaml
     sonar-properties: |
-        # Required metadata
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        # Encoding
-        sonar.build.sourceEncoding=UTF-8
-        # Language
-        sonar.language=go
-        # Source
-        sonar.sources=.
-        # Unit tests
-        sonar.go.coverage.reportPaths=./coverage.txt
-        # Inclusions
-        sonar.inclusions=pkg/**/**.go
-        # Exclusions
-        sonar.exclusions=cmd/**.go,pkg/stub/**.go,pkg/**/**_test.go
+      # Required metadata
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      # Encoding
+      sonar.build.sourceEncoding=UTF-8
+      # Language
+      sonar.language=go
+      # Source
+      sonar.sources=.
+      # Unit tests
+      sonar.go.coverage.reportPaths=./coverage.txt
+      # Inclusions
+      sonar.inclusions=pkg/**/**.go
+      # Exclusions
+      sonar.exclusions=cmd/**.go,pkg/stub/**.go,pkg/**/**_test.go
     jobs:
       - gerrit-sonar-prescan-script
index 969d937..1e480ea 100644 (file)
@@ -13,8 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _sdl_common: &sdl_common
-    # values apply to all ric-plt/sdl projects
+- _sdl_common: &sdl_common # values apply to all ric-plt/sdl projects
     name: sdl-common
     # git repo
     project: ric-plt/sdl
@@ -55,7 +54,7 @@
     <<: *sdl_common
     <<: *sdl_pkg_common
     name: ric-plt-sdl-deb
-    project-name: '{name}'
+    project-name: "{name}"
     configure-opts: --with-deb-dir={build-dir}
     make-opts: -j4 deb-pkg
 
@@ -64,7 +63,7 @@
     <<: *sdl_common
     <<: *sdl_pkg_common
     name: ric-plt-sdl-rpm
-    project-name: '{name}'
+    project-name: "{name}"
     configure-opts: --with-rpm-dir={build-dir}
     # parallel jobs (option -j) fail on rpm build
     # https://bugzilla.redhat.com/show_bug.cgi?id=1398405
     make-opts: -j4 test_gcov
     sonar-project-file: ""
     sonar-properties: |
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        sonar.build.sourceEncoding=UTF-8
-        sonar.sources=src
-        sonar.cfamily.build-wrapper-output=$WORKSPACE/bw-output
-        sonar.cfamily.cache.enabled=false
-        sonar.cfamily.gcov.reportsPath=gcov_report
-        sonar.cfamily.threads=4
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      sonar.build.sourceEncoding=UTF-8
+      sonar.sources=src
+      sonar.cfamily.build-wrapper-output=$WORKSPACE/bw-output
+      sonar.cfamily.cache.enabled=false
+      sonar.cfamily.gcov.reportsPath=gcov_report
+      sonar.cfamily.threads=4
     jobs:
       - gerrit-autotools-sonarqube
 
index 18d4d54..fab3f08 100644 (file)
@@ -44,6 +44,7 @@ export PATH=$GOPATH/bin:$PATH
 export CFG_FILE=../config/config-file.json
 export RMR_SEED_RT=../config/uta_rtg.rt
 
+# shellcheck disable=SC2034
 GO111MODULE=on GO_ENABLED=0 GOOS=linux
 
 # setup version tag
@@ -51,9 +52,11 @@ if [ -f container-tag.yaml ]
 then
     tag=$(grep "tag:" container-tag.yaml | awk '{print $2}')
 else
+    # shellcheck disable=SC2034
     tag="no-tag-found"
 fi
 
+# shellcheck disable=SC2034
 hash=$(git rev-parse --short HEAD || true)
 
 # Build
index 60ae371..e409e89 100644 (file)
@@ -13,8 +13,8 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _sdlgo_docker_common: &sdlgo_docker_common
-    # values apply to all sdlgo docker projects
+- _sdlgo_docker_common:
+    &sdlgo_docker_common # values apply to all sdlgo docker projects
     name: sdlgo-docker-common
     # git repo
     project: ric-plt/sdlgo
@@ -28,9 +28,9 @@
     <<: *sdlgo_docker_common
     name: ric-plt-sdlgo
     # image name, altho it is never pushed
-    docker-name: '{name}'
+    docker-name: "{name}"
     # use host network
-    docker-build-args: '--network=host -f ci/Dockerfile'
+    docker-build-args: "--network=host -f ci/Dockerfile"
     # image tag; use a fixed value
     container-tag-method: latest
     jobs:
     sonar-project-file: ""
     # use sonarcloud values from defaults.yaml
     sonar-properties: |
-        # Required metadata
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        # Encoding
-        sonar.build.sourceEncoding=UTF-8
-        # Language
-        sonar.language=go
-        # Source
-        sonar.sources=.
-        # Unit tests
-        sonar.go.coverage.reportPaths=**/cover.out
-        # Inclusions
-        sonar.inclusions=**/*.go
-        # Exclusions
-        sonar.exclusions=cmd/**.go,example/**.go,internal/mocks/**.go,**/*_test.go
+      # Required metadata
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      # Encoding
+      sonar.build.sourceEncoding=UTF-8
+      # Language
+      sonar.language=go
+      # Source
+      sonar.sources=.
+      # Unit tests
+      sonar.go.coverage.reportPaths=**/cover.out
+      # Inclusions
+      sonar.inclusions=**/*.go
+      # Exclusions
+      sonar.exclusions=cmd/**.go,example/**.go,internal/mocks/**.go,**/*_test.go
     jobs:
       - gerrit-sonar-prescan-script
 
@@ -73,4 +73,4 @@
     name: ric-plt-sdlgo-go-release
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index 7228942..023f405 100644 (file)
@@ -30,7 +30,7 @@
     <<: *sdlpy_common
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'ricsdl-package/.*'
+        pattern: "ricsdl-package/.*"
     tox-dir: ricsdl-package
     jobs:
       - gerrit-pypi-verify
@@ -44,7 +44,7 @@
     name: ric-plt-sdlpy-release
     <<: *sdlpy_common
     jobs:
-      - '{project-name}-gerrit-pypi-release-jobs'
+      - "{project-name}-gerrit-pypi-release-jobs"
 
 # analyze unit test coverage
 - project:
@@ -52,9 +52,9 @@
     <<: *sdlpy_common
     branch: master
     sonarcloud: true
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
     tox-dir: ricsdl-package
     mvn-params: -f ricsdl-package
     jobs:
index f60776d..a8b7f06 100644 (file)
@@ -1,5 +1,3 @@
-echo "starting prescan-ric-plt-streaming-protobufs-ubuntu.sh"
-
 #!/bin/sh
 #
 #  Copyright (c) 2019 AT&T Intellectual Property.
@@ -20,15 +18,15 @@ echo "starting prescan-ric-plt-streaming-protobufs-ubuntu.sh"
 #   This source code is part of the near-RT RIC (RAN Intelligent Controller)
 #   platform project (RICP).
 # Go install, build, etc
-set -e
+echo "--> starting prescan-ric-plt-streaming-protobufs-ubuntu.sh"
 
-
-cd $WORKSPACE/protogen/go/streaming_protobufs
+set -e
+cd "${WORKSPACE}"/protogen/go/streaming_protobufs
 
 export GO111MODULE=on
 go mod download
 #No _test.go file for coverage report
 
-go test $WORKSPACE/protogen/go/streaming_protobufs/ -v -coverprofile cover.out
+go test "${WORKSPACE}"/protogen/go/streaming_protobufs/ -v -coverprofile cover.out
 
-echo " prescan-ric-plt-streaming-protobufs-ubuntu.sh ends"
+echo "prescan-ric-plt-streaming-protobufs-ubuntu.sh ends"
index 46ec306..fecb02c 100644 (file)
@@ -13,8 +13,8 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _streaming-protobufs_docker_common: &streaming-protobufs_docker_common
-    # values apply to all streaming-protobufs docker projects
+- _streaming-protobufs_docker_common:
+    &streaming-protobufs_docker_common # values apply to all streaming-protobufs docker projects
     name: streaming-protobufs-docker-common
     # git repo
     project: ric-plt/streaming-protobufs
@@ -28,9 +28,9 @@
     <<: *streaming-protobufs_docker_common
     name: ric-plt-streaming-protobufs
     # image name, altho it is never pushed
-    docker-name: '{name}'
+    docker-name: "{name}"
     # use host network
-    docker-build-args: '--network=host -f ci/Dockerfile'
+    docker-build-args: "--network=host -f ci/Dockerfile"
     # image tag; use a fixed value
     container-tag-method: latest
     jobs:
     sonar-project-file: ""
     # use sonarcloud values from defaults.yaml
     sonar-properties: |
-        # Required metadata
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        # Encoding
-        sonar.build.sourceEncoding=UTF-8
-        # Language
-        sonar.language=go
-        # Source
-        sonar.sources=.
-        # Unit tests
-        sonar.go.coverage.reportPaths=**/cover.out
-        # Inclusions
-        sonar.inclusions=**/*.go
-        # Exclusions
-        sonar.exclusions=**/*_test.go
+      # Required metadata
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      # Encoding
+      sonar.build.sourceEncoding=UTF-8
+      # Language
+      sonar.language=go
+      # Source
+      sonar.sources=.
+      # Unit tests
+      sonar.go.coverage.reportPaths=**/cover.out
+      # Inclusions
+      sonar.inclusions=**/*.go
+      # Exclusions
+      sonar.exclusions=**/*_test.go
     jobs:
       - gerrit-sonar-prescan-script
 
@@ -75,4 +75,4 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index b259d5c..a197da9 100644 (file)
@@ -1,3 +1,5 @@
+#!/bin/sh
+#
 #   Copyright (c) 2020 HCL Technology Pvt Ltd
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
-
 #----------------------------------------------------------
 echo "--> build_ric-plt-submgr-ubuntu.sh starts"
 
 docker --version
 echo "Unit Test"
-cd $WORKSPACE
+cd "${WORKSPACE}" || return
 #docker build --network=host -t nexus3.o-ran-sc.org:10004/o-ran-sc/ric-plt-submgr:0.5.3 .
 
 # target submgrbuild
 # /tmp/submgr_cover.out
 docker  build --network=host -t tmpimg --target=submgrbuild .
 CONTAINER=$(docker create tmpimg)
-docker cp $CONTAINER:/tmp/submgr_cover.out cover.out
-docker rm $CONTAINER
+docker cp "${CONTAINER}":/tmp/submgr_cover.out cover.out
+docker rm "${CONTAINER}"
 
 echo "--> prescan-ric-plt-submgr-ubuntu.sh ends"
index dd04134..202746d 100644 (file)
@@ -13,8 +13,8 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _submgr_docker_common: &submgr_docker_common
-    # values apply to all submgr docker projects
+- _submgr_docker_common:
+    &submgr_docker_common # values apply to all submgr docker projects
     name: submgr-docker-common
     # git repo
     project: ric-plt/submgr
     <<: *submgr_docker_common
     name: ric-plt-submgr
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # source of docker tag
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
     sonar-project-file: ""
     # use sonarcloud values from defaults.yaml
     sonar-properties: |
-        # Required metadata
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        # Encoding
-        sonar.build.sourceEncoding=UTF-8
-        # Language
-        sonar.language=go
-        # Source
-        sonar.sources=.
-        # Unit tests
-        sonar.go.coverage.reportPaths=**/cover.out
-        # Inclusions
-        sonar.inclusions=**/*.go
-        # Exclusions
-        sonar.exclusions=**/*_test.go
+      # Required metadata
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      # Encoding
+      sonar.build.sourceEncoding=UTF-8
+      # Language
+      sonar.language=go
+      # Source
+      sonar.sources=.
+      # Unit tests
+      sonar.go.coverage.reportPaths=**/cover.out
+      # Inclusions
+      sonar.inclusions=**/*.go
+      # Exclusions
+      sonar.exclusions=**/*_test.go
     jobs:
       - gerrit-sonar-prescan-script
 
@@ -74,4 +74,4 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index 20d0b67..611c6c7 100644 (file)
@@ -50,7 +50,7 @@
 - project:
     <<: *tracelibcpp_common
     name: ric-plt-tracelibcpp-dev
-    project-name: '{name}'
+    project-name: "{name}"
     cmake-opts: -DDEV_PKG=1
     make-opts: package
     install-prefix: /usr/local
@@ -64,7 +64,7 @@
 - project:
     <<: *tracelibcpp_common
     name: ric-plt-tracelibcpp-rt
-    project-name: '{name}'
+    project-name: "{name}"
     cmake-opts: -DDEV_PKG=0
     make-opts: package
     install-prefix: /usr/local
     make-opts: -j8 all
     sonar-project-file: ""
     sonar-properties: |
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        sonar.scanner.force-deprecated-java-version=true
-        sonar.build.sourceEncoding=UTF-8
-        sonar.sources=src
-        sonar.cfamily.build-wrapper-output=$WORKSPACE/bw-output
-        sonar.cfamily.gcov.reportsPath=test
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      sonar.scanner.force-deprecated-java-version=true
+      sonar.build.sourceEncoding=UTF-8
+      sonar.sources=src
+      sonar.cfamily.build-wrapper-output=$WORKSPACE/bw-output
+      sonar.cfamily.gcov.reportsPath=test
     jobs:
       - gerrit-cmake-sonarqube
index 7da3445..70cfeda 100644 (file)
@@ -13,8 +13,8 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _tracelibgo_docker_common: &tracelibgo_docker_common
-    # values apply to all tracelibgo docker projects
+- _tracelibgo_docker_common:
+    &tracelibgo_docker_common # values apply to all tracelibgo docker projects
     name: tracelibgo-docker-common
     # git repo
     project: ric-plt/tracelibgo
@@ -28,9 +28,9 @@
     <<: *tracelibgo_docker_common
     name: ric-plt-tracelibgo
     # image name, altho it is never pushed
-    docker-name: '{name}'
+    docker-name: "{name}"
     # use host network
-    docker-build-args: '--network=host -f ci/Dockerfile'
+    docker-build-args: "--network=host -f ci/Dockerfile"
     # image tag; use a fixed value
     container-tag-method: latest
     jobs:
     sonar-project-file: ""
     # use sonarcloud values from defaults.yaml
     sonar-properties: |
-        # Required metadata
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        # Encoding
-        sonar.build.sourceEncoding=UTF-8
-        # Language
-        sonar.language=go
-        # Source
-        sonar.sources=.
-        # Unit tests
-        sonar.go.coverage.reportPaths=**/cover.out
-        # Inclusions
-        sonar.inclusions=**/*.go
-        # Exclusions
-        sonar.exclusions=**/*_test.go
+      # Required metadata
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      # Encoding
+      sonar.build.sourceEncoding=UTF-8
+      # Language
+      sonar.language=go
+      # Source
+      sonar.sources=.
+      # Unit tests
+      sonar.go.coverage.reportPaths=**/cover.out
+      # Inclusions
+      sonar.inclusions=**/*.go
+      # Exclusions
+      sonar.exclusions=**/*_test.go
     jobs:
       - gerrit-sonar-prescan-script
 
@@ -75,4 +75,4 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index 891f1c3..094dfd5 100644 (file)
@@ -1,17 +1,17 @@
-#!/bin/bash\r
-# SPDX-License-Identifier: EPL-1.0\r
-##############################################################################\r
-# Copyright (c) 2020 HCL Technologies and others.\r
-#\r
-# All rights reserved. This program and the accompanying materials\r
-# are made available under the terms of the Eclipse Public License v1.0\r
-# which accompanies this distribution, and is available at\r
-# http://www.eclipse.org/legal/epl-v10.html\r
-##############################################################################\r
-echo "---> cmake-sonarqube.sh"\r
-cd mgxapp\r
-docker build -t ric-plt-utils -f Dockerfile.build .\r
-docker create --name  ric-plt-utils ric-plt-utils\r
-docker cp ric-plt-utils:/playpen/build/test/ .\r
-docker rm ric-plt-utils\r
-echo "---> cmake-sonarqube.sh ends"
\ No newline at end of file
+#!/bin/bash
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2020 HCL Technologies and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+echo "---> cmake-sonarqube.sh"
+cd mgxapp || return
+docker build -t ric-plt-utils -f Dockerfile.build .
+docker create --name  ric-plt-utils ric-plt-utils
+docker cp ric-plt-utils:/playpen/build/test/ .
+docker rm ric-plt-utils
+echo "---> cmake-sonarqube.sh ends"
index a50251c..b4310ae 100644 (file)
@@ -51,7 +51,7 @@
 - project:
     <<: *utils_common
     name: ric-plt-utils-dev
-    project-name: '{name}'
+    project-name: "{name}"
     cmake-opts: -DDEV_PKG=1
     make-opts: package
     install-prefix: /usr/local
@@ -65,7 +65,7 @@
 - project:
     <<: *utils_common
     name: ric-plt-utils-rt
-    project-name: '{name}'
+    project-name: "{name}"
     cmake-opts: -DDEV_PKG=0
     make-opts: package
     install-prefix: /usr/local
     make-opts: test ARGS=-V
     sonar-project-file: ""
     sonar-properties: |
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        sonar.scanner.force-deprecated-java-version=true
-        sonar.build.sourceEncoding=UTF-8
-        sonar.sources=mgxapp/src
-        sonar.cfamily.threads=4
-        sonar.cfamily.cache.enabled=false
-        sonar.cfamily.build-wrapper-output=$WORKSPACE/bw-output
-        sonar.cfamily.gcov.reportsPath=test
-        sonar.c.file.suffixes=-
-        sonar.cpp.file.suffixes=-
-        sonar.objc.file.suffixes=-
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      sonar.scanner.force-deprecated-java-version=true
+      sonar.build.sourceEncoding=UTF-8
+      sonar.sources=mgxapp/src
+      sonar.cfamily.threads=4
+      sonar.cfamily.cache.enabled=false
+      sonar.cfamily.build-wrapper-output=$WORKSPACE/bw-output
+      sonar.cfamily.gcov.reportsPath=test
+      sonar.c.file.suffixes=-
+      sonar.cpp.file.suffixes=-
+      sonar.objc.file.suffixes=-
     jobs:
       - gerrit-cmake-sonarqube
index fba0853..f60066a 100644 (file)
@@ -1,5 +1,3 @@
-echo "--> prescan-ric-plt-vespamgr-ubuntu.sh starts"
-
 #!/bin/bash
 #
 #  Copyright (c) 2019 AT&T Intellectual Property.
@@ -21,6 +19,7 @@ echo "--> prescan-ric-plt-vespamgr-ubuntu.sh starts"
 #   platform project (RICP).
 #
 
+echo "--> prescan-ric-plt-vespamgr-ubuntu.sh starts"
 
 set -e
 set -x
index 7401c8b..52f957d 100644 (file)
@@ -13,8 +13,8 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _vespamgr_docker_common: &vespamgr_docker_common
-    # values apply to all vespamgr docker projects
+- _vespamgr_docker_common:
+    &vespamgr_docker_common # values apply to all vespamgr docker projects
     name: vespamgr-docker-common
     # git repo
     project: ric-plt/vespamgr
     <<: *vespamgr_docker_common
     name: ric-plt-vespamgr
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # source of docker tag
     container-tag-method: yaml-file
     # use host network
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
     sonar-project-file: ""
     # use sonarcloud values from defaults.yaml
     sonar-properties: |
-        # Required metadata
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        # Encoding
-        sonar.build.sourceEncoding=UTF-8
-        # Language
-        sonar.language=go
-        # Source
-        sonar.sources=.
-        # Unit tests
-        sonar.go.coverage.reportPaths=**/cover.out
-        # Inclusions
-        sonar.inclusions=**/*.go
-        # Exclusions
-        sonar.exclusions=**/*_test.go
+      # Required metadata
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      # Encoding
+      sonar.build.sourceEncoding=UTF-8
+      # Language
+      sonar.language=go
+      # Source
+      sonar.sources=.
+      # Unit tests
+      sonar.go.coverage.reportPaths=**/cover.out
+      # Inclusions
+      sonar.inclusions=**/*.go
+      # Exclusions
+      sonar.exclusions=**/*_test.go
     jobs:
       - gerrit-sonar-prescan-script
 
@@ -74,4 +74,4 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index 41e9d43..0fdbd48 100644 (file)
@@ -52,7 +52,7 @@
 - project:
     <<: *xapp_frame_cpp_common
     name: ric-plt-xapp-frame-cpp-dev
-    project-name: '{name}'
+    project-name: "{name}"
     cmake-opts: -DDEV_PKG=1
     make-opts: package
     install-prefix: /usr/local
@@ -66,7 +66,7 @@
 - project:
     <<: *xapp_frame_cpp_common
     name: ric-plt-xapp-frame-cpp-rt
-    project-name: '{name}'
+    project-name: "{name}"
     cmake-opts: -DDEV_PKG=0
     make-opts: package
     install-prefix: /usr/local
     make-opts: test ARGS=-V
     sonar-project-file: ""
     sonar-properties: |
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        sonar.build.sourceEncoding=UTF-8
-        sonar.sources=src
-        sonar.cfamily.build-wrapper-output=$WORKSPACE/bw-output
-        sonar.cfamily.gcov.reportsPath=test
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      sonar.build.sourceEncoding=UTF-8
+      sonar.sources=src
+      sonar.cfamily.build-wrapper-output=$WORKSPACE/bw-output
+      sonar.cfamily.gcov.reportsPath=test
     jobs:
       - gerrit-cmake-sonarqube
index 451cbdd..91df294 100644 (file)
@@ -33,8 +33,8 @@
     <<: *py_common
     # do not trigger on changes in docs, releases
     gerrit_trigger_file_paths:
-        - compare-type: REG_EXP
-          pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
+      - compare-type: REG_EXP
+        pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
     jobs:
       - gerrit-pypi-verify
       - gerrit-pypi-stage
     # release requires sigul which requires centos
     build-node: centos7-builder-1c-1g
     jobs:
-      - '{project-name}-gerrit-pypi-release-jobs'
+      - "{project-name}-gerrit-pypi-release-jobs"
 
 - project:
     name: ric-plt-xapp-frame-py-sonarqube
     <<: *py_common
     sonar-project-file: ""
     sonar-properties: |
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        sonar.build.sourceEncoding=UTF-8
-        sonar.sources=ricxappframe
-        sonar.exclusions=setup.py,tests/*.py
-        sonar.python.coverage.reportPaths=coverage.xml
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      sonar.build.sourceEncoding=UTF-8
+      sonar.sources=ricxappframe
+      sonar.exclusions=setup.py,tests/*.py
+      sonar.python.coverage.reportPaths=coverage.xml
     jobs:
       - gerrit-tox-sonarqube
 
index fb5a8fd..5cac6b6 100644 (file)
@@ -14,8 +14,8 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _xapp_frame_rust_docker_common: &xapp_frame_rust_docker_common
-    # values apply to all xapp-frame docker projects
+- _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
     project: ric-plt/xapp-frame-rust
@@ -29,9 +29,9 @@
     <<: *xapp_frame_rust_docker_common
     name: ric-plt-xapp-frame-rust
     # image name, altho it is never pushed
-    docker-name: '{name}'
+    docker-name: "{name}"
     # use host network
-    docker-build-args: '--network=host -f ci/Dockerfile'
+    docker-build-args: "--network=host -f ci/Dockerfile"
     # image tag; use a fixed value
     container-tag-method: latest
     jobs:
index 33b716e..b42c35e 100644 (file)
@@ -20,5 +20,5 @@
 
 docker --version
 echo "Unit Test"
-cd $WORKSPACE
+cd "${WORKSPACE}" || return
 docker build --network=host -f ci/Dockerfile -t nexus3.o-ran-sc.org:10004/ric-plt-xapp-frame:latest .
index f02e383..1179b79 100644 (file)
@@ -13,8 +13,8 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _xapp_frame_docker_common: &xapp_frame_docker_common
-    # values apply to all xapp-frame docker projects
+- _xapp_frame_docker_common:
+    &xapp_frame_docker_common # values apply to all xapp-frame docker projects
     name: xapp-frame-docker-common
     # git repo
     project: ric-plt/xapp-frame
@@ -28,9 +28,9 @@
     <<: *xapp_frame_docker_common
     name: ric-plt-xapp-frame
     # image name, altho it is never pushed
-    docker-name: '{name}'
+    docker-name: "{name}"
     # use host network
-    docker-build-args: '--network=host -f ci/Dockerfile'
+    docker-build-args: "--network=host -f ci/Dockerfile"
     # image tag; use a fixed value
     container-tag-method: latest
     jobs:
     sonar-project-file: ""
     # use sonarcloud values from defaults.yaml
     sonar-properties: |
-        # Required metadata
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        # Encoding
-        sonar.build.sourceEncoding=UTF-8
-        # Language
-        sonar.language=go
-        # Source
-        sonar.sources=.
-        # Unit tests
-        sonar.go.coverage.reportPaths=**/cover.out
-        # Inclusions
-        sonar.inclusions=**/*.go
-        # Exclusions
-        sonar.exclusions=**/*_test.go
+      # Required metadata
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      # Encoding
+      sonar.build.sourceEncoding=UTF-8
+      # Language
+      sonar.language=go
+      # Source
+      sonar.sources=.
+      # Unit tests
+      sonar.go.coverage.reportPaths=**/cover.out
+      # Inclusions
+      sonar.inclusions=**/*.go
+      # Exclusions
+      sonar.exclusions=**/*_test.go
     jobs:
       - gerrit-sonar-prescan-script
 
@@ -75,4 +75,4 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index 51891c8..4e1f343 100644 (file)
@@ -24,4 +24,4 @@
       - rtdv3-global-merge
     stream:
       - master:
-          branch: '*'
+          branch: "*"
index 3747271..729b183 100644 (file)
@@ -5,8 +5,7 @@
     views:
       - project-view
 
-- _kpimon_common: &kpimon_common
-    # values apply to all projects
+- _kpimon_common: &kpimon_common # values apply to all projects
     name: kpimon-common
     # git repo
     project: scp/ric-app/kpimon
     # also used as image name
     name: scp-ric-app-kpimon
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # source type of image tag
     container-tag-method: yaml-file
     # use host network
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # trigger on any change other than a file in ./docs
     gerrit_trigger_file_paths:
-        - compare-type: REG_EXP
-          pattern: '^((?!docs/|\/COMMIT_MSG).)*$'
+      - compare-type: REG_EXP
+        pattern: '^((?!docs/|\/COMMIT_MSG).)*$'
     jobs:
-        - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
-        - master:
-            branch: master
+      - master:
+          branch: master
 
 # push nexus image from staging to release
 - project:
@@ -52,4 +51,4 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index ecee2ff..165ac42 100755 (executable)
@@ -41,7 +41,7 @@ if [[ -z $ver ]]; then
 fi
 # default to release repo; accept override to use staging repo
 repo=${repo:-"release"}
-# 
+#
 for deb in "riclibe2ap_${ver}_amd64.deb" "riclibe2ap-dev_${ver}_amd64.deb"; do
     wget -nv --content-disposition "https://packagecloud.io/o-ran-sc/${repo}/packages/debian/stretch/${deb}/download.deb"
     sudo dpkg -i "${deb}"
index 5f437d6..ad24aea 100644 (file)
@@ -42,7 +42,7 @@ if [[ -z $ver ]]; then
 fi
 # default to release repo; accept override to use staging repo
 repo=${repo:-"release"}
-# 
+#
 for deb in "rmr_${ver}_amd64.deb" "rmr-dev_${ver}_amd64.deb"; do
     wget -nv --content-disposition "https://packagecloud.io/o-ran-sc/${repo}/packages/debian/stretch/${deb}/download.deb"
     sudo dpkg -i "${deb}"
index 98e6db0..310d092 100644 (file)
@@ -13,8 +13,8 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _sim_a1_interface_common: &sim_a1_interface_common
-    # values apply to all projects here
+- _sim_a1_interface_common:
+    &sim_a1_interface_common # values apply to all projects here
     name: sim-a1-interface-common
     # git repo
     project: sim/a1-interface
     <<: *sim_a1_interface_common
     name: a1-simulator
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # source of docker tag
     container-tag-method: yaml-file
     docker-root: near-rt-ric-simulator
     # use host network
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     build-node: ubuntu1804-docker-4c-4g
     stream:
       - master:
@@ -42,7 +42,7 @@
       - g-release:
           branch: g-release
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
 
 - project:
     <<: *sim_a1_interface_common
     build-node: ubuntu1804-builder-2c-2g
     sonar-project-file: ""
     sonar-properties: |
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        sonar.build.sourceEncoding=UTF-8
-        sonar.sources=near-rt-ric-simulator
-        sonar.python.coverage.reportPaths=coverage.xml
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      sonar.build.sourceEncoding=UTF-8
+      sonar.sources=near-rt-ric-simulator
+      sonar.python.coverage.reportPaths=coverage.xml
     jobs:
       - gerrit-tox-sonarqube
 
-
 - project:
     <<: *sim_a1_interface_common
     name: sim-a1-interface-release
@@ -69,4 +68,4 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index dd2e789..546482e 100644 (file)
@@ -13,8 +13,8 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _sim_e2_interface_common: &sim_e2_interface_common
-    # values apply to all projects here
+- _sim_e2_interface_common:
+    &sim_e2_interface_common # values apply to all projects here
     name: sim-e2-interface-common
     # git repo
     project: sim/e2-interface
     build-node: ubuntu1804-docker-4c-4g
     container-tag-method: yaml-file
     # image name
-    docker-name: 'o-ran-sc/ntsim-e2-simulator'
+    docker-name: "o-ran-sc/ntsim-e2-simulator"
     # docker root
     docker-root: e2sim
     # dockerfile is in subdir
-    docker-build-args: '--network=host -f docker/Dockerfile'
+    docker-build-args: "--network=host -f docker/Dockerfile"
     # tag file is in subdir
     container-tag-yaml-dir: e2sim/docker
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: '{docker-root}/.*'
+        pattern: "{docker-root}/.*"
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
@@ -52,4 +52,4 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index cf72e52..648f489 100644 (file)
@@ -12,4 +12,4 @@
     build-node: centos7-builder-1c-1g
     branch: master
     jobs:
-      - gerrit-info-yaml-verify
\ No newline at end of file
+      - gerrit-info-yaml-verify
index d173fe2..8164ee0 100644 (file)
@@ -13,8 +13,8 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _sim_o1_interface_docker: &sim_o1_interface_docker
-    # values apply to all sim/o1-interface docker projects
+- _sim_o1_interface_docker:
+    &sim_o1_interface_docker # values apply to all sim/o1-interface docker projects
     name: sim-o1-interface-common
     # git repo
     project: sim/o1-interface
@@ -27,7 +27,7 @@
     # if no container-tag-yaml-dir is defined, container-tag.yml is taken from the docker-root
     build-node: ubuntu1804-docker-4c-4g
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
     <<: *sim_o1_interface_docker
     name: sim-o1-interface-ntsim-ng-base
     # jenkins job name prefix
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/nts-ng-base'
+    docker-name: "o-ran-sc/nts-ng-base"
     # dockerfile is in subdir
-    docker-build-args: '--network=host -f deploy/base/ubuntu.Dockerfile'
+    docker-build-args: "--network=host -f deploy/base/ubuntu.Dockerfile"
     # tag file latest, since it is base for others
     container-tag-method: latest
     docker-root: ntsimulator
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'ntsimulator/ntsim-ng/.*'
+        pattern: "ntsimulator/ntsim-ng/.*"
       - compare-type: REG_EXP
-        pattern: 'ntsimulator/deploy/base/.*'
+        pattern: "ntsimulator/deploy/base/.*"
 
 - project:
     <<: *sim_o1_interface_docker
     name: sim-o1-interface-ntsim-ng-manager
     # jenkins job name prefix
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/ntsim-ng-manager'
+    docker-name: "o-ran-sc/ntsim-ng-manager"
     # dockerfile is in subdir
     docker-build-args: "--network=host -f Dockerfile --build-arg NTS_BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
     docker-root: ntsimulator/deploy/nts-manager
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'ntsimulator/deploy/nts-manager/.*'
+        pattern: "ntsimulator/deploy/nts-manager/.*"
 
 - project:
     <<: *sim_o1_interface_docker
     name: sim-o1-interface-ntsim-ng-o-ran-fh
     # jenkins job name prefix
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: ' o-ran-sc/nts-ng-o-ran-fh'
+    docker-name: " o-ran-sc/nts-ng-o-ran-fh"
     # dockerfile is in subdir
     docker-build-args: "--network=host -f Dockerfile --build-arg NTS_BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
     docker-root: ntsimulator/deploy/o-ran
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'ntsimulator/deploy/o-ran/.*'
+        pattern: "ntsimulator/deploy/o-ran/.*"
 
 - project:
     <<: *sim_o1_interface_docker
     name: sim-o1-interface-ntsim-ng-x-ran
     # jenkins job name prefix
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/nts-ng-x-ran'
+    docker-name: "o-ran-sc/nts-ng-x-ran"
     # dockerfile is in subdir
     docker-build-args: "--network=host -f Dockerfile --build-arg NTS_BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
     docker-root: ntsimulator/deploy/x-ran
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'ntsimulator/deploy/x-ran/.*'
+        pattern: "ntsimulator/deploy/x-ran/.*"
 
 - project:
     <<: *sim_o1_interface_docker
     name: sim-o1-interface-ntsim-ng-o-ran-ru-fh
     # jenkins job name prefix
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: ' o-ran-sc/nts-ng-o-ran-ru-fh'
+    docker-name: " o-ran-sc/nts-ng-o-ran-ru-fh"
     # dockerfile is in subdir
     docker-build-args: "--network=host -f Dockerfile --build-arg NTS_BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
     docker-root: ntsimulator/deploy/o-ran-ru-fh
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'ntsimulator/deploy/o-ran-ru-fh/.*'
+        pattern: "ntsimulator/deploy/o-ran-ru-fh/.*"
 
 - project:
     <<: *sim_o1_interface_docker
     name: sim-o1-interface-ntsim-ng-o-ran-du
     # jenkins job name prefix
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: ' o-ran-sc/nts-ng-o-ran-du'
+    docker-name: " o-ran-sc/nts-ng-o-ran-du"
     # dockerfile is in subdir
     docker-build-args: "--network=host -f Dockerfile --build-arg NTS_BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
     docker-root: ntsimulator/deploy/o-ran-du
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'ntsimulator/deploy/o-ran-du/.*'
+        pattern: "ntsimulator/deploy/o-ran-du/.*"
 
 - project:
     <<: *sim_o1_interface_docker
     name: sim-o1-interface-ntsim-ng-blank
     # jenkins job name prefix
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: ' o-ran-sc/nts-ng-blank'
+    docker-name: " o-ran-sc/nts-ng-blank"
     # dockerfile is in subdir
     docker-build-args: "--network=host -f Dockerfile --build-arg NTS_BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
     docker-root: ntsimulator/deploy/blank
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'ntsimulator/deploy/blank/.*'
+        pattern: "ntsimulator/deploy/blank/.*"
 
 - project:
     <<: *sim_o1_interface_docker
     name: sim-o1-interface-ntsim-ng-tapi-topology
     # jenkins job name prefix
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: ' o-ran-sc/smo-nts-ng-topology-server'
+    docker-name: " o-ran-sc/smo-nts-ng-topology-server"
     # dockerfile is in subdir
     docker-build-args: "--network=host -f Dockerfile --build-arg NTS_BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
     docker-root: ntsimulator/deploy/smo-nts-ng-topology-server
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'ntsimulator/deploy/smo-nts-ng-topology-server/.*'
+        pattern: "ntsimulator/deploy/smo-nts-ng-topology-server/.*"
 
 - project:
     <<: *sim_o1_interface_docker
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
index de77260..b42a37a 100644 (file)
@@ -13,8 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _smo_o1_common: &smo_o1_common
-    # values apply to all projects
+- _smo_o1_common: &smo_o1_common # values apply to all projects
     name: smo-o1-common
     # git repo
     project: smo/o1
 - project:
     <<: *smo_o1_common
     name: smo-o1-release
-    project-name: '{name}'
+    project-name: "{name}"
     # maven release requires sigul which requires centos
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 
 - project:
     <<: *smo_o1_common
index 1c5d44f..e4fa69f 100644 (file)
@@ -13,8 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _smo_o2_common: &smo_o2_common
-    # values apply to all projects
+- _smo_o2_common: &smo_o2_common # values apply to all projects
     name: smo-o2-common
     # git repo
     project: smo/o2
 - project:
     <<: *smo_o2_common
     name: smo-o2-release
-    project-name: '{name}'
+    project-name: "{name}"
     # maven release requires sigul which requires centos
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 
 - project:
     <<: *smo_o2_common
index 99b72ab..b43e7a4 100644 (file)
@@ -13,8 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- _ves_docker_common: &ves_docker_common
-    # values apply to all docker projects
+- _ves_docker_common: &ves_docker_common # values apply to all docker projects
     name: ves-docker-common
     # git repo
     project: smo/ves
 - project:
     <<: *ves_docker_common
     name: smo-ves-collector
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # Dockerfile is in a subdir
     docker-root: collector
     # source of docker tag
     container-tag-method: yaml-file
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
 - project:
     <<: *ves_docker_common
     name: smo-ves-dmaap-adapter
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # Dockerfile is in a subdir
     docker-root: dmaapadapter
     # source of docker tag
     container-tag-method: yaml-file
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
 - project:
     <<: *ves_docker_common
     name: smo-ves-influxdb-connector
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # Dockerfile is in a subdir
     docker-root: influxdb-connector
     # source of docker tag
     container-tag-method: yaml-file
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
 - project:
     <<: *ves_docker_common
     name: smo-ves-post-config
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # Dockerfile is in a subdir
     docker-root: postconfig
     # source of docker tag
     container-tag-method: yaml-file
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
 - project:
     <<: *ves_docker_common
     name: smo-ves-release
-    project-name: '{name}'
+    project-name: "{name}"
     # maven release requires sigul which requires centos
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 
 - project:
     <<: *ves_docker_common
index b31fa95..36a060e 100644 (file)
@@ -24,12 +24,12 @@ This would build a bootable image in the project's CI cloud environment.
 
 From a high level, the builds:
 
-* Boot a specified base image in the cloud
-* Run a set of shell scripts, listed in the template's shell provisioner
+- Boot a specified base image in the cloud
+- Run a set of shell scripts, listed in the template's shell provisioner
   section, to do any configuration required by the builder.
-* Execute a shutdown of the running instance
-* Execute a 'nova image-create' operation against the shutdown instance.
-* Perform a 'nova delete' operation against the shutdown instance.
+- Execute a shutdown of the running instance
+- Execute a 'nova image-create' operation against the shutdown instance.
+- Perform a 'nova delete' operation against the shutdown instance.
 
 [1]: https://www.packer.io/
 [2]: https://www.packer.io/intro/getting-started/install.html
index 8fced87..2f5b962 100644 (file)
@@ -9,7 +9,7 @@
 
   vars:
     golang_version: 1.19
-    gopath: '/opt/go/{{golang_version}}/bin'
+    gopath: "/opt/go/{{golang_version}}/bin"
 
   pre_tasks:
     - include_role: name=lfit.system-update
@@ -26,8 +26,8 @@
         ruby_download_url: http://cache.ruby-lang.org/pub/ruby/2.5/ruby-2.5.1.tar.gz
         ruby_version: 2.5.1
 
-    - name: 'Install PackageCloud'
-      command: 'gem install package_cloud'
+    - name: "Install PackageCloud"
+      command: "gem install package_cloud"
       become: true
 
     - include_role: