diff --git a/.jenkins b/.jenkins index 25bf743..287bdd7 100755 --- a/.jenkins +++ b/.jenkins @@ -1,6 +1,8 @@ #!/usr/bin/env bash set -e +source .jenkins.d/util.sh +export CACHE_DIR=${CACHE_DIR:-/tmp} export WAF_JOBS=${WAF_JOBS:-1} nanos() { diff --git a/.jenkins.d/00-deps.sh b/.jenkins.d/00-deps.sh index 617f383..14e41a4 100755 --- a/.jenkins.d/00-deps.sh +++ b/.jenkins.d/00-deps.sh @@ -1,10 +1,5 @@ #!/usr/bin/env bash -set -e - -JDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -source "$JDIR"/util.sh - -set -x +set -ex if has OSX $NODE_LABELS; then FORMULAE=(boost openssl pkg-config) @@ -38,17 +33,9 @@ elif has Ubuntu $NODE_LABELS; then sudo apt-get -qy install gcovr lcov libgd-perl fi -elif has CentOS-7 $NODE_LABELS; then - sudo yum -y install yum-utils pkgconfig \ - openssl-devel libtranslit-icu \ - python-devel sqlite-devel \ - libpcap-devel \ - devtoolset-7-libasan-devel \ - devtoolset-7-liblsan-devel - sudo yum -y groupinstall 'Development Tools' - - svn checkout https://github.com/cmscaltech/sandie-ndn/trunk/packaging/RPMS/x86_64/boost1_58_0 - pushd boost1_58_0 >/dev/null - sudo rpm -Uv --replacepkgs --replacefiles boost-devel* boost-license* libboost_* - popd >/dev/null +elif has CentOS-8 $NODE_LABELS; then + sudo dnf config-manager --enable PowerTools + sudo dnf -y install gcc-c++ libasan pkgconf-pkg-config python3 \ + boost-devel openssl-devel sqlite-devel \ + libpcap-devel fi diff --git a/.jenkins.d/01-ndn-cxx.sh b/.jenkins.d/01-ndn-cxx.sh index 0ae5022..e5bdda8 100755 --- a/.jenkins.d/01-ndn-cxx.sh +++ b/.jenkins.d/01-ndn-cxx.sh @@ -1,12 +1,7 @@ #!/usr/bin/env bash -set -e +set -ex -JDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -source "$JDIR"/util.sh - -set -x - -pushd "${CACHE_DIR:-/tmp}" >/dev/null +pushd "$CACHE_DIR" >/dev/null INSTALLED_VERSION= if has OSX $NODE_LABELS; then @@ -22,17 +17,15 @@ if [[ -z $INSTALLED_VERSION ]]; then INSTALLED_VERSION=$(git -C ndn-cxx rev-parse HEAD 2>/dev/null || echo NONE) fi -sudo rm -Rf ndn-cxx-latest - +sudo rm -rf ndn-cxx-latest git clone --depth 1 git://github.com/named-data/ndn-cxx ndn-cxx-latest - LATEST_VERSION=$(git -C ndn-cxx-latest rev-parse HEAD 2>/dev/null || echo UNKNOWN) if [[ $INSTALLED_VERSION != $LATEST_VERSION ]]; then - sudo rm -Rf ndn-cxx + sudo rm -rf ndn-cxx mv ndn-cxx-latest ndn-cxx else - sudo rm -Rf ndn-cxx-latest + sudo rm -rf ndn-cxx-latest fi sudo rm -f /usr/local/bin/ndnsec* @@ -42,13 +35,20 @@ sudo rm -f /usr/local/lib{,64}/pkgconfig/libndn-cxx.pc pushd ndn-cxx >/dev/null -./waf --color=yes configure --disable-static --enable-shared --without-osx-keychain +if has CentOS-8 $NODE_LABELS; then + PCH="--without-pch" +fi + +./waf --color=yes configure --disable-static --enable-shared --without-osx-keychain $PCH ./waf --color=yes build -j$WAF_JOBS sudo_preserve_env PATH -- ./waf --color=yes install popd >/dev/null popd >/dev/null +if has CentOS-8 $NODE_LABELS; then + sudo tee /etc/ld.so.conf.d/ndn.conf >/dev/null <<< /usr/local/lib64 +fi if has Linux $NODE_LABELS; then sudo ldconfig fi diff --git a/.jenkins.d/10-build.sh b/.jenkins.d/10-build.sh index ccbcc93..f5ef90a 100755 --- a/.jenkins.d/10-build.sh +++ b/.jenkins.d/10-build.sh @@ -1,10 +1,5 @@ #!/usr/bin/env bash -set -e - -JDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -source "$JDIR"/util.sh - -set -x +set -ex git submodule sync git submodule update --init diff --git a/.jenkins.d/20-tests.sh b/.jenkins.d/20-tests.sh index c216d3c..226c77d 100755 --- a/.jenkins.d/20-tests.sh +++ b/.jenkins.d/20-tests.sh @@ -1,10 +1,5 @@ #!/usr/bin/env bash -set -e - -JDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -source "$JDIR"/util.sh - -set -x +set -ex # Prepare environment rm -rf ~/.ndn @@ -30,8 +25,7 @@ ASAN_OPTIONS+=":check_initialization_order=1" ASAN_OPTIONS+=":detect_stack_use_after_return=1" ASAN_OPTIONS+=":strict_init_order=1" ASAN_OPTIONS+=":strict_string_checks=1" -ASAN_OPTIONS+=":detect_invalid_pointer_pairs=1" -ASAN_OPTIONS+=":detect_container_overflow=0" +ASAN_OPTIONS+=":detect_invalid_pointer_pairs=2" ASAN_OPTIONS+=":strip_path_prefix=${PWD}/" export ASAN_OPTIONS diff --git a/.jenkins.d/30-coverage.sh b/.jenkins.d/30-coverage.sh index 2c8ce82..dcf7e05 100755 --- a/.jenkins.d/30-coverage.sh +++ b/.jenkins.d/30-coverage.sh @@ -1,10 +1,5 @@ #!/usr/bin/env bash -set -e - -JDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -source "$JDIR"/util.sh - -set -x +set -ex if [[ $JOB_NAME == *"code-coverage" ]]; then gcovr --object-directory=build \ diff --git a/.jenkins.d/README.md b/.jenkins.d/README.md index 6cba1e4..e8dbf37 100644 --- a/.jenkins.d/README.md +++ b/.jenkins.d/README.md @@ -1,36 +1,28 @@ -CONTINUOUS INTEGRATION SCRIPTS -============================== +# CONTINUOUS INTEGRATION SCRIPTS -Environment Variables Used in Build Scripts -------------------------------------------- +## Environment Variables Used in Build Scripts -- `NODE_LABELS`: the variable defines a list of OS properties. The set values are used by the - build scripts to select proper behavior for different OS. +- `NODE_LABELS`: space-separated list of platform properties. The included values are used by + the build scripts to select the proper behavior for different operating systems and versions. - The list should include at least `[OS_TYPE]`, `[DISTRO_TYPE]`, and `[DISTRO_VERSION]`. + The list should normally contain `[OS_TYPE]`, `[DISTRO_TYPE]`, and `[DISTRO_VERSION]`. - Possible values for Linux: + Example values: - * `[OS_TYPE]`: `Linux` - * `[DISTRO_TYPE]`: `Ubuntu` - * `[DISTRO_VERSION]`: `Ubuntu-16.04`, `Ubuntu-18.04` + - `[OS_TYPE]`: `Linux`, `OSX` + - `[DISTRO_TYPE]`: `Ubuntu`, `CentOS` + - `[DISTRO_VERSION]`: `Ubuntu-16.04`, `Ubuntu-18.04`, `CentOS-8`, `OSX-10.14`, `OSX-10.15` - Possible values for macOS: - - * `[OS_TYPE]`: `OSX` - * `[DISTRO_TYPE]`: `OSX` (can be absent) - * `[DISTRO_VERSION]`: `OSX-10.12`, `OSX-10.13`, `OSX-10.14` - -- `JOB_NAME`: optional variable to define type of the job. Depending on the defined job type, +- `JOB_NAME`: optional variable that defines the type of build job. Depending on the job type, the build scripts can perform different tasks. Possible values: - * empty: default build process - * `code-coverage` (Ubuntu Linux is assumed): debug build with tests and code coverage analysis - * `limited-build`: only a single debug build with tests + - empty: default build task + - `code-coverage`: debug build with tests and code coverage analysis (Ubuntu Linux is assumed) + - `limited-build`: only a single debug build with tests -- `CACHE_DIR`: the variable defines a path to folder containing cached files from previous builds, - e.g., a compiled version of ndn-cxx library. If not set, `/tmp` is used. +- `CACHE_DIR`: directory containing cached files from previous builds, e.g., a compiled version + of ndn-cxx. If not set, `/tmp` is used. -- `WAF_JOBS`: number of parallel build jobs used by waf, defaults to 1. +- `WAF_JOBS`: number of parallel build threads used by waf, defaults to 1. diff --git a/.jenkins.d/util.sh b/.jenkins.d/util.sh index 8ddc4ba..8077a74 100644 --- a/.jenkins.d/util.sh +++ b/.jenkins.d/util.sh @@ -16,6 +16,7 @@ has() { set ${saved_xtrace} return ${ret} } +export -f has sudo_preserve_env() { local saved_xtrace @@ -35,3 +36,4 @@ sudo_preserve_env() { set ${saved_xtrace} sudo env "${vars[@]}" "$@" } +export -f sudo_preserve_env