[v5.8] Bump Buildah to v1.43.2

[TomSweeneyRedHat]

Bump Buildah to v1.43.2 in preparation for the next Podman v5.8 release.

Checklist

Ensure you have completed the following checklist for your pull request to be reviewed:

• Certify you wrote the patch or otherwise have the right to pass it on as an open-source patch by signing all
  commits. (git commit -s). (If needed, use git commit -s --amend). The author email must match
  the sign-off email address. See CONTRIBUTING.md
  for more information.
• Referenced issues using Fixes: #00000 in commit message (if applicable)
• Tests have been added/updated (or no tests are needed)
• Documentation has been updated (or no documentation changes are needed)
• All commits pass make validatepr (format/lint checks)
• Release note entered in the section below (or None if no user-facing changes)

Does this PR introduce a user-facing change?

None

[packit-as-a-service]

[NON-BLOCKING] Packit jobs failed. @containers/packit-build please check. Everyone else, feel free to ignore.

[Luap99]

looks like you need the small fix in libpod from 47ab0f1

[TomSweeneyRedHat]

@Luap99 TYVM for the pointer, picked and pushed.

[Luap99]

The github.com/opencontainers/cgroups v0.0.6 bump must be in the same commit as the build each commit fails otherwise

[Luap99]

bud failures are legit, int and sys a a flake and can be ignored

+ git am --reject
Checking patch tests/helpers.bash...
error: while searching for:
    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}"
}

function starthttpd() { # directory [working-directory-or-"" [certfile, keyfile]]

error: patch failed: tests/helpers.bash:85
Hunk #2 succeeded at 154 (offset -31 lines).
Hunk #3 succeeded at 291 (offset -31 lines).
Hunk #4 succeeded at 403 (offset -31 lines).
Hunk #5 succeeded at 496 (offset -31 lines).
Hunk #6 succeeded at 524 (offset -31 lines).
Hunk #7 succeeded at 864 (offset -31 lines).
Applying patch tests/helpers.bash with 1 reject...
Rejected hunk #1.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.
Hunk #7 applied cleanly.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Applying: tweaks for running buildah tests under podman
Patch failed at 0001 tweaks for running buildah tests under podman

***************************************

Error applying patch file. This can happen when you vendor in a new buildah.
You will want to:

  *** START A NEW TERMINAL WINDOW!              ***
  *** ...so you can refer to these instructions ***

  - cd test-buildah-*   (into the buildah-bud test directory)

  - look for 'tests/*.rej'
  - resolve conflicts manually
  - git add tests/helpers.bash
  - git am --continue
  - ./make-new-buildah-diffs

  - cd .. (back to podman source dir)

...and git-commit the new .diff file as part of your podman PR.


Please see test/buildah-bud/README.md for advice

[TomSweeneyRedHat]

Fingers crossed. I htad to do some serious blakc magic to buildah-test.diff. It rejected:

diff --git a/tests/helpers.bash b/tests/helpers.bash
index 5ba4f5a..6a41f10 100644
--- a/tests/helpers.bash
+++ b/tests/helpers.bash
@@ -86,6 +86,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}"
+    if [[ -n "$REMOTE" ]]; then
+        PODMAN_NATIVE="${PODMAN_BINARY%%-remote} ${ROOTDIR_OPTS} ${PODMAN_REGISTRY_OPTS}"
+        if [[ -n "$PODMAN_SERVER_LOG" ]]; then
+            (
+                echo "---------------------------------"
+                echo "- bats test ${BATS_TEST_NUMBER} : ${BATS_TEST_NAME}"
+            ) >> $PODMAN_SERVER_LOG
+        fi
+
+        # Path to podman socket file
+        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-${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.
+        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=30
+        while ((timeout > 0)); do
+            test -S $PODMAN_SOCK_FILE && return
+            sleep 0.2
+            timeout=$((timeout - 1))
+        done
+        die "podman server never came up: $PODMAN_SOCK_FILE"
+    fi
 }

and then later

+####################
+#  skip_if_remote  #  (only applicable for podman)
+####################
+function skip_if_remote() {
+    if [[ -n "$REMOTE" ]]; then
+        skip "${1:-test does not work with podman-remote}"
+    fi
+}
+
+#############################
+#  skip_if_rootless_remote  #  (only applicable for podman)
+#############################
+function skip_if_rootless_remote() {
+    if [[ -n "$REMOTE" ]]; then
+        if is_rootless; then
+            skip "${1:-test does not work with rootless podman-remote}"
+        fi
+    fi
+}
+

I made best guesses based on the last two commits to main for this one, but guesses at best.

[TomSweeneyRedHat]

@nalind or @Luap99 if you have suggestions, I'd appreciate hearing them.

[Luap99]

Why are you adding others people sign off lines here, that feels incorrect?
I am confused where they would come from?

[TomSweeneyRedHat]

@Luap99 I added those lines as I copied changes to the file that Lokesh and Danish had done in commits to main.

[Luap99]

@Luap99 I added those lines as I copied changes to the file that Lokesh and Danish had done in commits to main.

Ah I see, it was not obvious to me that this is a backport of prior work.

[Luap99]

LGTM

[nalind]

LGTM