From 1aafb01a9950c5d2c46278cf22488b9acfeaab00 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Tue, 14 Jun 2022 11:36:18 -0600 Subject: buildah vendor treadmill As you run --sync, please update this commit message with your actual changes. Changes since 2022-06-14: - apply-podman-deltas: (minor) buildah 4057 changed the name of a test; make corresponding change here - apply-podman-deltas: buildah 4071 adds a new OCI-hook test that's failing in remote. Skip it. - apply-podman-deltas: buildah 4096 changed an error message - apply-podman-deltas: buildah 4097 added a test that doesn't work with podman-remote - run-buildah-bud-tests: only run 'sudo --validate' if we need to sudo later (for running tests). Otherwise, same thing: I run the treadmill script, step away, and come back to an unnecessary sudo prompt. - system tests: the new containers-storage changes some error messages; fix tests to reflect that. (And, unrelated, fix a red cleanup warning) Signed-off-by: Ed Santiago Signed-off-by: Daniel J Walsh --- test/buildah-bud/apply-podman-deltas | 11 ++++++++--- test/buildah-bud/run-buildah-bud-tests | 9 ++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) (limited to 'test/buildah-bud') diff --git a/test/buildah-bud/apply-podman-deltas b/test/buildah-bud/apply-podman-deltas index 3b3c5592a..d6d539fa4 100755 --- a/test/buildah-bud/apply-podman-deltas +++ b/test/buildah-bud/apply-podman-deltas @@ -129,10 +129,10 @@ errmsg "no such file or directory" \ errmsg "no such file or directory" \ "Error: no context directory and no Containerfile specified" \ - "bud without any arguments should fail when no Dockerfile exist" + "bud without any arguments should fail when no Dockerfile exists" errmsg "is not a file" \ - "Error: open .*: no such file or directory" \ + "Error: containerfile: .* cannot be path to a directory" \ "bud with specified context should fail if assumed Dockerfile is a directory" errmsg "no such file or directory" \ @@ -215,7 +215,8 @@ skip_if_remote "--output option not implemented in podman-remote" \ "build with custom build output and output rootfs to directory" \ "build with custom build output and output rootfs to tar" \ "build with custom build output and output rootfs to tar by pipe" \ - "build with custom build output must fail for bad input" + "build with custom build output must fail for bad input" \ + "build with custom build output and output rootfs to tar with no additional step" # https://github.com/containers/podman/issues/14544 skip_if_remote "logfile not implemented on remote" "bud-logfile-with-split-logfile-by-platform" @@ -223,6 +224,10 @@ skip_if_remote "logfile not implemented on remote" "bud-logfile-with-split-logfi skip_if_remote "envariables do not automatically work with -remote." \ "build proxy" +# 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?" \ + "build-test with OCI prestart hook" + ############################################################################### # BEGIN tests which are skipped due to actual podman or podman-remote bugs. diff --git a/test/buildah-bud/run-buildah-bud-tests b/test/buildah-bud/run-buildah-bud-tests index 4ff062496..d0e2e3237 100755 --- a/test/buildah-bud/run-buildah-bud-tests +++ b/test/buildah-bud/run-buildah-bud-tests @@ -94,10 +94,13 @@ fi set -e # Run sudo early, to refresh the credentials cache. This is a NOP under CI, -# but might be appreciated by developers who run this script, step away +# but might be appreciated by developers who run this script, step away # during the git-checkout-buildah step, then come back twenty minutes later -# to an expired sudo prompt and no tests have run. -sudo --validate +# to an expired sudo prompt and no tests have run. (No need to do this +# for checkout; only when running tests) +if [[ -n $do_test ]]; then + sudo --validate +fi # Before pulling buildah (while still cd'ed to podman repo), try to determine # if this is a PR, and if so if it's a revendoring of buildah. We use this to -- cgit v1.2.3-54-g00ecf