chore: executor: DoCacheProbe: remove fake verbiage #15
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
johnstcn
commented
Jun 12, 2024
| @@ -37,8 +41,7 @@ func TestDoCacheProbe(t *testing.T) { | |||
| COPY foo/bar.txt copied/ | |||
| ` | |||
| os.WriteFile(filepath.Join(testDir, "workspace", "Dockerfile"), []byte(dockerFile), 0755) | |||
| // Populate the cache by doing an initial build | |||
| cacheDir := t.TempDir() | |||
| regCache := setupCacheRegistry(t) | |||
There was a problem hiding this comment.
review: I noticed the oci:/ repo was not actually pushing to cacheDir so I elected to stand up a temporary registry instad.
dannykopping
approved these changes
Jun 12, 2024
Comment on lines
+127
to
+164
| t.Run("MultiStage", func(t *testing.T) { | ||
| t.Skip("TODO: https://github.com/coder/envbuilder/issues/230") | ||
| testDir, fn := setupMultistageTests(t) | ||
| defer fn() | ||
| dockerFile := ` | ||
| FROM scratch as first | ||
| COPY foo/bam.txt copied/ | ||
| ENV test test | ||
|
|
||
| From scratch as second | ||
| COPY --from=first copied/bam.txt output/bam.txt` | ||
| os.WriteFile(filepath.Join(testDir, "workspace", "Dockerfile"), []byte(dockerFile), 0755) | ||
| regCache := setupCacheRegistry(t) | ||
| opts := &config.KanikoOptions{ | ||
| DockerfilePath: filepath.Join(testDir, "workspace", "Dockerfile"), | ||
| SrcContext: filepath.Join(testDir, "workspace"), | ||
| SnapshotMode: constants.SnapshotModeRedo, | ||
| Cache: true, | ||
| CacheOptions: config.CacheOptions{ | ||
| CacheTTL: time.Hour, | ||
| }, | ||
| CacheCopyLayers: true, | ||
| CacheRunLayers: true, | ||
| CacheRepo: regCache + "/test", | ||
| } | ||
| _, err := DoBuild(opts) | ||
| testutil.CheckNoError(t, err) | ||
| os.WriteFile(filepath.Join(testDir, "workspace", "Dockerfile"), []byte(dockerFile), 0755) | ||
| opts.Reproducible = true | ||
| _, err = DoCacheProbe(opts) | ||
| testutil.CheckNoError(t, err) | ||
| // Check Image has one layer bam.txt | ||
| files, err := readDirectory(filepath.Join(testDir, "output")) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| testutil.CheckDeepEqual(t, 1, len(files)) | ||
| testutil.CheckDeepEqual(t, files[0].Name(), "bam.txt") |
There was a problem hiding this comment.
Is this germane to this set of changes?
There was a problem hiding this comment.
No, it's just a drive-by. I figured I may as well add the test for later since I had it hanging around unstaged.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
FakeExecuteCommandtoCachedExecuteCommand