Browse code

hack/validate: allow forcing validation

This introduces a FORCE_VALIDATE environment variable, which allows
forcing some validation steps, even if no changes were detected.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2019/10/07 22:20:03
Showing 5 changed files
... ...
@@ -65,6 +65,7 @@ DOCKER_ENVS := \
65 65
 	-e DOCKER_TEST_HOST \
66 66
 	-e DOCKER_USERLANDPROXY \
67 67
 	-e DOCKERD_ARGS \
68
+	-e TEST_FORCE_VALIDATE \
68 69
 	-e TEST_INTEGRATION_DIR \
69 70
 	-e TEST_SKIP_INTEGRATION \
70 71
 	-e TEST_SKIP_INTEGRATION_CLI \
... ...
@@ -7,7 +7,7 @@ IFS=$'\n'
7 7
 files=( $(validate_diff --diff-filter=ACMR --name-only -- 'profiles/seccomp' || true) )
8 8
 unset IFS
9 9
 
10
-if [ ${#files[@]} -gt 0 ]; then
10
+if [ -n "${TEST_FORCE_VALIDATE:-}" ] || [ ${#files[@]} -gt 0 ]; then
11 11
 	# We run 'go generate' and see if we have a diff afterwards
12 12
 	go generate ./profiles/seccomp/ >/dev/null
13 13
 	# Let see if the working directory is clean
... ...
@@ -7,7 +7,7 @@ IFS=$'\n'
7 7
 files=( $(validate_diff --diff-filter=ACMR --name-only -- 'api/swagger.yaml' || true) )
8 8
 unset IFS
9 9
 
10
-if [ ${#files[@]} -gt 0 ]; then
11
-	LANG=C.UTF-8 yamllint -c ${SCRIPTDIR}/.swagger-yamllint api/swagger.yaml
10
+if [ -n "${TEST_FORCE_VALIDATE:-}" ] || [ ${#files[@]} -gt 0 ]; then
11
+	LANG=C.UTF-8 yamllint -c "${SCRIPTDIR}"/.swagger-yamllint api/swagger.yaml
12 12
 	swagger validate api/swagger.yaml
13 13
 fi
... ...
@@ -7,8 +7,8 @@ IFS=$'\n'
7 7
 files=( $(validate_diff --diff-filter=ACMR --name-only -- 'api/types/' 'api/swagger.yaml' || true) )
8 8
 unset IFS
9 9
 
10
-if [ ${#files[@]} -gt 0 ]; then
11
-	${SCRIPTDIR}/../generate-swagger-api.sh 2> /dev/null
10
+if [ -n "${TEST_FORCE_VALIDATE:-}" ] || [ ${#files[@]} -gt 0 ]; then
11
+	"${SCRIPTDIR}"/../generate-swagger-api.sh 2> /dev/null
12 12
 	# Let see if the working directory is clean
13 13
 	diffs="$(git diff -- api/types/)"
14 14
 	if [ "$diffs" ]; then
... ...
@@ -8,7 +8,7 @@ validate_vendor_diff(){
8 8
 	files=( $(validate_diff --diff-filter=ACMR --name-only -- 'vendor.conf' 'vendor/' || true) )
9 9
 	unset IFS
10 10
 
11
-	if [ ${#files[@]} -gt 0 ]; then
11
+	if [ -n "${TEST_FORCE_VALIDATE:-}" ] || [ ${#files[@]} -gt 0 ]; then
12 12
 		# recreate vendor/
13 13
 		vndr
14 14
 		# check if any files have changed