mirror of
https://github.com/containers/podman.git
synced 2025-10-20 12:43:58 +08:00
pkg/machine/e2e: remove build context skip
The machine images should contain a new enough podman on the server side to support this so the skips can be removed. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
@ -249,7 +249,6 @@ var _ = Describe("run basic podman commands", func() {
|
|||||||
})
|
})
|
||||||
|
|
||||||
It("podman build contexts", func() {
|
It("podman build contexts", func() {
|
||||||
skipIfVmtype(define.HyperVVirt, "FIXME: #23429 - Error running podman build with option --build-context on Hyper-V")
|
|
||||||
name := randomString()
|
name := randomString()
|
||||||
i := new(initMachine)
|
i := new(initMachine)
|
||||||
session, err := mb.setName(name).setCmd(i.withImage(mb.imagePath).withNow()).run()
|
session, err := mb.setName(name).setCmd(i.withImage(mb.imagePath).withNow()).run()
|
||||||
@ -272,15 +271,6 @@ var _ = Describe("run basic podman commands", func() {
|
|||||||
|
|
||||||
bm := basicMachine{}
|
bm := basicMachine{}
|
||||||
build, err := mb.setCmd(bm.withPodmanCommand([]string{"build", "-t", name, "--build-context", "test-context=" + additionalContextDir, mainContextDir})).run()
|
build, err := mb.setCmd(bm.withPodmanCommand([]string{"build", "-t", name, "--build-context", "test-context=" + additionalContextDir, mainContextDir})).run()
|
||||||
|
|
||||||
if build != nil && build.ExitCode() != 0 {
|
|
||||||
output := build.outputToString() + build.errorToString()
|
|
||||||
if strings.Contains(output, "multipart/form-data") &&
|
|
||||||
strings.Contains(output, "not supported") {
|
|
||||||
Skip("Build contexts with multipart/form-data are not supported on this version")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Expect(err).ToNot(HaveOccurred())
|
Expect(err).ToNot(HaveOccurred())
|
||||||
Expect(build).To(Exit(0))
|
Expect(build).To(Exit(0))
|
||||||
Expect(build.outputToString()).To(ContainSubstring("COMMIT"))
|
Expect(build.outputToString()).To(ContainSubstring("COMMIT"))
|
||||||
|
Reference in New Issue
Block a user