Skip to content

CI: run tests that need root as root #2878

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mtrmac merged 3 commits into from
Jun 27, 2025
Merged

CI: run tests that need root as root #2878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9849d43
Makefile: add TESTFLAGS to pass flags to go test
Luap99 Jun 26, 2025
8435a2d
CI: run tests that need root as root
Luap99 Jun 24, 2025
d770ede
CI: run go test with -v
Luap99 Jun 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ BUILD_TAGS_DARWIN_CROSS = containers_image_openpgp
BUILDTAGS =
BUILDFLAGS := -tags "$(BUILDTAGS)"

# Extra flags passed to go test
TESTFLAGS :=

PACKAGES := $(shell go list $(BUILDFLAGS) ./...)
SOURCE_DIRS = $(shell echo $(PACKAGES) | awk 'BEGIN{FS="/"; RS=" "}{print $$4}' | uniq)

Expand Down Expand Up @@ -86,7 +89,7 @@ clean:

.PHONY: test
test:
@go test $(BUILDFLAGS) -cover ./...
@go test $(BUILDFLAGS) $(TESTFLAGS) -cover ./...

.PHONY: fmt
fmt:
Expand Down
20 changes: 18 additions & 2 deletions contrib/cirrus/runner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,23 @@ _run_setup() {
_run_image_tests() {
req_env_vars GOPATH GOSRC

# Tests in this repo. are intended to run as a regular user.
# Hacky solution to find test that must be run as root.
# This looks for the ensureTestCanCreateImages() test function call and gets the
# function name where it is called via git grep,
# then trims the line to only show the actual function name and add "^$" around it
# since go test commands only accepts a single regex.
# Then join all names with "|" with paste to again build up a single regex string
# that matches all these names.
# With that we don't have to run everything twice and can just run the ones that
# actually need to be root.
# Note we must run git before we switch/chown to the user because it will error
# out otherwise since the file ownership doesn't match.
test_filter=$(git grep -h --show-function ensureTestCanCreateImages |
sed -n 's/func \(Test[[:alnum:]]*\)(.*/^\1\$\$/p' |
paste -sd "|" -)
showrun make test "BUILDTAGS='$BUILDTAGS'" "TESTFLAGS=-v -run '$test_filter'"

# Most tests in this repo are intended to run as a regular user.
ROOTLESS_USER="testuser$RANDOM"
msg "Setting up rootless user '$ROOTLESS_USER'"
cd $GOSRC || exit 1
Expand Down Expand Up @@ -80,7 +96,7 @@ _run_image_tests() {
ssh-keyscan localhost > /root/.ssh/known_hosts \

msg "Executing tests as $ROOTLESS_USER"
showrun ssh $ROOTLESS_USER@localhost make -C $GOSRC test "BUILDTAGS='$BUILDTAGS'"
showrun ssh $ROOTLESS_USER@localhost make -C $GOSRC test "BUILDTAGS='$BUILDTAGS'" "TESTFLAGS=-v"
}

req_env_vars GOSRC
Expand Down