File tree Expand file tree Collapse file tree 2 files changed +4
-14
lines changed Expand file tree Collapse file tree 2 files changed +4
-14
lines changed Original file line number Diff line number Diff line change @@ -25,22 +25,10 @@ source ${hack_dir}/setup-envtest.sh
25
25
tmp_root=/tmp
26
26
kb_root_dir=$tmp_root /kubebuilder
27
27
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
-
37
28
ENVTEST_K8S_VERSION=${ENVTEST_K8S_VERSION:- " 1.16.4" }
38
29
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"
44
32
setup_envtest_env " $kb_root_dir "
45
33
46
34
${hack_dir} /verify.sh
Original file line number Diff line number Diff line change @@ -38,6 +38,7 @@ function setup_envtest_env {
38
38
header_text " setting up env vars"
39
39
40
40
# Setup env vars
41
+ KUBEBUILDER_ASSETS=${KUBEBUILDER_ASSETS:- " " }
41
42
if [[ -z " ${KUBEBUILDER_ASSETS} " ]]; then
42
43
export KUBEBUILDER_ASSETS=$1 /bin
43
44
fi
@@ -53,6 +54,7 @@ function setup_envtest_env {
53
54
# If you skip fetching tools, this script will use the tools already on your
54
55
# machine.
55
56
function fetch_envtest_tools {
57
+ SKIP_FETCH_TOOLS=${SKIP_FETCH_TOOLS:- " " }
56
58
if [ -n " $SKIP_FETCH_TOOLS " ]; then
57
59
return 0
58
60
fi
You can’t perform that action at this time.
0 commit comments