Skip to content

Commit 333bd66

Browse files
committed
gen .make/go-pkgdeps.mk
1 parent 556548b commit 333bd66

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

hack/test_cmd.sh

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ make generated_files kubeadm
2121
./build/run.sh make all WHAT=cmd/kubeadm
2222
2323
mkdir -p _output/local/go/bin/ && cp _output/dockerized/bin/linux/amd64/kubeadm _output/local/go/bin/
24-
./hack/install-etcd.sh
2524
TERM=linux PATH=$(pwd)/third_party/etcd:${PATH} make test-cmd
2625
' 2>&1 | grep -v -E '^I\w+ ' && exit 0
2726
done

hack/test_integration.sh

+9-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,15 @@ TMPFILE="${TMPDIR}/test-integration.log"
1212
# Etcd was added for testing in 1.21 and later
1313
function test-integration() {
1414
./build/shell.sh -c '
15-
./hack/install-etcd.sh
16-
PATH=$(pwd)/third_party/etcd:${PATH} make test-integration
15+
#!/usr/bin/env bash
16+
set -o errexit
17+
set -o nounset
18+
set -o pipefail
19+
20+
./hack/run-in-gopath.sh go install ./hack/make-rules/helpers/go2make
21+
mkdir .make
22+
./hack/run-in-gopath.sh go2make k8s.io/kubernetes/... --prune k8s.io/kubernetes/staging --prune k8s.io/kubernetes/vendor k8s.io/kubernetes/vendor/k8s.io/... > .make/go-pkgdeps.mk
23+
TERM=linux PATH=$(pwd)/third_party/etcd:${PATH} DBG_CODEGEN=1 make test-integration
1724
'
1825
}
1926

0 commit comments

Comments
 (0)