Accepting request 1308812 from home:cyphar:docker

Fix comment in docker-integration.sh.

OBS-URL: https://build.opensuse.org/request/show/1308812
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=456
This commit is contained in:
2025-10-03 07:59:22 +00:00
committed by Git OBS Bridge
parent 38fda79cc6
commit 90f08e4cc6

View File

@@ -180,7 +180,9 @@ fi
mv -nv /etc/docker/suse-secrets-enable{,-DISABLED}
sudo systemctl restart docker
# Make sure docker-buildx is disabled.
# We need to disable docker-buildx for the integration-cli tests because
# otherwise the "docker build" command will use the wrong builder and the
# output won't match what the tests expect.
[ -e /usr/lib/docker/cli-plugins/docker-buildx ] && \
mv -nv /usr/lib/docker/cli-plugins/docker-buildx{,-DISABLED}
@@ -250,9 +252,6 @@ for suite_name in "${SUITES[@]}"; do
[ -n "$filter" ] && test_flags+=("-test.run" "$filter")
if [[ "$suite_name" == "integration-cli" ]]; then
# We need to disable docker-buildx for the integration-cli tests
# because otherwise the "docker build" command will use the wrong
# builder and the output won't match what the tests expect.
timeout=360m
fi
test_flags+=("-test.timeout" "$timeout")