opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-17 15:08:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6345 from QiWang19/mani-push-test

Browse Source 
remote manifest test
This commit is contained in:
OpenShift Merge Robot
2020-05-22 15:47:33 +02:00
committed by GitHub
parent 8fe0e294b5 f7dd915acc
commit cf5d33807f
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/api/handlers/libpod/manifests.go
View File

@ -151,6 +151,7 @@ func ManifestPush(w http.ResponseWriter, r *http.Request) {
} }
sc := image.GetSystemContext(rtc.Engine.SignaturePolicyPath, "", false) sc := image.GetSystemContext(rtc.Engine.SignaturePolicyPath, "", false)
opts := manifests.PushOptions{ opts := manifests.PushOptions{
Store: runtime.GetStore(),
ImageListSelection: copy2.CopySpecificImages, ImageListSelection: copy2.CopySpecificImages,
SystemContext: sc, SystemContext: sc,
} }

6
pkg/bindings/manifests/manifests.go
View File

@ -112,17 +112,17 @@ func Push(ctx context.Context, name string, destination *string, all *bool) (str
params := url.Values{} params := url.Values{}
params.Set("image", name) params.Set("image", name)
if destination != nil { if destination != nil {
dest = name dest = *destination
} }
params.Set("destination", dest) params.Set("destination", dest)
if all != nil { if all != nil {
params.Set("all", strconv.FormatBool(*all)) params.Set("all", strconv.FormatBool(*all))
} }
response, err := conn.DoRequest(nil, http.MethodPost, "/manifests/%s/push", params, name) _, err = conn.DoRequest(nil, http.MethodPost, "/manifests/%s/push", params, name)
if err != nil { if err != nil {
return "", err return "", err
} }
return idr.ID, response.Process(&idr) return idr.ID, err
} }
// There is NO annotate endpoint. this binding could never work // There is NO annotate endpoint. this binding could never work

4
test/e2e/manifest_test.go
View File

@ -155,7 +155,6 @@ var _ = Describe("Podman manifest", func() {
}) })
It("podman manifest push", func() { It("podman manifest push", func() {
Skip(v2remotefail)
session := podmanTest.Podman([]string{"manifest", "create", "foo"}) session := podmanTest.Podman([]string{"manifest", "create", "foo"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))
@ -185,7 +184,8 @@ var _ = Describe("Podman manifest", func() {
}) })
It("podman manifest push purge", func() { It("podman manifest push purge", func() {
Skip(v2remotefail) // remote does not support --purge
SkipIfRemote()
session := podmanTest.Podman([]string{"manifest", "create", "foo"}) session := podmanTest.Podman([]string{"manifest", "create", "foo"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))