Skip to content

Commit c44e1ba

Browse files
committed
Fix travis
1 parent f3231a2 commit c44e1ba

File tree

3 files changed

+23
-4
lines changed

3 files changed

+23
-4
lines changed

.travis.yml

+6
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ install:
1010
- go get -t -v k8s.io/kubernetes.github.io/test
1111
- git clone --depth=50 --branch=master https://github.com/kubernetes/md-check $HOME/gopath/src/k8s.io/md-check
1212
- go get -t -v k8s.io/md-check
13+
- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/apimachinery
14+
- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/apiserver
15+
- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/client-go
16+
- cp -r $GOPATH/src/k8s.io/kubernetes/vendor/* $GOPATH/src/
17+
- rm -rf $GOPATH/src/k8s.io/kubernetes/vendor/*
18+
- cp -r $GOPATH/src/k8s.io/kubernetes/staging/src/* $GOPATH/src/
1319

1420
script:
1521
- go test -v k8s.io/kubernetes.github.io/test

test/README.md

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Note: These tests are importing code from kubernetes that isn't really
2+
meant to be used outside the repo. This causes vendoring problems. As
3+
a result, we have to work around those with these lines in the travis
4+
config:
5+
6+
```
7+
- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/apimachinery
8+
- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/apiserver
9+
- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/client-go
10+
- cp -r $GOPATH/src/k8s.io/kubernetes/vendor/* $GOPATH/src/
11+
- rm -rf $GOPATH/src/k8s.io/kubernetes/vendor/*
12+
- cp -r $GOPATH/src/k8s.io/kubernetes/staging/src/* $GOPATH/src/
13+
```

test/examples_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ import (
2828
"strings"
2929
"testing"
3030

31+
"k8s.io/apimachinery/pkg/runtime"
32+
"k8s.io/apimachinery/pkg/types"
33+
"k8s.io/apimachinery/pkg/util/validation/field"
3134
"k8s.io/kubernetes/pkg/api"
3235
"k8s.io/kubernetes/pkg/api/testapi"
3336
"k8s.io/kubernetes/pkg/api/validation"
@@ -37,13 +40,10 @@ import (
3740
batch_validation "k8s.io/kubernetes/pkg/apis/batch/validation"
3841
"k8s.io/kubernetes/pkg/apis/extensions"
3942
expvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation"
40-
"k8s.io/kubernetes/pkg/capabilities"
4143
"k8s.io/kubernetes/pkg/apis/policy"
4244
policyvalidation "k8s.io/kubernetes/pkg/apis/policy/validation"
45+
"k8s.io/kubernetes/pkg/capabilities"
4346
"k8s.io/kubernetes/pkg/registry/batch/job"
44-
"k8s.io/kubernetes/pkg/runtime"
45-
"k8s.io/kubernetes/pkg/types"
46-
"k8s.io/kubernetes/pkg/util/validation/field"
4747
"k8s.io/kubernetes/pkg/util/yaml"
4848
schedulerapilatest "k8s.io/kubernetes/plugin/pkg/scheduler/api/latest"
4949
)

0 commit comments

Comments
 (0)