Resolved the error with "make test"
Removing to avoid Jenkins verification values for dbaas changes.
Reference: https://jenkins.o-ran-sc.org/job/ric-plt-dbaas-autotools-verify-master/1/console
Signed-off-by: Alok Bhatt <alok_bh@hcl.com>
Change-Id: I012ab8fc2815d716247f915d19a40b0bcb68bc12
diff --git a/jjb/ric-plt-dbaas/ric-plt-dbaas.yaml b/jjb/ric-plt-dbaas/ric-plt-dbaas.yaml
index 6b49119..4af3a47 100644
--- a/jjb/ric-plt-dbaas/ric-plt-dbaas.yaml
+++ b/jjb/ric-plt-dbaas/ric-plt-dbaas.yaml
@@ -13,66 +13,42 @@
jobs:
- gerrit-info-yaml-verify
-- dbaas_common: &dbaas_common
- # values apply to all ric-plt/dbaas projects
- name: dbaas-common
+- dbaas_docker_common: &dbaas_docker_common
+ # values apply to all dbaas docker projects
+ name: dbaas-docker-common
# git repo
project: ric-plt/dbaas
# jenkins job name prefix
project-name: ric-plt-dbaas
- # maven settings file has credentials
+ # maven settings file has docker credentials
mvn-settings: ric-plt-dbaas-settings
-# compile code and run tests
- project:
- <<: *dbaas_common
- name: ric-plt-dbaas-lib
- pre-build: !include-raw-escape: setup-dbaas-build-deb.sh
- build-node: ubuntu1804-builder-2c-2g
- make-opts: -j 2 test
+ <<: *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
+ container-tag-method: yaml-file
jobs:
- - gerrit-autotools-verify
+ - '{project-name}-gerrit-docker-jobs'
stream:
- master:
branch: master
-# common settings for building DEB and RPM packages
-- dbaas_pkg_common: &dbaas_pkg_common
- name: ric-plt-pkg-cmn
- pre-build: !include-raw-escape: setup-dbaas-build-deb.sh
- # directory with package files
- build-dir: pkg
- # docker image has the package_cloud gem
- build-node: ubuntu1804-docker-4c-4g
+- project:
+ <<: *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:
- - gerrit-autotools-packagecloud-stage
- stream:
- - master:
- branch: master
-
-# build DEB package files
-- project:
- <<: *dbaas_common
- <<: *dbaas_pkg_common
- name: ric-plt-dbaas-deb
- project-name: '{name}'
- configure-opts: --with-deb-dir={build-dir}
- make-opts: -j4 deb-pkg
-
-# build RPM package files
-- project:
- <<: *dbaas_common
- <<: *dbaas_pkg_common
- name: ric-plt-dbaas-rpm
- 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: rpm-pkg
-
+ - '{project-name}-gerrit-release-jobs'
# analyze C code and test coverage
- project:
- <<: *dbaas_common
+ <<: *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
@@ -94,10 +70,3 @@
sonar.cfamily.threads=4
jobs:
- gerrit-autotools-sonarqube
-
-- project:
- <<: *dbaas_common
- name: ric-plt-dbaas-release
- jobs:
- - gerrit-packagecloud-release-verify
- - gerrit-packagecloud-release-merge
diff --git a/jjb/ric-plt-dbaas/setup-dbaas-build-deb.sh b/jjb/ric-plt-dbaas/setup-dbaas-build-deb.sh
index 6b89a09..54bb9a4 100644
--- a/jjb/ric-plt-dbaas/setup-dbaas-build-deb.sh
+++ b/jjb/ric-plt-dbaas/setup-dbaas-build-deb.sh
@@ -1,7 +1,9 @@
#!/bin/bash
##############################################################################
#
-# Copyright (c) 2020 HCL Technology.
+# 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.
@@ -20,22 +22,55 @@
# Installs prerequisites needed to compile & test SDL code
# and build RPM/DEB packages on a Debian/Ubuntu machine.
-echo "--> setup-sdl-build-deb.sh"
+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 \
- autoconf-archive libhiredis-dev rpm valgrind \
- libboost-filesystem-dev libboost-program-options-dev libboost-system-dev
+ automake \
+ autoconf \
+ cmake \
+ curl \
+ g++ \
+ gcc \
+ libtool \
+ make \
+ pkg-config \
+ valgrind \
+ lcov
-# generate configure script
-cd redismodule
-autoreconf --install
-cd ..
+# 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 -
-cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_COVERAGE=ON -DMEMORY_LEAK_DETECTION=OFF .
+cd builddir
+cmake -DMEMORY_LEAK_DETECTION=OFF .. && \
sudo make install
-echo "--> setup-sdl-build-deb.sh ends"
\ No newline at end of file
+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"
\ No newline at end of file