From 3de18b537e77ef68aaf0222fa0cebf130b4c5266 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Mon, 17 Feb 2025 13:19:29 +0100 Subject: [PATCH 1/3] test/buildah-bud: run bats in parallel Since commit 708fe0af in buildah the tests can run in parallel, let's enable it here to get the same speed up. Signed-off-by: Paul Holzinger --- test/buildah-bud/run-buildah-bud-tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/buildah-bud/run-buildah-bud-tests b/test/buildah-bud/run-buildah-bud-tests index 3407eb8c7c..0ed3a2e3be 100755 --- a/test/buildah-bud/run-buildah-bud-tests +++ b/test/buildah-bud/run-buildah-bud-tests @@ -262,5 +262,5 @@ review the test failure and double-check your changes. BUILDAH_BINARY=$(pwd)/bin/buildah \ COPY_BINARY=$(pwd)/bin/copy \ INET_BINARY=$(pwd)/bin/inet \ - bats "${bats_filter[@]}" tests/bud.bats) + bats -j $(nproc) "${bats_filter[@]}" tests/bud.bats) fi From c278db873f082eebf158bcdcb66f30b20cd64f1e Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Mon, 17 Feb 2025 13:23:10 +0100 Subject: [PATCH 2/3] cirrus: use fastvm for buildah_bud As they run parallel now we can use some more cores and remove the long timeout, they must be faster than the 20min default now. Signed-off-by: Paul Holzinger --- .cirrus.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 475a632ceb..9bf8737112 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -979,8 +979,7 @@ buildah_bud_test_task: PODBIN_NAME: podman - env: PODBIN_NAME: remote - gce_instance: *standardvm - timeout_in: 45m + gce_instance: *fastvm clone_script: *get_gosrc setup_script: *setup main_script: *main From 22da944e4a0cf8d20b510ab7e6b4ed27239d6953 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Tue, 21 May 2024 05:02:49 -0600 Subject: [PATCH 3/3] Parallelize buildah bud tests Buildah bats tests have been made (mostly) parallel-safe in the past few months. One test is flaking, but it's not a test that needs to be run under podman: that functionality is almost entirely buildah-manifest-push so it uses the buildah binary, and doesn't exercise anything under podman. Therefore: 1) run bud tests with -j$(nproc) on fastvm (was: standardvm) 2) desperate scramble to parallelize podman system service. May not be quite 100% perfect, but I think this is in good enough shape for someone to adopt and push through. Signed-off-by: Ed Santiago Signed-off-by: Paul Holzinger --- test/buildah-bud/apply-podman-deltas | 5 +++ test/buildah-bud/buildah-tests.diff | 49 +++++++++++++--------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/test/buildah-bud/apply-podman-deltas b/test/buildah-bud/apply-podman-deltas index 3538508de2..0554de92a9 100755 --- a/test/buildah-bud/apply-podman-deltas +++ b/test/buildah-bud/apply-podman-deltas @@ -187,6 +187,11 @@ skip "podman-build fails with 'context must be a directory'" \ skip "does not pass in Podman CI: needs investigation" \ "bud with --no-hostname" +# 2024-11-22 not really a useful test of podman (the push/pull uses buildah binary) +# and it flakes when run in parallel. We choose to go with CI speed. +skip "not a useful podman test, and it breaks when run parallel" \ + "bud: build push with --force-compression" + ############################################################################### # BEGIN tests which are skipped because they make no sense under podman-remote diff --git a/test/buildah-bud/buildah-tests.diff b/test/buildah-bud/buildah-tests.diff index 039d651c94..5758aa58c1 100644 --- a/test/buildah-bud/buildah-tests.diff +++ b/test/buildah-bud/buildah-tests.diff @@ -1,21 +1,23 @@ -From d7839d93860915b2a43c486d0fed89fee7313ec0 Mon Sep 17 00:00:00 2001 +From 09a0ad17630b688e0f06e3de83b830b70f6c50fc Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Thu, 6 Oct 2022 17:32:59 -0600 Subject: [PATCH] tweaks for running buildah tests under podman Signed-off-by: Ed Santiago +Signed-off-by: Paul Holzinger --- - tests/helpers.bash | 119 +++++++++++++++++++++++++++++++++++++++++++-- - 1 file changed, 115 insertions(+), 4 deletions(-) + tests/helpers.bash | 113 +++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 109 insertions(+), 4 deletions(-) diff --git a/tests/helpers.bash b/tests/helpers.bash -index f8ab624a8..0d8f5ce69 100644 +index ed5de994e..3fc39e17b 100644 --- a/tests/helpers.bash +++ b/tests/helpers.bash -@@ -80,6 +80,38 @@ EOF +@@ -80,6 +80,42 @@ EOF BUILDAH_REGISTRY_OPTS="${regconfopt} ${regconfdir} --short-name-alias-conf ${TEST_SCRATCH_DIR}/cache/shortnames.conf" COPY_REGISTRY_OPTS="${BUILDAH_REGISTRY_OPTS}" PODMAN_REGISTRY_OPTS="${regconfopt}" ++ PODMAN_REMOTE_OPTS= + + PODMAN_SERVER_PID= + PODMAN_NATIVE="${PODMAN_BINARY} ${ROOTDIR_OPTS} ${PODMAN_REGISTRY_OPTS}" @@ -32,26 +34,29 @@ index f8ab624a8..0d8f5ce69 100644 + local sockdir=/run + if is_rootless; then + sockdir=${XDG_RUNTIME_DIR:-/run/user/$(id -u)} ++ mkdir -p ${sockdir}/podman + fi -+ PODMAN_SOCK_FILE=$sockdir/podman/podman.sock ++ PODMAN_SOCK_FILE=$sockdir/podman/podman-${BATS_SUITE_TEST_NUMBER}.sock ++ PODMAN_REMOTE_OPTS="--url unix://${PODMAN_SOCK_FILE}" + # static CONTAINERS_CONF needed for capabilities test. As of 2021-07-01 + # no tests in bud.bats override this; if at some point any test does + # so, it will probably need to be skip_if_remote()d. -+ env CONTAINERS_CONF_OVERRIDE=${CONTAINERS_CONF_OVERRIDE:-$(dirname ${BASH_SOURCE})/containers.conf} $PODMAN_NATIVE system service --log-level=info --timeout=0 &>>${PODMAN_SERVER_LOG:-/dev/stderr} & ++ echo "$_LOG_PROMPT $PODMAN_NATIVE system service [...] unix://${PODMAN_SOCK_FILE}" >&2 ++ env CONTAINERS_CONF_OVERRIDE=${CONTAINERS_CONF_OVERRIDE:-$(dirname ${BASH_SOURCE})/containers.conf} $PODMAN_NATIVE system service --log-level=info --timeout=0 unix://${PODMAN_SOCK_FILE} &>>${PODMAN_SERVER_LOG:-/dev/stderr} & + PODMAN_SERVER_PID=$! + echo ">> pid=$PODMAN_SERVER_PID" >>${PODMAN_SERVER_LOG:-/dev/stderr} -+ local timeout=10 ++ local timeout=30 + while ((timeout > 0)); do + test -S $PODMAN_SOCK_FILE && return + sleep 0.2 + timeout=$((timeout - 1)) + done -+ die "podman server never came up" ++ die "podman server never came up: $PODMAN_SOCK_FILE" + fi } function starthttpd() { # directory [working-directory-or-"" [certfile, keyfile]] -@@ -144,6 +176,32 @@ function teardown_tests() { +@@ -144,6 +180,22 @@ function teardown_tests() { stop_git_daemon stop_registry @@ -70,21 +75,11 @@ index f8ab624a8..0d8f5ce69 100644 + sleep 0.5 + done + fi -+ -+ # FIXME! 2023-04-11: under remote + rootless, on the very first test, -+ # we somehow end up with two podman-system-service jobs. The second one -+ # lingers, and prevents BATS from completing, manifesting as a test hang. -+ if is_rootless; then -+ ps auxww | grep "system service" | grep -v grep | while read user pid rest; do -+ echo "# teardown: killing stray server: $user $pid $rest" >&3 -+ kill $pid -+ done -+ fi + # Workaround for #1991 - buildah + overlayfs leaks mount points. # Many tests leave behind /var/tmp/.../root/overlay and sub-mounts; # let's find those and clean them up, otherwise 'rm -rf' fails. -@@ -252,7 +310,12 @@ function copy() { +@@ -265,7 +317,12 @@ function copy() { } function podman() { @@ -92,13 +87,13 @@ index f8ab624a8..0d8f5ce69 100644 + local cmd=${PODMAN_BINARY:-podman} + local opts="${PODMAN_REGISTRY_OPTS} ${ROOTDIR_OPTS}" + if [[ $cmd =~ remote ]]; then -+ opts= ++ opts="${PODMAN_REMOTE_OPTS}" + fi + command $cmd $opts "$@" } # There are various scenarios where we would like to execute `tests` as rootless user, however certain commands like `buildah mount` -@@ -316,8 +379,36 @@ function run_buildah() { +@@ -329,8 +386,36 @@ function run_buildah() { --retry) retry=3; shift;; # retry network flakes esac @@ -117,7 +112,7 @@ index f8ab624a8..0d8f5ce69 100644 + podman_or_buildah=${PODMAN_BINARY} + _opts="${ROOTDIR_OPTS} ${PODMAN_REGISTRY_OPTS}" + if [[ -n "$REMOTE" ]]; then -+ _opts= ++ _opts="${PODMAN_REMOTE_OPTS}" + fi + + # Special case: there's one test that invokes git in such @@ -136,7 +131,7 @@ index f8ab624a8..0d8f5ce69 100644 # If session is rootless and `buildah mount` is invoked, perform unshare, # since normal user cannot mount a filesystem unless they're in a user namespace along with its own mount namespace. -@@ -331,8 +422,8 @@ function run_buildah() { +@@ -344,8 +429,8 @@ function run_buildah() { retry=$(( retry - 1 )) # stdout is only emitted upon error; this echo is to help a debugger @@ -147,7 +142,7 @@ index f8ab624a8..0d8f5ce69 100644 # without "quotes", multiple lines are glommed together into one if [ -n "$output" ]; then echo "$output" -@@ -693,6 +784,26 @@ function skip_if_no_unshare() { +@@ -706,6 +791,26 @@ function skip_if_no_unshare() { fi } @@ -175,5 +170,5 @@ index f8ab624a8..0d8f5ce69 100644 daemondir=${TEST_SCRATCH_DIR}/git-daemon mkdir -p ${daemondir}/repo -- -2.47.0 +2.48.1