Add integration test

GoogleContainerTools · Dec 10, 2020 · 6066c03 · 6066c03
1 parent cd9f19e
commit 6066c03
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/integration/images.go b/integration/images.go
@@ -308,7 +308,7 @@ func populateVolumeCache() error {
 }
 
 // buildCachedImages builds the images for testing caching via kaniko where version is the nth time this image has been built
-func (d *DockerFileBuilder) buildCachedImages(config *integrationTestConfig, cacheRepo, dockerfilesPath string, version int) error {
+func (d *DockerFileBuilder) buildCachedImages(config *integrationTestConfig, cacheRepo, dockerfilesPath string, version int, args []string) error {
 	imageRepo, serviceAccount := config.imageRepo, config.serviceAccount
 	_, ex, _, _ := runtime.Caller(0)
 	cwd := filepath.Dir(ex)
@@ -334,6 +334,9 @@ func (d *DockerFileBuilder) buildCachedImages(config *integrationTestConfig, cac
 			cacheFlag,
 			"--cache-repo", cacheRepo,
 			"--cache-dir", cacheDir)
+		for _, v := range args {
+			dockerRunFlags = append(dockerRunFlags, v)
+		}
 		kanikoCmd := exec.Command("docker", dockerRunFlags...)
 
 		_, err := RunCommandWithoutTest(kanikoCmd)

diff --git a/integration/integration_test.go b/integration/integration_test.go
@@ -464,17 +464,21 @@ func buildImage(t *testing.T, dockerfile string, imageBuilder *DockerFileBuilder
 func TestCache(t *testing.T) {
 	populateVolumeCache()
 	for dockerfile := range imageBuilder.TestCacheDockerfiles {
+		args := []string{}
+		if dockerfile == "Dockerfile_test_cache_copy" {
+			args = append(args, "--cache-copy-layers=true")
+		}
 		t.Run("test_cache_"+dockerfile, func(t *testing.T) {
 			dockerfile := dockerfile
 			t.Parallel()
 
 			cache := filepath.Join(config.imageRepo, "cache", fmt.Sprintf("%v", time.Now().UnixNano()))
 			// Build the initial image which will cache layers
-			if err := imageBuilder.buildCachedImages(config, cache, dockerfilesPath, 0); err != nil {
+			if err := imageBuilder.buildCachedImages(config, cache, dockerfilesPath, 0, args); err != nil {
 				t.Fatalf("error building cached image for the first time: %v", err)
 			}
 			// Build the second image which should pull from the cache
-			if err := imageBuilder.buildCachedImages(config, cache, dockerfilesPath, 1); err != nil {
+			if err := imageBuilder.buildCachedImages(config, cache, dockerfilesPath, 1, args); err != nil {
 				t.Fatalf("error building cached image for the first time: %v", err)
 			}
 			// Make sure both images are the same

diff --git a/pkg/executor/build_test.go b/pkg/executor/build_test.go
@@ -813,6 +813,13 @@ func Test_stageBuilder_build(t *testing.T) {
 			return testcase{
 				description: "copy command cache enabled and key in cache",
 				opts:        &config.KanikoOptions{Cache: true, CacheCopyLayers: true},
+				image: fakeImage{
+					ImageLayers: []v1.Layer{
+						fakeLayer{
+							TarContent: tarContent,
+						},
+					},
+				},
 				layerCache: &fakeLayerCache{
 					retrieve: true,
 					img: fakeImage{