Add 0.11.0.0 to travis test matrix, remove 0.10.1.1; use scala 2.11 artifacts (#1176)

2 files changed, 18 insertions, 30 deletions

diff --git a/.travis.yml b/.travis.yml
index 3db56d1..21d4d79 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,8 @@ python:
 env:
     - KAFKA_VERSION=0.8.2.2
     - KAFKA_VERSION=0.9.0.1
-    - KAFKA_VERSION=0.10.1.1
     - KAFKA_VERSION=0.10.2.1
+    - KAFKA_VERSION=0.11.0.0
 
 sudo: false
 
diff --git a/build_integration.sh b/build_integration.sh
index 192618a..28e501d 100755
--- a/build_integration.sh
+++ b/build_integration.sh
@@ -1,28 +1,15 @@
 #!/bin/bash
 
-# Versions available for testing via binary distributions
-OFFICIAL_RELEASES="0.8.2.2 0.9.0.1 0.10.1.1 0.10.2.1"
-
-# Useful configuration vars, with sensible defaults
-if [ -z "$SCALA_VERSION" ]; then
-  SCALA_VERSION=2.10
-fi
+: ${ALL_RELEASES:="0.8.2.2 0.9.0.1 0.10.1.1 0.10.2.1 0.11.0.0"}
+: ${SCALA_VERSION:=2.11}
+: ${DIST_BASE_URL:=https://archive.apache.org/dist/kafka/}
+: ${KAFKA_SRC_GIT:=https://github.com/apache/kafka.git}
 
 # On travis CI, empty KAFKA_VERSION means skip integration tests
 # so we don't try to get binaries 
 # Otherwise it means test all official releases, so we get all of them!
 if [ -z "$KAFKA_VERSION" -a -z "$TRAVIS" ]; then
-  KAFKA_VERSION=$OFFICIAL_RELEASES
-fi
-
-# By default look for binary releases at archive.apache.org
-if [ -z "$DIST_BASE_URL" ]; then
-  DIST_BASE_URL="https://archive.apache.org/dist/kafka/"
-fi
-
-# When testing against source builds, use this git repo
-if [ -z "$KAFKA_SRC_GIT" ]; then
-  KAFKA_SRC_GIT="https://github.com/apache/kafka.git"
+  KAFKA_VERSION=$ALL_RELEASES
 fi
 
 pushd servers
@@ -48,27 +35,28 @@ pushd servers
         echo
         # kafka 0.8.0 is only available w/ scala 2.8.0
         if [ "$kafka" == "0.8.0" ]; then
-          KAFKA_ARTIFACT="kafka_2.8.0-${kafka}"
+          KAFKA_ARTIFACT="kafka_2.8.0-${kafka}.tar.gz"
         else
-          KAFKA_ARTIFACT="kafka_${SCALA_VERSION}-${kafka}"
+          KAFKA_ARTIFACT="kafka_${SCALA_VERSION}-${kafka}.tgz"
         fi
         if [ ! -f "../$kafka/kafka-bin/bin/kafka-run-class.sh" ]; then
-          echo "Downloading kafka ${kafka} tarball"
-          if hash wget 2>/dev/null; then
-            wget -N https://archive.apache.org/dist/kafka/$kafka/${KAFKA_ARTIFACT}.tgz || wget -N https://archive.apache.org/dist/kafka/$kafka/${KAFKA_ARTIFACT}.tar.gz
+          if [ -f "${KAFKA_ARTIFACT}" ]; then
+            echo "Using cached artifact: ${KAFKA_ARTIFACT}"
           else
-            echo "wget not found... using curl"
-            if [ -f "${KAFKA_ARTIFACT}.tar.gz" ]; then
-              echo "Using cached artifact: ${KAFKA_ARTIFACT}.tar.gz"
+            echo "Downloading kafka ${kafka} tarball"
+            TARBALL=${DIST_BASE_URL}${kafka}/${KAFKA_ARTIFACT}
+            if command -v wget 2>/dev/null; then
+              wget -N $TARBALL
             else
-              curl -f https://archive.apache.org/dist/kafka/$kafka/${KAFKA_ARTIFACT}.tgz -o ${KAFKA_ARTIFACT}.tar.gz || curl -f https://archive.apache.org/dist/kafka/$kafka/${KAFKA_ARTIFACT}.tar.gz -o ${KAFKA_ARTIFACT}.tar.gz
+              echo "wget not found... using curl"
+              curl -f $TARBALL -o ${KAFKA_ARTIFACT}
             fi
           fi
           echo
           echo "Extracting kafka ${kafka} binaries"
-          tar xzvf ${KAFKA_ARTIFACT}.t* -C ../$kafka/
+          tar xzvf ${KAFKA_ARTIFACT} -C ../$kafka/
           rm -rf ../$kafka/kafka-bin
-          mv ../$kafka/${KAFKA_ARTIFACT} ../$kafka/kafka-bin
+          mv ../$kafka/${KAFKA_ARTIFACT/%.t*/} ../$kafka/kafka-bin
           if [ ! -f "../$kafka/kafka-bin/bin/kafka-run-class.sh" ]; then
             echo "Extraction Failed ($kafka/kafka-bin/bin/kafka-run-class.sh does not exist)!"
             exit 1