summaryrefslogtreecommitdiff
path: root/test/e2e
diff options
context:
space:
mode:
authorBrent Baude <bbaude@redhat.com>2020-03-15 12:30:33 -0500
committerBrent Baude <bbaude@redhat.com>2020-03-15 12:49:42 -0500
commit9ca4b6c6f5105566b19c87f2ecd1bc1d54f791d3 (patch)
tree9f4739e4ec74d4a82107ca0d43a870fc8547a14e /test/e2e
parent8b07ad1138bea8dfa71890c22e811bdd809b4e7e (diff)
downloadpodman-9ca4b6c6f5105566b19c87f2ecd1bc1d54f791d3.tar.gz
podman-9ca4b6c6f5105566b19c87f2ecd1bc1d54f791d3.tar.bz2
podman-9ca4b6c6f5105566b19c87f2ecd1bc1d54f791d3.zip
add os|arch attributes when building
when building images, we can now add the os and arch of the image using overrides from the commandline. the commandline options set sane defaults so we use those as well. Fixes: #5503 Signed-off-by: Brent Baude <bbaude@redhat.com>
Diffstat (limited to 'test/e2e')
-rw-r--r--test/e2e/build_test.go10
1 files changed, 10 insertions, 0 deletions
diff --git a/test/e2e/build_test.go b/test/e2e/build_test.go
index b4e400549..240ef1627 100644
--- a/test/e2e/build_test.go
+++ b/test/e2e/build_test.go
@@ -6,6 +6,7 @@ import (
"io/ioutil"
"os"
"path/filepath"
+ "runtime"
"strings"
. "github.com/containers/libpod/test/utils"
@@ -43,6 +44,15 @@ var _ = Describe("Podman build", func() {
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
+ iid := session.OutputToStringArray()[len(session.OutputToStringArray())-1]
+
+ // Verify that OS and Arch are being set
+ inspect := podmanTest.PodmanNoCache([]string{"inspect", iid})
+ inspect.WaitWithDefaultTimeout()
+ data := inspect.InspectImageJSON()
+ Expect(data[0].Os).To(Equal(runtime.GOOS))
+ Expect(data[0].Architecture).To(Equal(runtime.GOARCH))
+
session = podmanTest.PodmanNoCache([]string{"rmi", "alpine"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))