X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fric-plt-dbaas%2Fric-plt-dbaas.yaml;h=73e313a2a5102aa88d93fe0a1403d99ebef456c6;hb=8eb77018c21b7786d50e18a0c181e3612044004b;hp=d600bafa9f83d3844e0f53b9f349e62a657e80f8;hpb=5bbb4adbbf7b83d8371b4d0314cbe9165a788537;p=ci-management.git

diff --git a/jjb/ric-plt-dbaas/ric-plt-dbaas.yaml b/jjb/ric-plt-dbaas/ric-plt-dbaas.yaml
index d600bafa..73e313a2 100644
--- a/jjb/ric-plt-dbaas/ric-plt-dbaas.yaml
+++ b/jjb/ric-plt-dbaas/ric-plt-dbaas.yaml
@@ -5,35 +5,60 @@
     views:
       - project-view
 
-- dbaas_docker_common: &dbaas_docker_common
-    # values apply to all RIC docker-build projects.
-    # factored out in case this needs multiple projects.
-    # use a specific name to prevent reuse attempts
-    # bcos anchors don't cross document boundaries.
+- _dbaas_docker_common:
+    &dbaas_docker_common # values apply to all dbaas docker projects
     name: dbaas-docker-common
-    build-node: ubuntu1804-docker-4c-4g
-    # pull from the public mirror + releases registry
-    container-public-registry: nexus3.o-ran-sc.org:10001
-    # push to the staging repo bcos all builds are RCs
-    container-push-registry: nexus3.o-ran-sc.org:10004
+    # git repo
+    project: ric-plt/dbaas
+    # jenkins job name prefix
+    project-name: ric-plt-dbaas
+    # maven settings file has docker credentials
+    mvn-settings: ric-plt-dbaas-settings
+
+- project:
+    <<: *dbaas_docker_common
+    name: ric-plt-dbaas
+    # image name
+    docker-name: "o-ran-sc/{name}"
+    # Specify docker file and host network
+    docker-build-args: "--network=host -f docker/Dockerfile.redis"
     # source of docker tag
-    docker-use-params-from: yaml-file-params
+    container-tag-method: yaml-file
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
 
 - project:
-    name: ric-plt-dbaas
-    # git repo
-    project: ric-plt/dbaas
-    # jenkins job name prefix
-    project-name: '{name}'
-    # image name
-    docker-name: '{name}'
-    # Specify docker file and host network
-    docker-build-args: '--network=host -f docker/Dockerfile.redis'
-    # maven settings file has docker credentials
-    mvn-settings: ric-plt-dbaas-settings
+    <<: *dbaas_docker_common
+    name: ric-plt-dbaas-release
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-release-jobs"
+# analyze C code and test coverage
+- project:
     <<: *dbaas_docker_common
+    name: ric-plt-lib-dbaas-sonarqube
+    pre-build: !include-raw-escape: setup-dbaas-build-deb.sh
+    build-node: ubuntu1804-docker-4c-4g
+    # set appropriate CXXFLAGS
+    configure-opts: --build=i686-pc-linux-gnu
+    # use all cores
+    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
+    jobs:
+      - gerrit-autotools-sonarqube