From 7669c9edacbf562f8d5e9f2613360e0724acc982 Mon Sep 17 00:00:00 2001 From: foxish Date: Tue, 16 May 2017 18:09:37 -0700 Subject: [PATCH] Long term fix for travis --- .travis.yml | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index e713df5516..0b95eaafbe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,25 +11,9 @@ install: # (1) Fetch dependencies for us to run the tests in test/examples_test.go - go get -t -v k8s.io/kubernetes.github.io/test -# The dependencies are complicated for test/examples_test.go -# k8s.io/kubernetes/pkg is a dependency, which in turn depends on apimachinery -# but we also have apimachinery directly as one of our dependencies, which causes a conflict. -# Additionally, we get symlinks when we clone the directory. The below steps do the following: - -# (a) Replace the symlink with the actual dependencies from kubernetes/staging/src/ -# (b) copy all the vendored files to $GOPATH/src -- 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 -- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/sample-apiserver -- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/kube-aggregator -- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/metrics -- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/kube-apiextensions-server -- 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/ -- cp -r $GOPATH/src/k8s.io/apimachinery/vendor/* $GOPATH/src/ -- rm -rf $GOPATH/src/k8s.io/apimachinery/vendor/* +# Simplified deduplication of dependencies. +- cp -L -R $GOPATH/src/k8s.io/kubernetes/vendor/ $GOPATH/src/ +- rm -r $GOPATH/src/k8s.io/kubernetes/vendor/ # (2) Fetch md-check along with all its dependencies. - git clone --depth=50 --branch=master https://github.com/kubernetes/md-check $HOME/gopath/src/k8s.io/md-check