diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-03-31 18:19:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-31 18:19:53 +0200 |
| commit | 78b4dcf4768e86ad02cc7b84d95ad66282678742 (patch) | |
| tree | 3ca8883436abd1fdd9695ebf2828eabdf5327628 | |
| parent | 24a0262bc0573df5ef68b6c0779e5a6d0637dd2a (diff) | |
| parent | ab7c83392b8c3abb596a2b3701c5452f5e53671f (diff) | |
| download | podman-78b4dcf4768e86ad02cc7b84d95ad66282678742.tar.gz podman-78b4dcf4768e86ad02cc7b84d95ad66282678742.tar.bz2 podman-78b4dcf4768e86ad02cc7b84d95ad66282678742.zip | |
Merge pull request #9903 from rhatdan/rusage
Fix handling of remote --log-rusage param
| -rw-r--r-- | pkg/api/handlers/compat/images_build.go | 1 | ||||
| -rw-r--r-- | test/e2e/build_test.go | 17 |
2 files changed, 18 insertions, 0 deletions
diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go index fd310711f..6dac789d6 100644 --- a/pkg/api/handlers/compat/images_build.go +++ b/pkg/api/handlers/compat/images_build.go @@ -349,6 +349,7 @@ func BuildImage(w http.ResponseWriter, r *http.Request) { Jobs: &jobs, Labels: labels, Layers: query.Layers, + LogRusage: query.LogRusage, Manifest: query.Manifest, MaxPullPushRetries: 3, NamespaceOptions: nsoptions, diff --git a/test/e2e/build_test.go b/test/e2e/build_test.go index 95ed23313..4f337116e 100644 --- a/test/e2e/build_test.go +++ b/test/e2e/build_test.go @@ -549,4 +549,21 @@ RUN echo hello`, ALPINE) inspect.WaitWithDefaultTimeout() Expect(inspect.OutputToString()).To(Equal("1970-01-01 00:00:00 +0000 UTC")) }) + + It("podman build --log-rusage", func() { + targetPath, err := CreateTempDirInTempDir() + Expect(err).To(BeNil()) + + containerFile := filepath.Join(targetPath, "Containerfile") + content := `FROM scratch` + + Expect(ioutil.WriteFile(containerFile, []byte(content), 0755)).To(BeNil()) + + session := podmanTest.Podman([]string{"build", "--log-rusage", "--pull-never", targetPath}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + Expect(session.OutputToString()).To(ContainSubstring("(system)")) + Expect(session.OutputToString()).To(ContainSubstring("(user)")) + Expect(session.OutputToString()).To(ContainSubstring("(elapsed)")) + }) }) |