Merge 99a91c5 into 9c5c51d

OCA · Jul 21, 2014 · 1dfda74 · 1dfda74
2 parents 9c5c51d + 99a91c5
commit 1dfda74
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,8 @@ virtualenv:
   system_site_packages: true
 
 env:
-  - VERSION="master"
+  - VERSION="master" ODOO_REPO="odoo/odoo"
+  - VERSION="master" ODOO_REPO="OCA/OCB"
   - VERSION="8.0"
   - VERSION="7.0"
   - VERSION="6.1"

diff --git a/sample_files/.travis.yml b/sample_files/.travis.yml
@@ -4,7 +4,8 @@ python:
   - "2.7"
 
 env:
-  - VERSION="8.0"
+  - VERSION="7.0" ODOO_REPO="odoo/odoo"
+  - VERSION="7.0" ODOO_REPO="OCA/OCB"
 
 virtualenv:
   system_site_packages: true

diff --git a/travis/travis_install_nightly b/travis/travis_install_nightly
@@ -1,6 +1,9 @@
 #!/bin/bash
 
-ODOO_URL="https://github.com/odoo/odoo/archive/$1.tar.gz"
+: ${ODOO_REPO:="odoo/odoo"}  # default value, if not set
+IFS="/" read -a REPO <<< "${ODOO_REPO}"
+ODOO_URL="https://github.com/${REPO[0]}/${REPO[1]}/archive/${1}.tar.gz"
+
 echo "Installing Odoo ${ODOO_URL}"
 wget -O odoo.tar.gz ${ODOO_URL}
 tar -xf odoo.tar.gz -C ../

diff --git a/travis/travis_run_tests b/travis/travis_run_tests
@@ -20,8 +20,13 @@ case ${version} in
         ;;
 esac
 
-server_path="../odoo-$version"
+: ${ODOO_REPO:="odoo/odoo"}  # default value, if not set
+IFS="/" read -a REPO <<< "$ODOO_REPO"
+
+server_path="../${REPO[1]}-$version"
 addons_path="$server_path/addons"
+echo "Using repo $ODOO_REPO and addons path $addons_path"
+
 
 for repo in "$@" $TRAVIS_BUILD_DIR; 
 do