From 43af95eeede68a23e7e8adfcb5d3c08979461505 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Tue, 21 May 2024 05:02:49 -0600 Subject: [PATCH] DO NOT MERGE: buildah vendor treadmill As you run --sync, please update this commit message with your actual changes. Changes since 2024-10-02: * deal with new "inet" helper * skip_if_remote new mount-secret-env test (buildah 5185): it uses environment variables, which cannot work remote Signed-off-by: Ed Santiago --- test/buildah-bud/apply-podman-deltas | 3 ++- test/buildah-bud/run-buildah-bud-tests | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/test/buildah-bud/apply-podman-deltas b/test/buildah-bud/apply-podman-deltas index 99dc1900ac..5bf1d77653 100755 --- a/test/buildah-bud/apply-podman-deltas +++ b/test/buildah-bud/apply-podman-deltas @@ -241,7 +241,8 @@ skip_if_remote "--output option not implemented in podman-remote" \ skip_if_remote "logfile not implemented on remote" "bud-logfile-with-split-logfile-by-platform" skip_if_remote "envariables do not automatically work with -remote." \ - "build proxy" + "build proxy" \ + "build-test --mount=type=secret test from env with chroot isolation" # 2022-07-04 this is a new test in buildah; it's failing in treadmill skip_if_remote "FIXME FIXME FIXME: does this test make sense in remote?" \ diff --git a/test/buildah-bud/run-buildah-bud-tests b/test/buildah-bud/run-buildah-bud-tests index 3561c3f117..570fbea2a9 100755 --- a/test/buildah-bud/run-buildah-bud-tests +++ b/test/buildah-bud/run-buildah-bud-tests @@ -182,6 +182,8 @@ if [[ -n $do_checkout ]]; then (set -x;make bin/buildah) failhint="error building buildah's copy helper. This should never happen." (set -x;make bin/copy) + failhint="error building buildah's inet helper. This should never happen." + (set -x;make bin/inet) # The upcoming patch may fail. Before we try it, create a helper script # for a developer to push a new set of diffs to podman-land. @@ -259,5 +261,6 @@ review the test failure and double-check your changes. REMOTE=$REMOTE \ BUILDAH_BINARY=$(pwd)/bin/buildah \ COPY_BINARY=$(pwd)/bin/copy \ + INET_BINARY=$(pwd)/bin/inet \ bats "${bats_filter[@]}" tests/bud.bats) fi