Skip to content

Commit 1bcf025

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #809 from hakman/move-test-deps
Move test dependencies to test dir
2 parents af7c925 + 9ad24ea commit 1bcf025

File tree

574 files changed

+1287
-503787
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

574 files changed

+1287
-503787
lines changed

‎Makefile

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,11 @@ output/windows_amd64/bin/%.exe: $(PKG_SOURCES)
140140
touch $@
141141

142142
output/windows_amd64/test/bin/%.exe: $(PKG_SOURCES)
143+
cd test && \
143144
GOOS=windows GOARCH=amd64 CGO_ENABLED=$(CGO_ENABLED) GO111MODULE=on go build \
144-
-mod vendor \
145-
-o $@ \
145+
-o ../$@ \
146146
-tags "$(WINDOWS_BUILD_TAGS)" \
147-
./test/e2e/$(subst -,,$*)
147+
./e2e/$(subst -,,$*)
148148

149149
output/linux_amd64/bin/%: $(PKG_SOURCES)
150150
GOOS=linux GOARCH=amd64 CGO_ENABLED=$(CGO_ENABLED) GO111MODULE=on \
@@ -157,12 +157,12 @@ output/linux_amd64/bin/%: $(PKG_SOURCES)
157157
touch $@
158158

159159
output/linux_amd64/test/bin/%: $(PKG_SOURCES)
160+
cd test && \
160161
GOOS=linux GOARCH=amd64 CGO_ENABLED=$(CGO_ENABLED) GO111MODULE=on \
161162
CC=x86_64-linux-gnu-gcc go build \
162-
-mod vendor \
163-
-o $@ \
163+
-o ../$@ \
164164
-tags "$(LINUX_BUILD_TAGS)" \
165-
./test/e2e/$(subst -,,$*)
165+
./e2e/$(subst -,,$*)
166166

167167
output/linux_arm64/bin/%: $(PKG_SOURCES)
168168
GOOS=linux GOARCH=arm64 CGO_ENABLED=$(CGO_ENABLED) GO111MODULE=on \
@@ -175,12 +175,12 @@ output/linux_arm64/bin/%: $(PKG_SOURCES)
175175
touch $@
176176

177177
output/linux_arm64/test/bin/%: $(PKG_SOURCES)
178+
cd test && \
178179
GOOS=linux GOARCH=arm64 CGO_ENABLED=$(CGO_ENABLED) GO111MODULE=on \
179180
CC=aarch64-linux-gnu-gcc go build \
180-
-mod vendor \
181-
-o $@ \
181+
-o ../$@ \
182182
-tags "$(LINUX_BUILD_TAGS)" \
183-
./test/e2e/$(subst -,,$*)
183+
./e2e/$(subst -,,$*)
184184

185185
# In the future these targets should be deprecated.
186186
./bin/log-counter: $(PKG_SOURCES)
@@ -204,11 +204,11 @@ endif
204204
./cmd/nodeproblemdetector
205205

206206
./test/bin/problem-maker: $(PKG_SOURCES)
207+
cd test && \
207208
CGO_ENABLED=$(CGO_ENABLED) GOOS=linux GO111MODULE=on go build \
208-
-mod vendor \
209-
-o test/bin/problem-maker \
209+
-o bin/problem-maker \
210210
-tags "$(LINUX_BUILD_TAGS)" \
211-
./test/e2e/problemmaker/problem_maker.go
211+
./e2e/problemmaker/problem_maker.go
212212

213213
./bin/health-checker: $(PKG_SOURCES)
214214
CGO_ENABLED=$(CGO_ENABLED) GOOS=linux GO111MODULE=on go build \
@@ -222,12 +222,13 @@ test: vet fmt
222222
GO111MODULE=on go test -mod vendor -timeout=1m -v -race -short -tags "$(HOST_PLATFORM_BUILD_TAGS)" ./...
223223

224224
e2e-test: vet fmt build-tar
225-
GO111MODULE=on go run github.com/onsi/ginkgo/ginkgo -nodes=$(PARALLEL) -mod vendor -timeout=10m -v -tags "$(HOST_PLATFORM_BUILD_TAGS)" -stream \
226-
./test/e2e/metriconly/... -- \
225+
cd test && \
226+
GO111MODULE=on go run github.com/onsi/ginkgo/ginkgo -nodes=$(PARALLEL) -timeout=10m -v -tags "$(HOST_PLATFORM_BUILD_TAGS)" -stream \
227+
./e2e/metriconly/... -- \
227228
-project=$(PROJECT) -zone=$(ZONE) \
228229
-image=$(VM_IMAGE) -image-family=$(IMAGE_FAMILY) -image-project=$(IMAGE_PROJECT) \
229230
-ssh-user=$(SSH_USER) -ssh-key=$(SSH_KEY) \
230-
-npd-build-tar=`pwd`/$(TARBALL) \
231+
-npd-build-tar=`pwd`/../$(TARBALL) \
231232
-boskos-project-type=$(BOSKOS_PROJECT_TYPE) -job-name=$(JOB_NAME) \
232233
-artifacts-dir=$(ARTIFACTS)
233234

‎go.mod

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,20 @@ require (
1313
github.com/euank/go-kmsg-parser v2.0.0+incompatible
1414
github.com/golang/glog v1.1.1
1515
github.com/hpcloud/tail v1.0.0
16-
github.com/onsi/ginkgo v1.16.5
17-
github.com/onsi/gomega v1.27.8
18-
github.com/pborman/uuid v1.2.1
1916
github.com/prometheus/client_model v0.4.0
2017
github.com/prometheus/common v0.44.0
2118
github.com/prometheus/procfs v0.10.1
2219
github.com/shirou/gopsutil/v3 v3.23.8
2320
github.com/spf13/pflag v1.0.5
2421
github.com/stretchr/testify v1.8.4
2522
go.opencensus.io v0.24.0
26-
golang.org/x/crypto v0.11.0
27-
golang.org/x/oauth2 v0.9.0
2823
golang.org/x/sys v0.11.0
2924
google.golang.org/api v0.114.0
3025
k8s.io/api v0.28.1
3126
k8s.io/apimachinery v0.28.1
3227
k8s.io/client-go v9.0.0+incompatible
33-
k8s.io/component-base v0.28.1
3428
k8s.io/klog v1.0.0
3529
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
36-
sigs.k8s.io/boskos v0.0.0-20200515170311-7d36bde8cdf6
3730
)
3831

3932
require (
@@ -43,7 +36,6 @@ require (
4336
cloud.google.com/go/trace v1.9.0 // indirect
4437
github.com/aws/aws-sdk-go v1.35.24 // indirect
4538
github.com/beorn7/perks v1.0.1 // indirect
46-
github.com/blang/semver/v4 v4.0.0 // indirect
4739
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
4840
github.com/cespare/xxhash/v2 v2.2.0 // indirect
4941
github.com/davecgh/go-spew v1.1.1 // indirect
@@ -54,7 +46,6 @@ require (
5446
github.com/go-openapi/jsonpointer v0.19.6 // indirect
5547
github.com/go-openapi/jsonreference v0.20.2 // indirect
5648
github.com/go-openapi/swag v0.22.3 // indirect
57-
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
5849
github.com/gogo/protobuf v1.3.2 // indirect
5950
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6051
github.com/golang/protobuf v1.5.3 // indirect
@@ -64,8 +55,6 @@ require (
6455
github.com/google/uuid v1.3.0 // indirect
6556
github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
6657
github.com/googleapis/gax-go/v2 v2.8.0 // indirect
67-
github.com/hashicorp/errwrap v1.0.0 // indirect
68-
github.com/hashicorp/go-multierror v1.0.0 // indirect
6958
github.com/imdario/mergo v0.3.8 // indirect
7059
github.com/jmespath/go-jmespath v0.4.0 // indirect
7160
github.com/josharian/intern v1.0.0 // indirect
@@ -76,22 +65,22 @@ require (
7665
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7766
github.com/modern-go/reflect2 v1.0.2 // indirect
7867
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
79-
github.com/nxadm/tail v1.4.8 // indirect
68+
github.com/onsi/ginkgo/v2 v2.9.7 // indirect
69+
github.com/onsi/gomega v1.27.8 // indirect
8070
github.com/pmezard/go-difflib v1.0.0 // indirect
8171
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
8272
github.com/prometheus/client_golang v1.16.0 // indirect
8373
github.com/shoenig/go-m1cpu v0.1.6 // indirect
84-
github.com/sirupsen/logrus v1.8.1 // indirect
8574
github.com/tedsuo/ifrit v0.0.0-20230516164442-7862c310ad26 // indirect
8675
github.com/tklauser/go-sysconf v0.3.12 // indirect
8776
github.com/tklauser/numcpus v0.6.1 // indirect
8877
github.com/yusufpapurcu/wmi v1.2.3 // indirect
8978
golang.org/x/net v0.13.0 // indirect
79+
golang.org/x/oauth2 v0.9.0 // indirect
9080
golang.org/x/sync v0.3.0 // indirect
9181
golang.org/x/term v0.10.0 // indirect
9282
golang.org/x/text v0.11.0 // indirect
9383
golang.org/x/time v0.3.0 // indirect
94-
golang.org/x/tools v0.9.1 // indirect
9584
google.golang.org/appengine v1.6.7 // indirect
9685
google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc // indirect
9786
google.golang.org/genproto/googleapis/api v0.0.0-20230526203410-71b5a4ffd15e // indirect
@@ -105,7 +94,6 @@ require (
10594
gopkg.in/yaml.v3 v3.0.1 // indirect
10695
k8s.io/klog/v2 v2.100.1 // indirect
10796
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
108-
k8s.io/test-infra v0.0.0-20200514184223-ba32c8aae783 // indirect
10997
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
11098
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
11199
sigs.k8s.io/yaml v1.3.0 // indirect

0 commit comments

Comments
 (0)