DO NOT MERGE: buildah vendor treadmill

As you run --sync, please update this commit message with your
actual changes.

Changes since 2024-11-14:

  * EXPERIMENTAL: try running in parallel on fastvm
  * line-offset-only changes to helpers.bash diffs, due to
    new _prefetch()

Signed-off-by: Ed Santiago <[email protected]>

.cirrus.yml

@@ -999,7 +999,7 @@ buildah_bud_test_task:
         - env:
             PODBIN_NAME: remote
             PRIV_NAME: rootless
-    gce_instance: *standardvm
+    gce_instance: *fastvm
     timeout_in: 45m
     clone_script: *get_gosrc
     setup_script: *setup

test/buildah-bud/buildah-tests.diff

@@ -1,4 +1,4 @@
-From d7839d93860915b2a43c486d0fed89fee7313ec0 Mon Sep 17 00:00:00 2001
+From af4e93ad93b38d085bc5a236fc5da0ad4106d7c2 Mon Sep 17 00:00:00 2001
 From: Ed Santiago <[email protected]>
 Date: Thu, 6 Oct 2022 17:32:59 -0600
 Subject: [PATCH] tweaks for running buildah tests under podman
@@ -9,7 +9,7 @@ Signed-off-by: Ed Santiago <[email protected]>
  1 file changed, 115 insertions(+), 4 deletions(-)
 
 diff --git a/tests/helpers.bash b/tests/helpers.bash
-index f8ab624a8..0d8f5ce69 100644
+index ed5de994e..0671a52d8 100644
 --- a/tests/helpers.bash
 +++ b/tests/helpers.bash
 @@ -80,6 +80,38 @@ EOF
@@ -84,7 +84,7 @@ index f8ab624a8..0d8f5ce69 100644
      # 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 +323,12 @@ function copy() {
  }
 
  function podman() {
@@ -98,7 +98,7 @@ index f8ab624a8..0d8f5ce69 100644
  }
 
  # 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 +392,36 @@ function run_buildah() {
          --retry)         retry=3;        shift;;  # retry network flakes
      esac
 
@@ -136,7 +136,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 +435,8 @@ function run_buildah() {
          retry=$(( retry - 1 ))
 
          # stdout is only emitted upon error; this echo is to help a debugger
@@ -147,7 +147,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 +797,26 @@ function skip_if_no_unshare() {
    fi
  }
 

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