From c44e1ba64f4dfc66a6830d1203d504916a59bc5f Mon Sep 17 00:00:00 2001
From: Jeff Mendoza <jeffmendoza@google.com>
Date: Fri, 13 Jan 2017 13:35:06 -0800
Subject: [PATCH] Fix travis

---
 .travis.yml           |  6 ++++++
 test/README.md        | 13 +++++++++++++
 test/examples_test.go |  8 ++++----
 3 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 test/README.md

diff --git a/.travis.yml b/.travis.yml
index 505fc50623..33db17d9e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,12 @@ install:
 - go get -t -v k8s.io/kubernetes.github.io/test
 - git clone --depth=50 --branch=master https://github.com/kubernetes/md-check $HOME/gopath/src/k8s.io/md-check
 - go get -t -v k8s.io/md-check
+- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/apimachinery
+- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/apiserver
+- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/client-go
+- cp -r $GOPATH/src/k8s.io/kubernetes/vendor/* $GOPATH/src/
+- rm -rf $GOPATH/src/k8s.io/kubernetes/vendor/*
+- cp -r $GOPATH/src/k8s.io/kubernetes/staging/src/* $GOPATH/src/
 
 script:
 - go test -v k8s.io/kubernetes.github.io/test
diff --git a/test/README.md b/test/README.md
new file mode 100644
index 0000000000..3804697b6f
--- /dev/null
+++ b/test/README.md
@@ -0,0 +1,13 @@
+Note: These tests are importing code from kubernetes that isn't really
+meant to be used outside the repo. This causes vendoring problems. As
+a result, we have to work around those with these lines in the travis
+config:
+
+```
+- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/apimachinery
+- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/apiserver
+- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/client-go
+- cp -r $GOPATH/src/k8s.io/kubernetes/vendor/* $GOPATH/src/
+- rm -rf $GOPATH/src/k8s.io/kubernetes/vendor/*
+- cp -r $GOPATH/src/k8s.io/kubernetes/staging/src/* $GOPATH/src/
+```
diff --git a/test/examples_test.go b/test/examples_test.go
index 14ae5f5061..5727473c52 100644
--- a/test/examples_test.go
+++ b/test/examples_test.go
@@ -28,6 +28,9 @@ import (
 	"strings"
 	"testing"
 
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/util/validation/field"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/testapi"
 	"k8s.io/kubernetes/pkg/api/validation"
@@ -37,13 +40,10 @@ import (
 	batch_validation "k8s.io/kubernetes/pkg/apis/batch/validation"
 	"k8s.io/kubernetes/pkg/apis/extensions"
 	expvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation"
-	"k8s.io/kubernetes/pkg/capabilities"
 	"k8s.io/kubernetes/pkg/apis/policy"
 	policyvalidation "k8s.io/kubernetes/pkg/apis/policy/validation"
+	"k8s.io/kubernetes/pkg/capabilities"
 	"k8s.io/kubernetes/pkg/registry/batch/job"
-	"k8s.io/kubernetes/pkg/runtime"
-	"k8s.io/kubernetes/pkg/types"
-	"k8s.io/kubernetes/pkg/util/validation/field"
 	"k8s.io/kubernetes/pkg/util/yaml"
 	schedulerapilatest "k8s.io/kubernetes/plugin/pkg/scheduler/api/latest"
 )