[sr-dev] git:4.1:7b16cfad: test/travis: move travis scripts to tests/travis ( Closes #20 )

[Victor Seva]

Module: kamailio
Branch: 4.1
Commit: 7b16cfadb1de404fae4144ea878366ec6fd37ac8
URL: https://github.com/kamailio/kamailio/commit/7b16cfadb1de404fae4144ea878366ec6fd37ac8

Author: Victor Seva <linuxmaniac at torreviejawireless.org>
Committer: Victor Seva <linuxmaniac at torreviejawireless.org>
Date: 2015-01-06T22:26:09+01:00

test/travis: move travis scripts to tests/travis ( Closes #20 )

(cherry picked from commit d8642e20ae37e7724b9b9c517054b5d41c3c52f8)

Conflicts:
	.travis.yml
	test/travis/databases_travis.sh

(cherry picked from commit a0d6ec4487530147d90c0dd988824fd57260cfcc)

---

Added: test/travis/build_deps.sh
Added: test/travis/build_travis.sh
Modified: .travis.yml
Removed: pkg/kamailio/deb/build_deps.sh
Removed: pkg/kamailio/deb/build_travis.sh

---

Diff:  https://github.com/kamailio/kamailio/commit/7b16cfadb1de404fae4144ea878366ec6fd37ac8.diff
Patch: https://github.com/kamailio/kamailio/commit/7b16cfadb1de404fae4144ea878366ec6fd37ac8.patch

---

diff --git a/.travis.yml b/.travis.yml
index ecd40fd..c0708df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,8 @@ compiler:
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -y gdebi-core
-  - sudo pkg/kamailio/deb/build_deps.sh precise $TRAVIS_BUILD_DIR
-script: ./pkg/kamailio/deb/build_travis.sh
+  - sudo test/travis/build_deps.sh precise $TRAVIS_BUILD_DIR
+script: ./test/travis/build_travis.sh
 branches:
   only:
     - master
diff --git a/pkg/kamailio/deb/build_deps.sh b/pkg/kamailio/deb/build_deps.sh
deleted file mode 100755
index 10387b2..0000000
--- a/pkg/kamailio/deb/build_deps.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-#
-# build_deps script for travis CI
-# installs the build_deps packages needed to build Kamailio
-# environment based on Ubuntu 12.04 LTS (precise)
-#
-DIST=${1:-precise}
-BASE_DIR=${2:-$(pwd)}
-CONTROL_FILE="${BASE_DIR}/pkg/kamailio/deb/${DIST}/control"
-if ! [ -f "${CONTROL_FILE}" ]; then
-	echo "Error: No ${CONTROL_FILE} found"
-	exit 1
-fi
-
-BUILD_DEPS=$(/usr/bin/gdebi --quiet --non-interactive \
-	--option=APT::Install-Recommends=false \
-	--apt-line ${CONTROL_FILE})
-if [ -z "${BUILD_DEPS}" ]; then
-	echo "Error: no build deps packages resolved"
-	exit 2
-fi
-
-apt-get install -y $BUILD_DEPS
diff --git a/pkg/kamailio/deb/build_travis.sh b/pkg/kamailio/deb/build_travis.sh
deleted file mode 100755
index a18b2e7..0000000
--- a/pkg/kamailio/deb/build_travis.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-#
-# build script for travis CI
-# environment based on Ubuntu 12.04 LTS (precise)
-#
-export JAVA_HOME="/usr/lib/jvm/java-gcj"
-EXCLUDED_MODULES=""
-EXTRA_EXCLUDED_MODULES="bdb dbtext oracle pa iptrtpproxy mi_xmlrpc dnssec kazoo cnxcc"
-PACKAGE_GROUPS="mysql postgres berkeley unixodbc radius presence ldap xml perl utils lua memcached \
-	snmpstats carrierroute xmpp cpl redis python geoip\
-	sqlite json mono ims sctp java \
-	purple tls outbound websocket autheph"
-echo "make cfg"
-make FLAVOUR=kamailio cfg \
-	skip_modules="${EXCLUDED_MODULES} ${EXTRA_EXCLUDED_MODULES}" \
-	group_include="kstandard"
-echo "make all"
-make all
-echo "make groups"
-for grp in ${PACKAGE_GROUPS}; do
-	make every-module group_include="k${grp}"
-done
diff --git a/test/travis/build_deps.sh b/test/travis/build_deps.sh
new file mode 100755
index 0000000..10387b2
--- /dev/null
+++ b/test/travis/build_deps.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+#
+# build_deps script for travis CI
+# installs the build_deps packages needed to build Kamailio
+# environment based on Ubuntu 12.04 LTS (precise)
+#
+DIST=${1:-precise}
+BASE_DIR=${2:-$(pwd)}
+CONTROL_FILE="${BASE_DIR}/pkg/kamailio/deb/${DIST}/control"
+if ! [ -f "${CONTROL_FILE}" ]; then
+	echo "Error: No ${CONTROL_FILE} found"
+	exit 1
+fi
+
+BUILD_DEPS=$(/usr/bin/gdebi --quiet --non-interactive \
+	--option=APT::Install-Recommends=false \
+	--apt-line ${CONTROL_FILE})
+if [ -z "${BUILD_DEPS}" ]; then
+	echo "Error: no build deps packages resolved"
+	exit 2
+fi
+
+apt-get install -y $BUILD_DEPS
diff --git a/test/travis/build_travis.sh b/test/travis/build_travis.sh
new file mode 100755
index 0000000..a18b2e7
--- /dev/null
+++ b/test/travis/build_travis.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+#
+# build script for travis CI
+# environment based on Ubuntu 12.04 LTS (precise)
+#
+export JAVA_HOME="/usr/lib/jvm/java-gcj"
+EXCLUDED_MODULES=""
+EXTRA_EXCLUDED_MODULES="bdb dbtext oracle pa iptrtpproxy mi_xmlrpc dnssec kazoo cnxcc"
+PACKAGE_GROUPS="mysql postgres berkeley unixodbc radius presence ldap xml perl utils lua memcached \
+	snmpstats carrierroute xmpp cpl redis python geoip\
+	sqlite json mono ims sctp java \
+	purple tls outbound websocket autheph"
+echo "make cfg"
+make FLAVOUR=kamailio cfg \
+	skip_modules="${EXCLUDED_MODULES} ${EXTRA_EXCLUDED_MODULES}" \
+	group_include="kstandard"
+echo "make all"
+make all
+echo "make groups"
+for grp in ${PACKAGE_GROUPS}; do
+	make every-module group_include="k${grp}"
+done