diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-03-30 07:51:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-30 07:51:04 -0400 |
| commit | ff8834f0232f128b781ec23d66a5676da0670847 (patch) | |
| tree | f1eb220cec7cabace6b348a6c1eedede85056c95 | |
| parent | d0d805ba1bd19025080ea47bb07e653505fe85e2 (diff) | |
| parent | 1ffcc4a8883b099e379a60c367e8a662c0e2c782 (diff) | |
| download | podman-ff8834f0232f128b781ec23d66a5676da0670847.tar.gz podman-ff8834f0232f128b781ec23d66a5676da0670847.tar.bz2 podman-ff8834f0232f128b781ec23d66a5676da0670847.zip | |
Merge pull request #13705 from jwmatthews/issue13690
Add 'Os' to be queried via 'version' output
| -rw-r--r-- | libpod/define/version.go | 2 | ||||
| -rw-r--r-- | pkg/bindings/system/system.go | 1 | ||||
| -rw-r--r-- | test/e2e/version_test.go | 8 |
3 files changed, 11 insertions, 0 deletions
diff --git a/libpod/define/version.go b/libpod/define/version.go index 039b0ff27..2c17e6e92 100644 --- a/libpod/define/version.go +++ b/libpod/define/version.go @@ -27,6 +27,7 @@ type Version struct { BuiltTime string Built int64 OsArch string + Os string } // GetVersion returns a VersionOutput struct for API and podman @@ -49,5 +50,6 @@ func GetVersion() (Version, error) { BuiltTime: time.Unix(buildTime, 0).Format(time.ANSIC), Built: buildTime, OsArch: runtime.GOOS + "/" + runtime.GOARCH, + Os: runtime.GOOS, }, nil } diff --git a/pkg/bindings/system/system.go b/pkg/bindings/system/system.go index 1eb90ab54..5ef78e444 100644 --- a/pkg/bindings/system/system.go +++ b/pkg/bindings/system/system.go @@ -120,6 +120,7 @@ func Version(ctx context.Context, options *VersionOptions) (*entities.SystemVers BuiltTime: time.Unix(b.Unix(), 0).Format(time.ANSIC), Built: b.Unix(), OsArch: fmt.Sprintf("%s/%s", component.Os, component.Arch), + Os: component.Os, } for _, c := range component.Components { diff --git a/test/e2e/version_test.go b/test/e2e/version_test.go index 6f93beff6..a30db80eb 100644 --- a/test/e2e/version_test.go +++ b/test/e2e/version_test.go @@ -87,10 +87,18 @@ var _ = Describe("Podman version", func() { session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) + session = podmanTest.Podman([]string{"version", "--format", "{{ .Client.Os }}"}) + session.WaitWithDefaultTimeout() + Expect(session).Should(Exit(0)) + session = podmanTest.Podman([]string{"version", "--format", "{{ .Server.Version }}"}) session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) + session = podmanTest.Podman([]string{"version", "--format", "{{ .Server.Os }}"}) + session.WaitWithDefaultTimeout() + Expect(session).Should(Exit(0)) + session = podmanTest.Podman([]string{"version", "--format", "{{ .Version }}"}) session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) |