modify ci

1 files changed, 30 insertions, 30 deletions

diff --git a/ci/travis.sh b/ci/travis.sh
index 26f20ba..60cc31c 100644
--- a/ci/travis.sh
+++ b/ci/travis.sh
@@ -4,21 +4,21 @@ set -evx
 chmod +x ci/get-nprocessors.sh
 . ci/get-nprocessors.sh
 
-# if possible, ask for the precise number of processors,
+# If possible, ask for the precise number of processors,
 # otherwise take 2 processors as reasonable default; see
 # https://docs.travis-ci.com/user/speeding-up-the-build/#Makefile-optimization
 if [ -x /usr/bin/getconf ]; then
-    NPROCESSORS=$(/usr/bin/getconf _NPROCESSORS_ONLN)
+  NPROCESSORS=$(/usr/bin/getconf _NPROCESSORS_ONLN)
 else
-    NPROCESSORS=2
+  NPROCESSORS=2
 fi
 
-# as of 2017-09-04 Travis CI reports 32 processors, but GCC build
+# As of 2017-09-04 Travis CI reports 32 processors, but GCC build
 # crashes if parallelized too much (maybe memory consumption problem),
 # so limit to 4 processors for the time being.
-if [ $NPROCESSORS -gt 4 ] ; then
-	echo "$0:Note: Limiting processors to use by make from $NPROCESSORS to 4."
-	NPROCESSORS=4
+if [ $NPROCESSORS -gt 4 ]; then
+  echo "$0:Note: Limiting processors to use by make from $NPROCESSORS to 4."
+  NPROCESSORS=4
 fi
 
 # Tell make to use the processors. No preceding '-' required.
@@ -33,40 +33,40 @@ env | sort
 : "${COMPILER_IS_GNUCXX:=OFF}"
 
 # Install dependency from YUM
-if [ -n "${INSTALL_DEPENDENCY_LIBRARY}" ]; then
-	yum install -y $INSTALL_DEPENDENCY_LIBRARY
-	source /etc/profile.d/framework.sh
-  source /etc/profile.d/mrzcpd.sh
-fi
+yum install -y libasan
+yum install -y mrzcpd
+yum install -y libmaat4-devel
+yum install -y libswarmkv-devel
+yum install -y libMESA_handle_logger-devel
+yum install -y libMESA_prof_load-devel
+yum install -y sapp-devel # Maat_rule require MESA/stream.h
+yum install -y numactl-libs # required by mrzcpd
+yum install -y libibverbs # required by mrzcpd
+yum install -y libbreakpad_mini-devel
 
-if [ $ASAN_OPTION ] && [ -f "/opt/rh/devtoolset-7/enable" ] ;then
-	source /opt/rh/devtoolset-7/enable
+if [ $ASAN_OPTION ]; then
+  source /opt/rh/devtoolset-7/enable
 fi
 
 mkdir build || true
 cd build
 
 cmake3 -DCMAKE_CXX_FLAGS=$CXX_FLAGS \
-      -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
-      -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \
-      -DASAN_OPTION=$ASAN_OPTION \
-      -DVERSION_DAILY_BUILD=$TESTING_VERSION_BUILD \
-      ..
-
+  -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
+  -DASAN_OPTION=$ASAN_OPTION \
+  -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \
+  -DVERSION_DAILY_BUILD=$TESTING_VERSION_BUILD \
+  ..
 make
 
 if [ -n "${PACKAGE}" ]; then
-	make package
-fi
-
-if [ -n "${UPLOAD_RPM}" ]; then
-	cp ~/rpm_upload_tools.py ./
-	python3 rpm_upload_tools.py ${PULP3_REPO_NAME} ${PULP3_DIST_NAME} *.rpm
+  make package
+  cp ~/rpm_upload_tools.py ./
+  python3 rpm_upload_tools.py ${PULP3_REPO_NAME} ${PULP3_DIST_NAME} *.rpm
 fi
 
 if [ -n "${UPLOAD_SYMBOL_FILES}" ]; then
-	rpm -i $SYMBOL_TARGET*debuginfo*.rpm
-	_symbol_file=`find /usr/lib/debug/ -name "$SYMBOL_TARGET*.so*.debug"`
-	cp $_symbol_file ${_symbol_file}info.${CI_COMMIT_SHORT_SHA}
-	sentry-cli upload-dif -t elf ${_symbol_file}info.${CI_COMMIT_SHORT_SHA}
+  rpm -i shaping_engine*debuginfo*.rpm
+  cp /usr/lib/debug/opt/tsg/shaping_engine/bin/shaping_engine*debug /tmp/shaping_engine.debuginfo.${CI_COMMIT_SHORT_SHA}
+  sentry-cli upload-dif -t elf /tmp/shaping_engine.debuginfo.${CI_COMMIT_SHORT_SHA}
 fi