build: add CentOS 8 support; drop CentOS 7
Refs: #5040, #5087
Change-Id: I6dcc5e9ee6b4839a6b3f15f1ad6dabf140301ae4
diff --git a/.jenkins.d/00-deps.sh b/.jenkins.d/00-deps.sh
index 187f595..52a8a97 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)
@@ -27,28 +22,17 @@
brew install "${FORMULAE[@]}"
brew cleanup
fi
-fi
-if has Ubuntu $NODE_LABELS; then
+elif has Ubuntu $NODE_LABELS; then
sudo apt-get -qq update
- sudo apt-get -qy install build-essential pkg-config python3-minimal \
+ sudo apt-get -qy install g++ pkg-config python3-minimal \
libboost-all-dev libssl-dev libsqlite3-dev
if [[ $JOB_NAME == *"code-coverage" ]]; then
sudo apt-get -qy install gcovr lcov libgd-perl
fi
-fi
-if has CentOS-7 $NODE_LABELS; then
- sudo yum -y install yum-utils pkgconfig \
- openssl-devel libtranslit-icu \
- python-devel sqlite-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 -y install gcc-c++ libasan pkgconf-pkg-config python3 \
+ boost-devel openssl-devel sqlite-devel
fi