github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #130760 from BenTheElder/cleanup-integration

Browse Source 
Cleanup CI integration scripts
This commit is contained in:
Kubernetes Prow Robot 2025-03-13 16:05:53 -07:00 committed by GitHub
commit 129661b2c7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 15 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/install-etcd.sh
View File

@ -27,4 +27,4 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
FOUND="$(echo "${PATH}" | sed 's/:/\n/g' | grep -q "^${KUBE_ROOT}/third_party/etcd$" || true)" FOUND="$(echo "${PATH}" | sed 's/:/\n/g' | grep -q "^${KUBE_ROOT}/third_party/etcd$" || true)"
kube::etcd::install kube::etcd::install
test -n "${FOUND}" || echo " PATH=\"\$PATH:${KUBE_ROOT}/third_party/etcd\"" test -n "${FOUND}" || echo "export PATH=\"\${PATH}:${KUBE_ROOT}/third_party/etcd\""

1
hack/jenkins/benchmark-dockerized.sh
View File

@ -48,7 +48,6 @@ if [ -n "${KUBE_HACK_TOOLS_GOTOOLCHAIN:-}" ]; then
hack_tools_gotoolchain="${KUBE_HACK_TOOLS_GOTOOLCHAIN}"; hack_tools_gotoolchain="${KUBE_HACK_TOOLS_GOTOOLCHAIN}";
fi fi
GOTOOLCHAIN="${hack_tools_gotoolchain}" go -C "${KUBE_ROOT}/hack/tools" install github.com/cespare/prettybench GOTOOLCHAIN="${hack_tools_gotoolchain}" go -C "${KUBE_ROOT}/hack/tools" install github.com/cespare/prettybench
GOTOOLCHAIN="${hack_tools_gotoolchain}" go -C "${KUBE_ROOT}/hack/tools" install gotest.tools/gotestsum
# Disable the Go race detector. # Disable the Go race detector.
export KUBE_RACE=" " export KUBE_RACE=" "

17
hack/jenkins/test-cmd-dockerized.sh
View File

@ -19,20 +19,11 @@ set -o nounset
set -o pipefail set -o pipefail
set -o xtrace set -o xtrace
# Runs test-cmd, # Runs test-cmd, intended to be run in prow.k8s.io
# producing JUnit-style XML test set -x;
# reports in ${WORKSPACE}/artifacts. This script is intended to be run from
# kubekins-test container with a kubernetes repo mapped in. See
# k8s.io/test-infra/scenarios/kubernetes_verify.py
export PATH=${GOPATH}/bin:${PWD}/third_party/etcd:/usr/local/go/bin:${PATH} # TODO: make test-cmd should handle this automatically
source ./hack/install-etcd.sh
# Set artifacts directory
export ARTIFACTS=${ARTIFACTS:-"${WORKSPACE}/artifacts"}
cd "${GOPATH}/src/k8s.io/kubernetes"
./hack/install-etcd.sh
make test-cmd make test-cmd

26
hack/jenkins/test-dockerized.sh
View File

@ -19,32 +19,14 @@ set -o nounset
set -o pipefail set -o pipefail
set -o xtrace set -o xtrace
# Runs test-cmd and test-integration, # Runs test-cmd and test-integration, intended to be run in prow.k8s.io
# producing JUnit-style XML test set -x;
# reports in ${WORKSPACE}/artifacts. This script is intended to be run from
# kubekins-test container with a kubernetes repo mapped in. See
# k8s.io/test-infra/scenarios/kubernetes_verify.py
export PATH=${GOPATH}/bin:${PWD}/third_party/etcd:/usr/local/go/bin:${PATH} # TODO: make test-integration should handle this automatically
source ./hack/install-etcd.sh
# Install tools we need
hack_tools_gotoolchain="${GOTOOLCHAIN:-}"
if [ -n "${KUBE_HACK_TOOLS_GOTOOLCHAIN:-}" ]; then
hack_tools_gotoolchain="${KUBE_HACK_TOOLS_GOTOOLCHAIN}";
fi
GOTOOLCHAIN="${hack_tools_gotoolchain}" go -C "./hack/tools" install gotest.tools/gotestsum
# Disable coverage report
export KUBE_COVER="n"
# Set artifacts directory
export ARTIFACTS=${ARTIFACTS:-"${WORKSPACE}/artifacts"}
# Save the verbose stdout as well. # Save the verbose stdout as well.
export KUBE_KEEP_VERBOSE_TEST_OUTPUT=y export KUBE_KEEP_VERBOSE_TEST_OUTPUT=y
export LOG_LEVEL=4 export LOG_LEVEL=4
cd "${GOPATH}/src/k8s.io/kubernetes"
./hack/install-etcd.sh
make test-cmd make test-cmd
make test-integration make test-integration

28
hack/jenkins/test-integration-dockerized.sh
View File

@ -19,27 +19,11 @@ set -o nounset
set -o pipefail set -o pipefail
set -o xtrace set -o xtrace
# Runs test-integration, # Runs test-integration
# producing JUnit-style XML test # This script is intended to be run from prow.k8s.io
# reports in ${WORKSPACE}/artifacts. This script is intended to be run from set -x;
# kubekins-test container with a kubernetes repo mapped in. See
# k8s.io/test-infra/scenarios/kubernetes_verify.py
export PATH=${GOPATH}/bin:${PWD}/third_party/etcd:/usr/local/go/bin:${PATH} # TODO: make test-integration should handle this automatically
source ./hack/install-etcd.sh
# Install tools we need make test-integration KUBE_KEEP_VERBOSE_TEST_OUTPUT=y LOG_LEVEL=4
go -C "./hack/tools" install gotest.tools/gotestsum
# Disable coverage report
export KUBE_COVER="n"
# Set artifacts directory
export ARTIFACTS=${ARTIFACTS:-"${WORKSPACE}/artifacts"}
# Save the verbose stdout as well.
export KUBE_KEEP_VERBOSE_TEST_OUTPUT=y
export LOG_LEVEL=4
cd "${GOPATH}/src/k8s.io/kubernetes"
./hack/install-etcd.sh
make test-integration