diff --git a/.travis.yml b/.travis.yml index 9e19abba15..bf3684ab3a 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.9 && 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/_config.yml b/_config.yml index 3869c43b78..258e373c9a 100644 --- a/_config.yml +++ b/_config.yml @@ -24,11 +24,16 @@ defaults: githubbranch: "master" docsbranch: "master" versions: + - fullversion: "v1.11.0" + version: "v1.11" + githubbranch: "v1.11.0" + docsbranch: "release-1.11" + url: https://kubernetes.io/docs/ - fullversion: "v1.10.0" version: "v1.10" githubbranch: "v1.10.0" docsbranch: "release-1.10" - url: https://kubernetes.io + url: https://v1-10.docs.kubernetes.io - fullversion: "v1.9.0" version: "v1.9" githubbranch: "v1.9.0" @@ -44,11 +49,6 @@ defaults: githubbranch: "v1.7.6" docsbranch: "release-1.7" url: https://v1-7.docs.kubernetes.io - - fullversion: "v1.6.8" - version: "v1.6" - githubbranch: "v1.6.8" - docsbranch: "release-1.6" - url: https://v1-6.docs.kubernetes.io deprecated: true currentUrl: https://kubernetes.io/docs/home/ nextUrl: http://kubernetes-io-vnext-staging.netlify.com/ diff --git a/test/examples_test.go b/test/examples_test.go index 9075d9b713..50279a210a 100644 --- a/test/examples_test.go +++ b/test/examples_test.go @@ -56,7 +56,7 @@ import ( storage_validation "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) {