testing

GoogleContainerTools · Mar 6, 2019 · 3c63ff7 · 3c63ff7
1 parent 2a96d4f
commit 3c63ff7
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 43 deletions.
diff --git a/integration/dockerfiles/Dockerfile_test_copy_same_file_many_times b/integration/dockerfiles/Dockerfile_test_copy_same_file_many_times
@@ -24,26 +24,26 @@ COPY context/foo /foo
 COPY context/foo /foo
 COPY context/foo /foo
 COPY context/foo /foo
-COPY context/foo /foo
-COPY context/foo /foo
-COPY context/foo /foo
-COPY context/foo /foo
-COPY context/foo /foo
-COPY context/foo /foo
-COPY context/foo /foo
-COPY context/foo /foo
-COPY context/foo /foo
-COPY context/foo /foo
-COPY context/foo /foo
-COPY context/foo /foo
-COPY context/foo /foo
-COPY context/foo /foo
-COPY context/foo /foo
-COPY context/foo /foo
-COPY context/foo /foo
-COPY context/foo /foo
-COPY context/foo /foo
-COPY context/foo /foo
-COPY context/foo /foo
-COPY context/foo /foo
-COPY context/foo /foo
+# COPY context/foo /foo
+# COPY context/foo /foo
+# COPY context/foo /foo
+# COPY context/foo /foo
+# COPY context/foo /foo
+# COPY context/foo /foo
+# COPY context/foo /foo
+# COPY context/foo /foo
+# COPY context/foo /foo
+# COPY context/foo /foo
+# COPY context/foo /foo
+# COPY context/foo /foo
+# COPY context/foo /foo
+# COPY context/foo /foo
+# COPY context/foo /foo
+# COPY context/foo /foo
+# COPY context/foo /foo
+# COPY context/foo /foo
+# COPY context/foo /foo
+# COPY context/foo /foo
+# COPY context/foo /foo
+# COPY context/foo /foo
+# COPY context/foo /foo
diff --git a/integration/images.go b/integration/images.go
@@ -219,6 +219,7 @@ func (d *DockerFileBuilder) BuildImage(imageRepo, gcsBucket, dockerfilesPath, do
  )
 
  timer = timing.Start(dockerfile + "_kaniko")
+ fmt.Println(kanikoCmd)
  out, err = RunCommandWithoutTest(kanikoCmd)
  timing.DefaultRun.Stop(timer)
  if err != nil {

diff --git a/integration/integration_test.go b/integration/integration_test.go
@@ -150,26 +150,26 @@ func TestMain(m *testing.M) {
  name: "Building kaniko image",
  command: []string{"docker", "build", "-t", ExecutorImage, "-f", "../deploy/Dockerfile", ".."},
  },
- {
- name: "Building cache warmer image",
- command: []string{"docker", "build", "-t", WarmerImage, "-f", "../deploy/Dockerfile_warmer", ".."},
- },
- {
- name: "Building onbuild base image",
- command: []string{"docker", "build", "-t", config.onbuildBaseImage, "-f", "dockerfiles/Dockerfile_onbuild_base", "."},
- },
- {
- name: "Pushing onbuild base image",
- command: []string{"docker", "push", config.onbuildBaseImage},
- },
- {
- name: "Building hardlink base image",
- command: []string{"docker", "build", "-t", config.hardlinkBaseImage, "-f", "dockerfiles/Dockerfile_hardlink_base", "."},
- },
- {
- name: "Pushing hardlink base image",
- command: []string{"docker", "push", config.hardlinkBaseImage},
- },
+ // {
+ //  name: "Building cache warmer image",
+ //  command: []string{"docker", "build", "-t", WarmerImage, "-f", "../deploy/Dockerfile_warmer", ".."},
+ // },
+ // {
+ //  name: "Building onbuild base image",
+ //  command: []string{"docker", "build", "-t", config.onbuildBaseImage, "-f", "dockerfiles/Dockerfile_onbuild_base", "."},
+ // },
+ // {
+ //  name: "Pushing onbuild base image",
+ //  command: []string{"docker", "push", config.onbuildBaseImage},
+ // },
+ // {
+ //  name: "Building hardlink base image",
+ //  command: []string{"docker", "build", "-t", config.hardlinkBaseImage, "-f", "dockerfiles/Dockerfile_hardlink_base", "."},
+ // },
+ // {
+ //  name: "Pushing hardlink base image",
+ //  command: []string{"docker", "push", config.hardlinkBaseImage},
+ // },
  }
 
  for _, setupCmd := range setupCommands {
@@ -192,6 +192,10 @@ func TestMain(m *testing.M) {
  g := errgroup.Group{}
  for dockerfile := range imageBuilder.FilesBuilt {
  df := dockerfile
+ if df != "Dockerfile_test_copy_same_file_many_times" {
+ fmt.Println("skipping", df)
+ continue
+ }
  g.Go(func() error {
  return imageBuilder.BuildImage(config.imageRepo, config.gcsBucket, dockerfilesPath, df)
  })

diff --git a/vendor/github.com/google/go-containerregistry/pkg/v1/remote/write.go b/vendor/github.com/google/go-containerregistry/pkg/v1/remote/write.go