read image pull response to save image to local cache #2282
Conversation
Signed-off-by: Yingrong Zhao <yingrong.zhao@gmail.com>
Signed-off-by: Yingrong Zhao <yingrong.zhao@gmail.com>
Signed-off-by: Yingrong Zhao <yingrong.zhao@gmail.com>
Signed-off-by: Yingrong Zhao <yingrong.zhao@gmail.com>
tests/smoke/hello_test.go
Outdated
| // Set up a fresh docker environment | ||
| mgx.Must(shx.RunV("docker", "system", "prune", "--all", "-f")) | ||
| // make sure the referenced image is not in local image cache | ||
| mgx.Must(shx.RunV("docker", "rmi", "carolynvs/whalesayd")) |
There was a problem hiding this comment.
If the image is not in the cache, this line will fail. In cases where you just need to do cleanup before a test, I suggest not checking the error message (kind of like calling rmdir and then ignoring the error if the directory doesn't exist).
pkg/porter/build_integration_test.go
Outdated
| @@ -110,7 +110,7 @@ func TestPorter_Build_ChecksManifestSchemaVersion(t *testing.T) { | |||
| defer p.Close() | |||
|
|
|||
| // Make a bundle with the specified schemaVersion | |||
| p.TestConfig.TestContext.AddTestDirectoryFromRoot("tests/testdata/mybuns", "/") | |||
| p.TestConfig.TestContext.AddTestDirectoryFromRoot("tests/testdata/mydb", "/") | |||
There was a problem hiding this comment.
Can you help me understand why this was changed to user a different bundle? If the test worked before with mybuns, I would expect it to still work with mybuns with a referenced image. I am concerned that changing the test bundle may be hiding a regression or problem in Porter.
Signed-off-by: Yingrong Zhao <yingrong.zhao@gmail.com>
Signed-off-by: Yingrong Zhao <yingrong.zhao@gmail.com>
Signed-off-by: Yingrong Zhao <yingrong.zhao@gmail.com>
|
/azp run porter-integration |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Signed-off-by: Yingrong Zhao <yingrong.zhao@gmail.com>
| @@ -65,5 +76,13 @@ func (t *TestRegistry) PullImage(ctx context.Context, image string) error { | |||
| if t.MockPullImage != nil { | |||
| return t.MockPullImage(ctx, image) | |||
| } | |||
| sum, err := NewImageSummary(image, types.ImageInspect{ | |||
| ID: cnab.NewULID(), | |||
| RepoDigests: []string{fmt.Sprintf("%s@sha256:75c495e5ce9c428d482973d72e3ce9925e1db304a97946c9aa0b540d7537e041", image)}, | |||
There was a problem hiding this comment.
I assume that this digest here is specifically the one that makes your test work for this PR. If we pulled multiple images using this newly added cache, each image would get the same digest, correct?
You don't need to change this, just something to keep in mind if we end up needing to use this TestRegistry for other tests. Hopefully we can move away from this type of mocking when we redo the integration tests to use the tester framework.
What does this change
Previously, we assumed that by pulling an image, the image is automatically cached by docker. However, it seems that the caching only happens when the response from pull is read.
This PR fixes above issue by reading the full response. I also changed the hello smoke test to always run in a fresh local docker environment to make sure this scenario is tested.
What issue does it fix
Closes #2280
Notes for the reviewer
Put any questions or notes for the reviewer here.
Checklist
Reviewer Checklist