Skip to content

Commit f8ef1eb

Browse files
committed
testutil: fix call order in already-exists check
ProviderFromRef call is already making the HEAD request to upstream registry to get digest. Avoid doing that if image already exists in mirror anyway. Signed-off-by: Tonis Tiigi <[email protected]>
1 parent 511471b commit f8ef1eb

File tree

1 file changed

+5
-6
lines changed
  • util/testutil/integration

1 file changed

+5
-6
lines changed

util/testutil/integration/run.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,11 @@ func copyImagesLocal(t *testing.T, host string, images map[string]string) error
236236
}
237237
localImageCache[host][to] = struct{}{}
238238

239+
// already exists check
240+
if _, _, err := docker.NewResolver(docker.ResolverOptions{}).Resolve(context.TODO(), host+"/"+to); err == nil {
241+
continue
242+
}
243+
239244
var desc ocispecs.Descriptor
240245
var provider content.Provider
241246
var err error
@@ -255,12 +260,6 @@ func copyImagesLocal(t *testing.T, host string, images map[string]string) error
255260
}
256261
}
257262

258-
// already exists check
259-
_, _, err = docker.NewResolver(docker.ResolverOptions{}).Resolve(context.TODO(), host+"/"+to)
260-
if err == nil {
261-
continue
262-
}
263-
264263
ingester, err := contentutil.IngesterFromRef(host + "/" + to)
265264
if err != nil {
266265
return err

0 commit comments

Comments
 (0)