fluxcd
/
source-controller
mirror of https://github.com/fluxcd/source-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump envtest to 1.24.0 

Signed-off-by: Paulo Gomes <paulo.gomes@weave.works>
This commit is contained in:
Paulo Gomes 2022-11-24 09:15:43 +00:00
parent b2eb601ba7
commit a970fd774a
No known key found for this signature in database
GPG Key ID: 9995233870E99BEE
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Makefile
View File

@ -33,7 +33,11 @@ REPOSITORY_ROOT := $(shell git rev-parse --show-toplevel)
BUILD_DIR := $(REPOSITORY_ROOT)/build BUILD_DIR := $(REPOSITORY_ROOT)/build
# Other dependency versions # Other dependency versions
ENVTEST_BIN_VERSION ?= 1.19.2 ENVTEST_BIN_VERSION ?= 1.24.0
# FUZZ_TIME defines the max amount of time, in Go Duration,
# each fuzzer should run for.
FUZZ_TIME ?= 1m
# Caches libgit2 versions per tag, "forcing" rebuild only when needed. # Caches libgit2 versions per tag, "forcing" rebuild only when needed.
LIBGIT2_PATH := $(BUILD_DIR)/libgit2/$(LIBGIT2_TAG) LIBGIT2_PATH := $(BUILD_DIR)/libgit2/$(LIBGIT2_TAG)
@ -206,9 +210,9 @@ ifneq ($(shell grep -o 'LIBGIT2_IMG ?= \w.*' Makefile | cut -d ' ' -f 3):$(shell
exit 1; \ exit 1; \
} }
endif endif
ifneq ($(shell grep -o 'LIBGIT2_TAG ?= \w.*' Makefile | cut -d ' ' -f 3), $(shell grep -o "LIBGIT2_TAG=.*" tests/fuzz/oss_fuzz_build.sh | sed 's;LIBGIT2_TAG="$${LIBGIT2_TAG:-;;g' | sed 's;}";;g')) ifneq ($(shell grep -o 'LIBGIT2_TAG ?= \w.*' Makefile | cut -d ' ' -f 3), $(shell grep -o "LIBGIT2_TAG=.*" tests/fuzz/oss_fuzz_prebuild.sh | sed 's;LIBGIT2_TAG="$${LIBGIT2_TAG:-;;g' | sed 's;}";;g'))
@{ \ @{ \
echo "LIBGIT2_TAG must match in both Makefile and tests/fuzz/oss_fuzz_build.sh"; \ echo "LIBGIT2_TAG must match in both Makefile and tests/fuzz/oss_fuzz_prebuild.sh"; \
exit 1; \ exit 1; \
} }
endif endif
@ -232,26 +236,32 @@ rm -rf $$TMP_DIR ;\
} }
endef endef
# Build fuzzers # Build fuzzers used by oss-fuzz.
fuzz-build: $(LIBGIT2) fuzz-build: $(LIBGIT2)
rm -rf $(BUILD_DIR)/fuzz/ rm -rf $(shell pwd)/build/fuzz/
mkdir -p $(BUILD_DIR)/fuzz/out/ mkdir -p $(shell pwd)/build/fuzz/out/
docker build . --pull --tag local-fuzzing:latest -f tests/fuzz/Dockerfile.builder docker build . --tag local-fuzzing:latest -f tests/fuzz/Dockerfile.builder
docker run --rm \ docker run --rm \
-e FUZZING_LANGUAGE=go -e SANITIZER=address \ -e FUZZING_LANGUAGE=go -e SANITIZER=address \
-e CIFUZZ_DEBUG='True' -e OSS_FUZZ_PROJECT_NAME=fluxcd \ -e CIFUZZ_DEBUG='True' -e OSS_FUZZ_PROJECT_NAME=fluxcd \
-v "$(BUILD_DIR)/fuzz/out":/out \ -v "$(shell pwd)/build/fuzz/out":/out \
local-fuzzing:latest local-fuzzing:latest
# Run each fuzzer once to ensure they will work when executed by oss-fuzz.
fuzz-smoketest: fuzz-build fuzz-smoketest: fuzz-build
docker run --rm \ docker run --rm \
-v "$(BUILD_DIR)/fuzz/out":/out \ -v "$(shell pwd)/build/fuzz/out":/out \
-v "$(shell go env GOMODCACHE):/root/go/pkg/mod" \
-v "$(shell pwd)/tests/fuzz/oss_fuzz_run.sh":/runner.sh \ -v "$(shell pwd)/tests/fuzz/oss_fuzz_run.sh":/runner.sh \
local-fuzzing:latest \ local-fuzzing:latest \
bash -c "/runner.sh" bash -c "/runner.sh"
# Run fuzz tests for the duration set in FUZZ_TIME.
fuzz-native:
KUBEBUILDER_ASSETS=$(KUBEBUILDER_ASSETS) \
FUZZ_TIME=$(FUZZ_TIME) \
./tests/fuzz/native_go_run.sh
# Creates an env file that can be used to load all source-controller's dependencies # Creates an env file that can be used to load all source-controller's dependencies
# this is handy when you want to run adhoc debug sessions on tests or start the # this is handy when you want to run adhoc debug sessions on tests or start the
# controller in a new debug session. # controller in a new debug session.