Skip to content

Commit 8d19a84

Browse files
committed
fix failed CI test, removed unnecessary checks SKIP_FETCH_TOOLS checks in check-everything.sh
1 parent 2611c59 commit 8d19a84

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

hack/check-everything.sh

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,10 @@ source ${hack_dir}/setup-envtest.sh
2525
tmp_root=/tmp
2626
kb_root_dir=$tmp_root/kubebuilder
2727

28-
# Skip fetching and untaring the tools by setting the SKIP_FETCH_TOOLS variable
29-
# in your environment to any value:
30-
#
31-
# $ SKIP_FETCH_TOOLS=1 ./check-everything.sh
32-
#
33-
# If you skip fetching tools, this script will use the tools already on your
34-
# machine, but rebuild the kubebuilder and kubebuilder-bin binaries.
35-
SKIP_FETCH_TOOLS=${SKIP_FETCH_TOOLS:-""}
36-
3728
ENVTEST_K8S_VERSION=${ENVTEST_K8S_VERSION:-"1.16.4"}
3829

39-
if [ -z "$SKIP_FETCH_TOOLS" ]; then
40-
fetch_envtest_tools "$kb_root_dir"
41-
fetch_envtest_tools "${hack_dir}/../pkg/internal/testing/integration/assets"
42-
fi
43-
30+
fetch_envtest_tools "$kb_root_dir"
31+
fetch_envtest_tools "${hack_dir}/../pkg/internal/testing/integration/assets"
4432
setup_envtest_env "$kb_root_dir"
4533

4634
${hack_dir}/verify.sh

hack/setup-envtest.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ function setup_envtest_env {
3838
header_text "setting up env vars"
3939

4040
# Setup env vars
41+
KUBEBUILDER_ASSETS=${KUBEBUILDER_ASSETS:-""}
4142
if [[ -z "${KUBEBUILDER_ASSETS}" ]]; then
4243
export KUBEBUILDER_ASSETS=$1/bin
4344
fi
@@ -53,6 +54,7 @@ function setup_envtest_env {
5354
# If you skip fetching tools, this script will use the tools already on your
5455
# machine.
5556
function fetch_envtest_tools {
57+
SKIP_FETCH_TOOLS=${SKIP_FETCH_TOOLS:-""}
5658
if [ -n "$SKIP_FETCH_TOOLS" ]; then
5759
return 0
5860
fi

0 commit comments

Comments
 (0)