From e278d6ed4d8839ca9c74bbe0469a10ae2616e6b9 Mon Sep 17 00:00:00 2001
From: Davanum Srinivas <davanum@gmail.com>
Date: Sat, 29 Apr 2017 17:32:55 -0400
Subject: [PATCH] Set CLOUD_PROVIDER as local

Change-Id: I41be1a84f2af8e9587ef635d7f1798c4d9ea196f
---
 contrib/post_test_hook.sh | 36 +++++++++++++++++++++---------------
 devstack/plugin.sh        |  3 ++-
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/contrib/post_test_hook.sh b/contrib/post_test_hook.sh
index 672eeab..9d0347c 100755
--- a/contrib/post_test_hook.sh
+++ b/contrib/post_test_hook.sh
@@ -26,21 +26,17 @@ TESTS_LIST_REGEX=(
     '\[HPA\]'
 )
 
-TESTS_LIST=(
-    'Certificates API [It] should support building a client with a CSR'
+FLAKY_TESTS_LIST=(
     'Downward API volume [It] should update annotations on modification [Conformance] [Volume]'
+    'Services [It] should serve multiport endpoints from pods [Conformance]'
+)
+
+FAILING_TESTS_LIST=(
+    'Certificates API [It] should support building a client with a CSR'
     'DNS [It] should provide DNS for the cluster [Conformance]'
-    'Kubectl client [k8s.io] Simple pod [It] should support exec through an HTTP proxy'
-    'Networking [It] should provide Internet connection for containers [Conformance]'
-    'PersistentVolumes [Volume] [k8s.io] PersistentVolumes:NFS with Single PV - PVC pairs [It] create a PV and a pre-bound PVC: test write access'
-    'PersistentVolumes [Volume] [k8s.io] PersistentVolumes:NFS with Single PV - PVC pairs [It] should create a non-pre-bound PV and PVC: test write access'
-    'PersistentVolumes [Volume] [k8s.io] PersistentVolumes:NFS with multiple PVs and PVCs all in same ns [It] should create 4 PVs and 2 PVCs: test write access'
-    'Projected [It] should update labels on modification [Conformance] [Volume]'
+    'SSH [It] should SSH to all nodes and run commands'
+    'Services [It] should be able to up and down services'
     'Services [It] should create endpoints for unready pods'
-    'StatefulSet [k8s.io] Basic StatefulSet functionality [StatefulSetBasic] [It] should adopt matching orphans and release non-matching pods'
-    'StatefulSet [k8s.io] Basic StatefulSet functionality [StatefulSetBasic] [It] should allow template updates'
-    'StatefulSet [k8s.io] Basic StatefulSet functionality [StatefulSetBasic] [It] should not deadlock when a pod predecessor fails'
-    'StatefulSet [k8s.io] Basic StatefulSet functionality [StatefulSetBasic] [It] should provide basic identity'
 )
 
 function escape_test_name() {
@@ -57,7 +53,15 @@ function test_names () {
         fi
         echo -n "${name}"
     done
-    for name in "${TESTS_LIST[@]}"; do
+    for name in "${FLAKY_TESTS_LIST[@]}"; do
+        if [ -z "${first}" ]; then
+            echo -n "|"
+        else
+            first=
+        fi
+        echo -n "$(escape_test_name "${name}")"
+    done
+    for name in "${FAILING_TESTS_LIST[@]}"; do
         if [ -z "${first}" ]; then
             echo -n "|"
         else
@@ -152,10 +156,12 @@ pushd $GOPATH/src/k8s.io/kubernetes >/dev/null
 sudo -E PATH=$GOPATH/bin:$PATH make all WHAT=cmd/kubectl
 sudo -E PATH=$GOPATH/bin:$PATH make all WHAT=vendor/github.com/onsi/ginkgo/ginkgo
 
-# open up access for containers
+sudo ifconfig -a
 sudo iptables -t nat -A POSTROUTING -o ens3 -s 10.0.0.0/24 -j MASQUERADE
 sudo iptables -t nat -A POSTROUTING -o ens3 -s 172.17.0.0/24 -j MASQUERADE
+sudo iptables -t nat -A POSTROUTING -o eth0 -s 10.0.0.0/24 -j MASQUERADE
+sudo iptables -t nat -A POSTROUTING -o eth0 -s 172.17.0.0/24 -j MASQUERADE
 
 sudo -E PATH=$GOPATH/bin:$PATH make all WHAT=test/e2e/e2e.test
-sudo -E PATH=$GOPATH/bin:$PATH go run hack/e2e.go -- -v --test --test_args="--ginkgo.trace=true --ginkgo.seed=1378936983 --logtostderr --v 4 --report-dir=/opt/stack/logs/ --ginkgo.v --ginkgo.skip=$(test_names)"
+sudo -E PATH=$GOPATH/bin:$PATH go run hack/e2e.go -- -v --test --test_args="--ginkgo.trace=true --ginkgo.seed=1378936983 --logtostderr --v 4 --provider=local --report-dir=/opt/stack/logs/ --ginkgo.v --ginkgo.skip=$(test_names)"
 popd >/dev/null
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index e6f2a00..6136c94 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -33,7 +33,8 @@ function install_prereqs {
 function install_docker {
     # Install docker if needed
     if ! is_package_installed docker-engine; then
-        sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
+        sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D || true
+        sudo apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D || true
         sudo apt-add-repository 'deb http://apt.dockerproject.org/repo ubuntu-xenial main'
         sudo apt-get update
         sudo apt-cache policy docker-engine