From 3bd56709394ebd32406de9fa06348c2a4a98b8b3 Mon Sep 17 00:00:00 2001 From: Qiming Date: Fri, 13 Jul 2018 06:26:26 +0800 Subject: [PATCH] Fix 1.8 CI gate (#9423) --- .travis.yml | 8 ++++++-- test/examples_test.go | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9e19abba15..7f4dbfcaa1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,14 +7,18 @@ install: - export PATH=$GOPATH/bin:$PATH - mkdir -p $HOME/gopath/src/k8s.io - mv $TRAVIS_BUILD_DIR $HOME/gopath/src/k8s.io/website +- cd $HOME/gopath/src/k8s.io/website # (1) Fetch dependencies for us to run the tests in test/examples_test.go -- go get -t -v k8s.io/website/test +- pushd $GOPATH/src/k8s.io && git clone https://github.com/kubernetes/kubernetes && popd +- pushd $GOPATH/src/k8s.io/kubernetes && git checkout release-1.8 && popd -# Simplified deduplication of dependencies. +# (2) Simplified deduplication of dependencies. - cp -L -R $GOPATH/src/k8s.io/kubernetes/vendor/ $GOPATH/src/ - rm -r $GOPATH/src/k8s.io/kubernetes/vendor/ +- go get -t -v k8s.io/website/test + script: - go test -v k8s.io/website/test - ./verify-docs-format.sh diff --git a/test/examples_test.go b/test/examples_test.go index 3ac012ffc7..109870122a 100644 --- a/test/examples_test.go +++ b/test/examples_test.go @@ -39,8 +39,8 @@ import ( autoscaling_validation "k8s.io/kubernetes/pkg/apis/autoscaling/validation" "k8s.io/kubernetes/pkg/apis/batch" batch_validation "k8s.io/kubernetes/pkg/apis/batch/validation" - api "k8s.io/kubernetes/pkg/apis/core" - "k8s.io/kubernetes/pkg/apis/core/validation" + api "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/apis/extensions" ext_validation "k8s.io/kubernetes/pkg/apis/extensions/validation" "k8s.io/kubernetes/pkg/apis/policy" @@ -49,7 +49,7 @@ import ( storagevalidation "k8s.io/kubernetes/pkg/apis/storage/validation" "k8s.io/kubernetes/pkg/capabilities" "k8s.io/kubernetes/pkg/registry/batch/job" - schedulerapilatest "k8s.io/kubernetes/pkg/scheduler/api/latest" + schedulerapilatest "k8s.io/kubernetes/plugin/pkg/scheduler/api/latest" ) func validateObject(obj runtime.Object) (errors field.ErrorList) {