From 7e0e7a0d660fb9ecf3df483d015b77a5571b8fb5 Mon Sep 17 00:00:00 2001
From: Davanum Srinivas <davanum@gmail.com>
Date: Thu, 13 Apr 2017 07:11:23 -0400
Subject: [PATCH] [WIP] Test latest k8s master

Change-Id: I2093778aae1969cce5a36a81e24eadc7b28c25f5
---
 contrib/gate_hook.sh      |  1 +
 contrib/post_test_hook.sh | 11 ++++++-----
 devstack/plugin.sh        |  9 +++------
 devstack/settings         |  2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/contrib/gate_hook.sh b/contrib/gate_hook.sh
index 37d1d7d..754e4d0 100755
--- a/contrib/gate_hook.sh
+++ b/contrib/gate_hook.sh
@@ -15,4 +15,5 @@
 set -ex
 
 echo "In gate_test_hook"
+sudo sed -i 's/USE_SYSTEMD\=\"/USE_SYSTEMD_X=\"/' /opt/stack/new/devstack/stackrc
 $BASE/new/devstack-gate/devstack-vm-gate.sh
diff --git a/contrib/post_test_hook.sh b/contrib/post_test_hook.sh
index 9d0347c..2d2c9aa 100755
--- a/contrib/post_test_hook.sh
+++ b/contrib/post_test_hook.sh
@@ -28,6 +28,7 @@ TESTS_LIST_REGEX=(
 
 FLAKY_TESTS_LIST=(
     'Downward API volume [It] should update annotations on modification [Conformance] [Volume]'
+    'Downward API volume [It] should update labels on modification [Conformance] [Volume]'
     'Services [It] should serve multiport endpoints from pods [Conformance]'
 )
 
@@ -90,7 +91,7 @@ echo "Waiting for kubernetes service to start..."
 for i in {1..600}
 do
     if [[ -f $KUBECONFIG ]]; then
-        running_count=$(./kubectl get svc --no-headers 2>/dev/null | grep "kubernetes" | wc -l)
+        running_count=$(./kubectl get nodes --no-headers 2>/dev/null | grep "Ready" | wc -l)
         if [ "$running_count" -ge 1 ]; then
             break
         fi
@@ -156,11 +157,11 @@ 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
+export HOST_INTERFACE=$(ip -f inet route | awk '/default/ {print $5}')
+sudo iptables -t nat -A POSTROUTING -o $HOST_INTERFACE -s 10.0.0.0/24 -j MASQUERADE
+sudo iptables -t nat -A POSTROUTING -o $HOST_INTERFACE -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 --provider=local --report-dir=/opt/stack/logs/ --ginkgo.v --ginkgo.skip=$(test_names)"
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 6136c94..fc07ab6 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -77,7 +77,7 @@ function install_k8s_cloud_provider {
         pushd ${K8S_SRC} >/dev/null
         git remote update
         git fetch --all --tags --prune
-        #git checkout tags/v1.7.0-alpha.1
+
         popd >/dev/null
     fi
 
@@ -105,12 +105,9 @@ function install_k8s_cloud_provider {
     export API_HOST_IP="172.17.0.1"
     export KUBELET_HOST="0.0.0.0"
     export ENABLE_CRI=false
+    export HOSTNAME_OVERRIDE=$(ip route get 1.1.1.1 | awk '{print $7}')
+    export LOG_LEVEL=10
 
-#    echo "Stop Docker iptable rules that interfere with kubedns"
-#    sudo iptables -D FORWARD -j DOCKER-ISOLATION
-#    sudo iptables -A DOCKER-ISOLATION -j RETURN
-#    sudo iptables --flush DOCKER-ISOLATION
-#    sudo iptables -X DOCKER-ISOLATION
     echo "Stopping firewall and allowing everything..."
     sudo iptables -F
     sudo iptables -X
diff --git a/devstack/settings b/devstack/settings
index 34122e1..efc6d04 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -2,4 +2,4 @@
 
 enable_service k8s-cloud-provider
 enable_service etcd-server
-enable_service kubernetes
+enable_service kubernetes
\ No newline at end of file