Merge pull request #21815 from maribu/dist/tools/buildsystem_sanity_check/add-knob-for-docker-pinning-test

maribu · web-flow · commit 840927495bad · 2025-10-23T08:40:28.000Z
dist/tools: add knob for docker pinning test
diff --git a/dist/tools/buildsystem_sanity_check/check.sh b/dist/tools/buildsystem_sanity_check/check.sh
@@ -13,6 +13,8 @@
 #
 #
 
+export ENABLE_DOCKER_PINNING_TEST=${ENABLE_DOCKER_PINNING_TEST:-1}
+
 : "${RIOTBASE:="$(cd "$(dirname "$0")/../../../" || exit; pwd)"}"
 
 : "${RIOTTOOLS:=${RIOTBASE}/dist/tools}"
@@ -382,6 +384,10 @@ check_tests_application_path() {
 }
 
 check_pinned_docker_version_is_up_to_date() {
+    if [ "$ENABLE_DOCKER_PINNING_TEST" != "1" ]; then
+        # Skipping docker version test as requested
+        return
+    fi
     local pinned_repo_digest
     local upstream_repo_digest
     pinned_repo_digest="$(awk '/^DOCKER_TESTED_IMAGE_REPO_DIGEST := (.*)$/ { print substr($0, index($0, $3)); exit }' "$RIOTMAKE/docker.inc.mk")"

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@`
`13`	`13`	`#`
`14`	`14`	`#`
`15`	`15`
	`16`	`+export ENABLE_DOCKER_PINNING_TEST=${ENABLE_DOCKER_PINNING_TEST:-1}`
	`17`	`+`
`16`	`18`	`: "${RIOTBASE:="$(cd "$(dirname "$0")/../../../" \|\| exit; pwd)"}"`
`17`	`19`
`18`	`20`	`: "${RIOTTOOLS:=${RIOTBASE}/dist/tools}"`
`@@ -382,6 +384,10 @@ check_tests_application_path() {`
`382`	`384`	`}`
`383`	`385`
`384`	`386`	`check_pinned_docker_version_is_up_to_date() {`
	`387`	`+ if [ "$ENABLE_DOCKER_PINNING_TEST" != "1" ]; then`
	`388`	`+ # Skipping docker version test as requested`
	`389`	`+ return`
	`390`	`+ fi`
`385`	`391`	`local pinned_repo_digest`
`386`	`392`	`local upstream_repo_digest`
`387`	`393`	`pinned_repo_digest="$(awk '/^DOCKER_TESTED_IMAGE_REPO_DIGEST := (.*)$/ { print substr($0, index($0, $3)); exit }' "$RIOTMAKE/docker.inc.mk")"`