Преглед на файлове

Merge pull request #412 from linuxmaniac/vseva/travis_docker

test/travis: migrate to docker environment
Victor Seva преди 9 години
родител
ревизия
9e4f732e89
променени са 2 файла, в които са добавени 21 реда и са изтрити 10 реда
  1. 5 4
      .travis.yml
  2. 16 6
      test/travis/build_travis.sh

+ 5 - 4
.travis.yml

@@ -1,12 +1,13 @@
+sudo: required
 language: c
 language: c
 compiler:
 compiler:
   - gcc
   - gcc
   - clang
   - clang
+services:
+  - docker
 before_install:
 before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -y gdebi-core
-  - sudo test/travis/build_deps.sh precise $TRAVIS_BUILD_DIR
-script: ./test/travis/build_travis.sh
+  - docker pull linuxmaniac/pkg-kamailio-docker:stretch
+script: docker run -v $TRAVIS_BUILD_DIR:/code:rw linuxmaniac/pkg-kamailio-docker:stretch /bin/bash -c "export CC=$CC; cd /code; ./test/travis/build_travis.sh"
 branches:
 branches:
   only:
   only:
     - 'master'
     - 'master'

+ 16 - 6
test/travis/build_travis.sh

@@ -1,19 +1,22 @@
 #!/bin/bash
 #!/bin/bash
 #
 #
 # build script for travis CI
 # build script for travis CI
-# environment based on Ubuntu 12.04 LTS (precise)
+# environment based on Debian Stretch
 #
 #
 
 
 set -e
 set -e
 
 
+# choose freeradius
+export FREERADIUS=1
+
 export JAVA_HOME="/usr/lib/jvm/java-gcj"
 export JAVA_HOME="/usr/lib/jvm/java-gcj"
 EXCLUDED_MODULES=""
 EXCLUDED_MODULES=""
-EXTRA_EXCLUDED_MODULES="bdb dbtext oracle pa iptrtpproxy mi_xmlrpc dnssec kazoo cnxcc"
+EXTRA_EXCLUDED_MODULES="bdb dbtext oracle pa iptrtpproxy mi_xmlrpc"
 PACKAGE_GROUPS="mysql postgres berkeley unixodbc radius presence ldap xml perl utils lua memcached \
 PACKAGE_GROUPS="mysql postgres berkeley unixodbc radius presence ldap xml perl utils lua memcached \
 	snmpstats carrierroute xmpp cpl redis python geoip\
 	snmpstats carrierroute xmpp cpl redis python geoip\
 	sqlite json mono ims sctp java \
 	sqlite json mono ims sctp java \
-	purple tls outbound websocket autheph"
-export TESTS_EXCLUDE="3 12 17 19 20 23 25 26 30 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 50"
+	purple tls outbound websocket autheph \
+	dnssec kazoo cnxcc erlang"
 
 
 function build {
 function build {
 	echo "make distclean"
 	echo "make distclean"
@@ -30,6 +33,15 @@ function build {
 	done
 	done
 }
 }
 
 
+if [[ "$CC" =~ clang ]] ; then
+	CLANG=$(find /usr/bin -type l -name 'clang-[0-9]*' | sort -r | head -1)
+	echo "setting clang to ${CLANG}"
+	update-alternatives --install /usr/bin/clang clang $CLANG 1
+fi
+
+echo "CC=$CC"
+echo "$($CC --version)"
+
 # build flags
 # build flags
 export MEMDBG=0
 export MEMDBG=0
 echo "build with MEMDBG=0"
 echo "build with MEMDBG=0"
@@ -39,8 +51,6 @@ export MEMDBG=1
 echo "build with MEMDBG=1"
 echo "build with MEMDBG=1"
 build
 build
 
 
-#echo "unit tests"
-#make -C test/unit
 if [[ "$CC" =~ gcc ]] ; then
 if [[ "$CC" =~ gcc ]] ; then
 	echo "make install"
 	echo "make install"
 	sudo make install
 	sudo make install