new tests

This commit is contained in:
Jockel 2017-02-20 14:33:19 +01:00
parent 1e88b52f44
commit 9876092d3d
3 changed files with 6 additions and 5 deletions

View file

@ -12,8 +12,8 @@ before_script:
- sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu trusty main"
- sudo apt-get update -qq
- sudo apt-get install -qq wget python2.7
# - wget https://raw.githubusercontent.com/thejockel/BOSWatch/develop/install.sh
- wget https://raw.githubusercontent.com/Schrolli91/BOSWatch/master/install.sh
- wget https://raw.githubusercontent.com/thejockel/BOSWatch/develop/install.sh
# - wget https://raw.githubusercontent.com/Schrolli91/BOSWatch/master/install.sh
- chmod +x install.sh
- cat /etc/os-release
- echo ${TRAVIS_BRANCH}

View file

@ -7,7 +7,6 @@ echo $module
if [ $module == "base" ]; then
cp $bospath/config/config.template.ini $bospath/config/config.ini
sudo /usr/bin/python $bospath/boswatch.py -f 1 -d 0 -e 10 -a POC512 POC1200 POC2400 -v -t
boserror=$(sudo cat $bospath/log/boswatch.log | grep -i ERROR)
sudo chmod 777 $bospath/log/boswatch.log
if grep -Fxq '\[ERROR' "$bospath/log/boswatch.log"
@ -27,7 +26,8 @@ elif [ $module == "mysql" ]; then
sudo service mysql start
sudo mysql -e "create database boswatch;"
sudo mysql boswatch < plugins/MySQL/boswatch.sql
sudo mysql -e "\. plugins/MySQL/boswatch.sql"
#sudo mysql boswatch < plugins/MySQL/boswatch.sql
sudo /usr/bin/python $bospath/boswatch.py -f 1 -d 0 -e 10 -a POC512 POC1200 POC2400 -v -t
sudo chmod 777 $bospath/log/boswatch.log

View file

@ -166,7 +166,8 @@ echo "-> download BOSWatch..................."
cd $boswatchpath/
case $branch in
"dev") git clone -b develop https://github.com/Schrolli91/BOSWatch >> $boswatchpath/install/setup_log.txt 2>&1 && \
# "dev") git clone -b develop https://github.com/Schrolli91/BOSWatch >> $boswatchpath/install/setup_log.txt 2>&1 && \
"dev") git clone -b develop https://github.com/thejockel/BOSWatch >> $boswatchpath/install/setup_log.txt 2>&1 && \
exitcodefunction $? git-clone BOSWatch-develop ;;
*) git clone -b master https://github.com/Schrolli91/BOSWatch >> $boswatchpath/install/setup_log.txt 2>&1 && \
exitcodefunction $? git-clone BOSWatch ;;