Skip to content

Commit

Permalink
DO NOT MERGE: buildah vendor treadmill
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
edsantiago committed Oct 22, 2024
1 parent 2a6cb10 commit cedb9d9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
3 changes: 2 additions & 1 deletion test/buildah-bud/apply-podman-deltas
Original file line number Diff line number Diff line change
Expand Up @@ -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?" \
Expand Down
3 changes: 3 additions & 0 deletions test/buildah-bud/run-buildah-bud-tests
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -250,5 +252,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

0 comments on commit cedb9d9

Please sign in to comment.