From 0e9d7d1451c2c3414b844a5d18c4badcc4fb1bd3 Mon Sep 17 00:00:00 2001
From: nikhiljindal <nikhiljindal@google.com>
Date: Tue, 12 May 2015 13:54:11 -0700
Subject: [PATCH] Fixing the number of times our unit tests are run

---
 .travis.yml     | 12 ++++++++----
 hack/test-go.sh | 38 ++++++++++++++++++++++++++------------
 shippable.yml   | 10 ++++++----
 3 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index aa76bc042d3..b38db6ae40e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,13 @@ language: go
 matrix:
   include:
     - go: 1.4
-      env: KUBE_TEST_API_VERSIONS="v1beta1"
+      env:
+        - KUBE_TEST_API_VERSIONS="v1beta1"
+          KUBE_TEST_ETCD_PREFIXES="registry"
     - go: 1.3
-      env: KUBE_TEST_API_VERSIONS="v1beta3"
+      env:
+        - KUBE_TEST_API_VERSIONS="v1beta3"
+          KUBE_TEST_ETCD_PREFIXES="kubernetes.io/registry"
 
 install:
   - if ! go get code.google.com/p/go.tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi
@@ -25,10 +29,10 @@ before_script:
   - npm install karma karma-junit-reporter karma-phantomjs-launcher karma-jasmine
 
 script:
-  - KUBE_RACE="-race" KUBE_COVER="y" KUBE_GOVERALLS_BIN="$HOME/gopath/bin/goveralls" KUBE_TIMEOUT='-timeout 300s' KUBE_COVERPROCS=8 KUBE_TEST_API_VERSIONS=$KUBE_TEST_API_VERSIONS ./hack/test-go.sh -- -p=2
+  - KUBE_RACE="-race" KUBE_COVER="y" KUBE_GOVERALLS_BIN="$HOME/gopath/bin/goveralls" KUBE_TIMEOUT='-timeout 300s' KUBE_COVERPROCS=8 KUBE_TEST_API_VERSIONS="${KUBE_TEST_API_VERSIONS}" KUBE_TEST_ETCD_PREFIXES="${KUBE_TEST_ETCD_PREFIXES}" ./hack/test-go.sh -- -p=2
   - node_modules/karma/bin/karma start www/master/karma.conf.js --single-run --browsers PhantomJS
   - PATH=$HOME/gopath/bin:./third_party/etcd:$PATH ./hack/test-cmd.sh
-  - PATH=$HOME/gopath/bin:./third_party/etcd:$PATH KUBE_TEST_API_VERSIONS=$KUBE_TEST_API_VERSIONS KUBE_INTEGRATION_TEST_MAX_CONCURRENCY=4 LOG_LEVEL=4 ./hack/test-integration.sh
+  - PATH=$HOME/gopath/bin:./third_party/etcd:$PATH KUBE_TEST_API_VERSIONS="${KUBE_TEST_API_VERSIONS}" KUBE_INTEGRATION_TEST_MAX_CONCURRENCY=4 LOG_LEVEL=4 ./hack/test-integration.sh
 
 notifications:
   irc: "chat.freenode.net#google-containers"
diff --git a/hack/test-go.sh b/hack/test-go.sh
index 5acd4ba4fdc..872a60b8710 100755
--- a/hack/test-go.sh
+++ b/hack/test-go.sh
@@ -53,9 +53,9 @@ KUBE_RACE=${KUBE_RACE:-}   # use KUBE_RACE="-race" to enable race testing
 KUBE_GOVERALLS_BIN=${KUBE_GOVERALLS_BIN:-}
 # Comma separated list of API Versions that should be tested.
 KUBE_TEST_API_VERSIONS=${KUBE_TEST_API_VERSIONS:-"v1beta1,v1beta3"}
-# Prefixes for etcd paths (standard and customized)
-ETCD_STANDARD_PREFIX="registry"
-ETCD_CUSTOM_PREFIX="kubernetes.io/registry"
+# Run tests with the standard (registry) and a custom etcd prefix
+# (kubernetes.io/registry).
+KUBE_TEST_ETCD_PREFIXES=${KUBE_TEST_ETCD_PREFIXES:-"registry,kubernetes.io/registry"}
 
 kube::test::usage() {
   kube::log::usage_from_stdin <<EOF
@@ -204,17 +204,31 @@ reportCoverageToCoveralls() {
   fi
 }
 
-# Convert the CSV to an array of API versions to test
+# Convert the CSVs to arrays.
 IFS=',' read -a apiVersions <<< "${KUBE_TEST_API_VERSIONS}"
-ETCD_PREFIX=${ETCD_STANDARD_PREFIX}
-LAST_API_VERSION=""
-for apiVersion in "${apiVersions[@]}"; do
-  echo "Running tests for APIVersion: $apiVersion"
-  LAST_API_VERSION=$apiVersion
-  KUBE_API_VERSION="${apiVersion}" ETCD_PREFIX=${ETCD_STANDARD_PREFIX} runTests "$@"
+IFS=',' read -a etcdPrefixes <<< "${KUBE_TEST_ETCD_PREFIXES}"
+apiVersionsCount=${#apiVersions[@]}
+etcdPrefixesCount=${#etcdPrefixes[@]}
+for (( i=0, j=0; ; )); do
+  apiVersion=${apiVersions[i]}
+  etcdPrefix=${etcdPrefixes[j]}
+  echo "Running tests for APIVersion: $apiVersion with etcdPrefix: $etcdPrefix"
+  KUBE_API_VERSION="${apiVersion}" ETCD_PREFIX=${etcdPrefix} runTests "$@"
+  i=${i}+1
+  j=${j}+1
+  if [[ i -eq ${apiVersionsCount} ]] && [[ j -eq ${etcdPrefixesCount} ]]; then
+    # All api versions and etcd prefixes tested.
+    break
+  fi
+  if [[ i -eq ${apiVersionsCount} ]]; then
+    # Use the last api version for remaining etcd prefixes.
+    i=${i}-1
+  fi
+   if [[ j -eq ${etcdPrefixesCount} ]]; then
+     # Use the last etcd prefix for remaining api versions.
+    j=${j}-1
+  fi
 done
-echo "Using custom etcd path prefix: ${ETCD_CUSTOM_PREFIX}"
-KUBE_API_VERSION="${LAST_API_VERSION}" ETCD_PREFIX=${ETCD_CUSTOM_PREFIX} runTests "$@"
 
 # We might run the tests for multiple versions, but we want to report only
 # one of them to coveralls. Here we report coverage from the last run.
diff --git a/shippable.yml b/shippable.yml
index fe9da1c7cfc..585ba0bef0f 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -7,9 +7,11 @@ build_image: shipimg/ubuntu1204_go:latest
 matrix:
   include:
     - go: 1.4
-      env: KUBE_TEST_API_VERSIONS="v1beta1"
+      env:
+        - KUBE_TEST_API_VERSIONS=v1beta1 KUBE_TEST_ETCD_PREFIXES=registry
     - go: 1.3
-      env: KUBE_TEST_API_VERSIONS="v1beta3"
+      env:
+        - KUBE_TEST_API_VERSIONS=v1beta3 KUBE_TEST_ETCD_PREFIXES=kubernetes.io/registry
 
 before_install:
   - source $HOME/.gvm/scripts/gvm;
@@ -31,9 +33,9 @@ install:
   - PATH=$HOME/gopath/bin:./third_party/etcd:$PATH ./hack/verify-gendocs.sh
 
 script:
-  - KUBE_RACE="-race" KUBE_COVER="y" KUBE_GOVERALLS_BIN="$HOME/gopath/bin/goveralls" KUBE_TIMEOUT='-timeout 300s' KUBE_COVERPROCS=8 KUBE_TEST_API_VERSIONS=$KUBE_TEST_API_VERSIONS ./hack/test-go.sh -- -p=2
+  - KUBE_RACE="-race" KUBE_COVER="y" KUBE_GOVERALLS_BIN="$HOME/gopath/bin/goveralls" KUBE_TIMEOUT='-timeout 300s' KUBE_COVERPROCS=8 KUBE_TEST_ETCD_PREFIXES="${KUBE_TEST_ETCD_PREFIXES}" KUBE_TEST_API_VERSIONS="${KUBE_TEST_API_VERSIONS}" ./hack/test-go.sh -- -p=2
   - PATH=$HOME/gopath/bin:./third_party/etcd:$PATH ./hack/test-cmd.sh
-  - PATH=$HOME/gopath/bin:./third_party/etcd:$PATH KUBE_TEST_API_VERSIONS=$KUBE_TEST_API_VERSIONS KUBE_INTEGRATION_TEST_MAX_CONCURRENCY=4 LOG_LEVEL=4 ./hack/test-integration.sh
+  - PATH=$HOME/gopath/bin:./third_party/etcd:$PATH KUBE_TEST_API_VERSIONS="${KUBE_TEST_API_VERSIONS}" KUBE_INTEGRATION_TEST_MAX_CONCURRENCY=4 LOG_LEVEL=4 ./hack/test-integration.sh
 
 notifications:
   irc: "chat.freenode.net#google-containers"