Refactor: JJB code

[ci-management.git] / jjb / ric-plt-xapp-frame-cpp / ric-plt-xapp-frame-cpp.yaml

diff --git a/jjb/ric-plt-xapp-frame-cpp/ric-plt-xapp-frame-cpp.yaml b/jjb/ric-plt-xapp-frame-cpp/ric-plt-xapp-frame-cpp.yaml
index 50fec4c..0fdbd48 100644 (file)
--- a/jjb/ric-plt-xapp-frame-cpp/ric-plt-xapp-frame-cpp.yaml
+++ b/jjb/ric-plt-xapp-frame-cpp/ric-plt-xapp-frame-cpp.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- xapp_frame_cpp_common: &xapp_frame_cpp_common
+- _xapp_frame_cpp_common: &xapp_frame_cpp_common
     name: xapp-frame-cpp-common
     # git repo
     project: ric-plt/xapp-frame-cpp
@@ -32,8 +32,7 @@
     pre-build: !include-raw-escape:
       - ../shell/install-deb-alien.sh
       - ../shell/install-deb-rmr.sh
-      - ../shell/install-deb-cpprest.sh
-      - ../shell/install-git-pistache.sh
+      - ../shell/install-git-RESTful.sh
     # skip install in cmake-build.sh
     install: false
 
@@ -53,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
@@ -67,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
@@ -94,13 +93,13 @@
     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