From 1b466ccbdc988023abfef6aabe4d06951375c3da Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Tue, 24 Oct 2023 13:52:15 +0200 Subject: [PATCH] test/e2e: do not import buildah We only care about the version so just import the define package for it, the main buildah package causes big transitive imports which fail to build with the remote tag (i.e. libimage) Signed-off-by: Paul Holzinger --- test/e2e/build_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/e2e/build_test.go b/test/e2e/build_test.go index faf49cb667..ab1b1d6b67 100644 --- a/test/e2e/build_test.go +++ b/test/e2e/build_test.go @@ -9,7 +9,7 @@ import ( "runtime" "strings" - "github.com/containers/buildah" + "github.com/containers/buildah/define" . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -344,7 +344,7 @@ RUN exit 5`, CITEST_IMAGE) inspect := podmanTest.Podman([]string{"image", "inspect", "--format", "{{ index .Config.Labels }}", "test"}) inspect.WaitWithDefaultTimeout() data := inspect.OutputToString() - Expect(data).To(ContainSubstring(buildah.Version)) + Expect(data).To(ContainSubstring(define.Version)) }) It("podman build and check identity with always", func() { @@ -357,7 +357,7 @@ RUN exit 5`, CITEST_IMAGE) inspect := podmanTest.Podman([]string{"image", "inspect", "--format", "{{ index .Config.Labels }}", "test1"}) inspect.WaitWithDefaultTimeout() data := inspect.OutputToString() - Expect(data).To(ContainSubstring(buildah.Version)) + Expect(data).To(ContainSubstring(define.Version)) // with --pull-always session = podmanTest.Podman([]string{"build", "-q", "--pull-always", "-f", "build/basicalpine/Containerfile.path", "--no-cache", "-t", "test2", "build/basicalpine"}) @@ -368,7 +368,7 @@ RUN exit 5`, CITEST_IMAGE) inspect = podmanTest.Podman([]string{"image", "inspect", "--format", "{{ index .Config.Labels }}", "test2"}) inspect.WaitWithDefaultTimeout() data = inspect.OutputToString() - Expect(data).To(ContainSubstring(buildah.Version)) + Expect(data).To(ContainSubstring(define.Version)) }) It("podman-remote send correct path to copier", func() {