X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fric-plt-xapp-frame-cpp%2Fric-plt-xapp-frame-cpp.yaml;h=ca0f53968ad8641fc3e7a7998446cbe210be568e;hb=refs%2Fheads%2Fmaster;hp=fe4410381cd10638d38306de639f9f4d93b51fe3;hpb=019ca8a40cd54b691e684d96cc8e0ef448fe5324;p=ci-management.git

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 fe441038..2073fe9b 100644
--- 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
@@ -5,15 +5,7 @@
     views:
       - project-view
 
-- project:
-    name: ric-plt-xapp-frame-cpp-info
-    project: ric-plt/xapp-frame-cpp
-    project-name: ric-plt-xapp-frame-cpp
-    build-node: centos7-builder-1c-1g
-    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
@@ -26,39 +18,66 @@
     # Use ubuntu base for cmake v3
     # Use docker variant for packagecloud ruby gem
     build-node: ubuntu1804-docker-4c-4g
+    # pre-build scripts for CMake templates:
     # install alien package to build RPMS
-    # install RMR per version file in repo for ubuntu
+    # install RMR per version file in repo
     pre-build: !include-raw-escape:
       - ../shell/install-deb-alien.sh
-      - ../shell/install-deb-rmr3.sh
+      - ../shell/install-deb-rmr.sh
+      - ../shell/install-git-RESTful.sh
+    # skip install in cmake-build.sh
+    install: false
 
-# development library - publish only
+# verify every commit
 - project:
-    name: xapp-frame-cpp-lib-dev
     <<: *xapp_frame_cpp_common
-    project-name: ric-plt-xapp-frame-cpp-dev
+    name: xapp-frame-cpp-verify
     cmake-opts: -DDEV_PKG=1
-    make-opts: package ARGS=-V
+    make-opts: package test ARGS=-V
     jobs:
-      - oran-gerrit-cmake-pc-stage
+      - gerrit-cmake-verify
     stream:
       - master:
           branch: master
 
-# runtime library - test and publish
+# development library - package and publish
 - project:
-    name: xapp-frame-cpp-lib-rt
     <<: *xapp_frame_cpp_common
-    project-name: ric-plt-xapp-frame-cpp-lib
+    name: ric-plt-xapp-frame-cpp-dev
+    project-name: "{name}"
+    cmake-opts: -DDEV_PKG=1
+    make-opts: package
+    install-prefix: /usr/local
+    jobs:
+      - gerrit-cmake-packagecloud-stage
+    stream:
+      - master:
+          branch: master
+
+# runtime library - package and publish
+- project:
+    <<: *xapp_frame_cpp_common
+    name: ric-plt-xapp-frame-cpp-rt
+    project-name: "{name}"
     cmake-opts: -DDEV_PKG=0
-    make-opts: test package ARGS=-V
+    make-opts: package
+    install-prefix: /usr/local
     jobs:
-      - gerrit-cmake-verify
-      - oran-gerrit-cmake-pc-stage
+      - gerrit-cmake-packagecloud-stage
     stream:
       - master:
           branch: master
 
+# promote deb/rpm from staging to release at PackageCloud.io
+- project:
+    <<: *xapp_frame_cpp_common
+    name: ric-plt-xapp-frame-cpp-release
+    # release uses sigul which requires centos
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-packagecloud-release-verify
+      - gerrit-packagecloud-release-merge
+
 # analyze C code and test coverage
 - project:
     name: xapp-frame-cpp-sonarqube
@@ -66,13 +85,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