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=0fdbd480c95bc984863877a3f1f1a313e15ae0e4;hb=7d05e42a8d929b03b1818385e11124ca77e9e2aa;hp=5fd387bf287d89f13626d30188a712ac9b51c455;hpb=cebc424502f328e13442d4da533395450097cf95;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 5fd387bf..0fdbd480 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
@@ -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
@@ -26,37 +26,80 @@
     # Use ubuntu base for cmake v3
     # Use docker variant for packagecloud ruby gem
     build-node: ubuntu1804-docker-4c-4g
-    # install RMR per version file in repo for ubuntu
+    # pre-build scripts for CMake templates:
+    # install alien package to build RPMS
+    # install RMR per version file in repo
     pre-build: !include-raw-escape:
-      - ../shell/install-deb-rmr3.sh
-    # verify and sonar use cmake
-    cmake-opts: -DDEV_PKG=1
-    make-opts: install test ARGS=-V
+      - ../shell/install-deb-alien.sh
+      - ../shell/install-deb-rmr.sh
+      - ../shell/install-git-RESTful.sh
+    # skip install in cmake-build.sh
+    install: false
 
-# verify on changes, publish on stage
+# verify every commit
 - project:
-    name: xapp-frame-cpp-verify
     <<: *xapp_frame_cpp_common
+    name: xapp-frame-cpp-verify
+    cmake-opts: -DDEV_PKG=1
+    make-opts: package test ARGS=-V
     jobs:
       - gerrit-cmake-verify
-      - oran-gerrit-cmake-pc-stage
     stream:
       - master:
           branch: master
 
+# development library - package and publish
+- project:
+    <<: *xapp_frame_cpp_common
+    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: package
+    install-prefix: /usr/local
+    jobs:
+      - 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
     <<: *xapp_frame_cpp_common
+    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