From 31e3c22656e064ee72f703f8f845a53a52b99cf7 Mon Sep 17 00:00:00 2001
From: Dana Powers <dana.powers@rd.io>
Date: Tue, 12 Aug 2014 21:19:48 -0700
Subject: [PATCH] Use travis env vars to run kafka version tests in parallel

---
 .travis.yml          |  8 +++++---
 build_integration.sh | 14 +++++++-------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bd5f63a..d658ae8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,12 @@ python:
     - 2.7
     - pypy
 
+env:
+    - 
+    - KAFKA_VERSION=0.8.0
+    - KAFKA_VERSION=0.8.1
+
 before_install:
-    - git submodule update --init --recursive
     - sudo apt-get install libsnappy-dev
     - ./build_integration.sh
 
@@ -19,5 +23,3 @@ install:
 
 script:
     - tox -e `./travis_selector.sh $TRAVIS_PYTHON_VERSION`
-    - KAFKA_VERSION=0.8.0 tox -e `./travis_selector.sh $TRAVIS_PYTHON_VERSION`
-    - KAFKA_VERSION=0.8.1 tox -e `./travis_selector.sh $TRAVIS_PYTHON_VERSION`
diff --git a/build_integration.sh b/build_integration.sh
index 70bf180..3b9b4a7 100755
--- a/build_integration.sh
+++ b/build_integration.sh
@@ -1,15 +1,15 @@
 #!/bin/bash
 
-#git submodule update --init
-#(cd servers/0.8.0/kafka-src && ./sbt update package assembly-package-dependency)
-#(cd servers/0.8.1/kafka-src && ./gradlew jar)
-
-SCALA_VERSION=2.8.0
-KAFKA_VERSIONS="0.8.0 0.8.1 0.8.1.1"
+if [ -z "$SCALA_VERSION" ]; then
+  SCALA_VERSION=2.8.0
+fi
+if [ -z "$KAFKA_VERSION" && -z "$TRAVIS" ]; then
+  KAFKA_VERSION="0.8.0 0.8.1"
+fi
 pushd servers
   mkdir -p dist
   pushd dist
-    for kafka in $KAFKA_VERSIONS; do
+    for kafka in $KAFKA_VERSION; do
       echo "-------------------------------------"
       echo "Checking kafka binaries for v${kafka}"
       echo