From 0f5387960e01447630fbc14dde7f4874a2044d86 Mon Sep 17 00:00:00 2001
From: Tejal Desai <tejal29@gmail.com>
Date: Sat, 6 Jun 2020 00:14:11 -0700
Subject: [PATCH] minimal changes

---
 Makefile                                 | 6 +++---
 integration/benchmark_fs/cloudbuild.yaml | 4 ++--
 integration/benchmark_test.go            | 2 +-
 integration/images.go                    | 1 -
 pkg/snapshot/snapshot.go                 | 2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 3296e6bd1..0966fe693 100644
--- a/Makefile
+++ b/Makefile
@@ -88,9 +88,9 @@ integration-test-misc:
 
 .PHONY: images
 images:
-	docker build ${BUILD_ARG} --build-arg=GOARCH=$(GOARCH) -t $(REGISTRY)/executor:perf-latest -f deploy/Dockerfile .
-	#docker build ${BUILD_ARG} --build-arg=GOARCH=$(GOARCH) -t $(REGISTRY)/executor:debug -f deploy/Dockerfile_debug .
-	#docker build ${BUILD_ARG} --build-arg=GOARCH=$(GOARCH) -t $(REGISTRY)/warmer:latest -f deploy/Dockerfile_warmer .
+	docker build ${BUILD_ARG} --build-arg=GOARCH=$(GOARCH) -t $(REGISTRY)/executor:latest -f deploy/Dockerfile .
+	docker build ${BUILD_ARG} --build-arg=GOARCH=$(GOARCH) -t $(REGISTRY)/executor:debug -f deploy/Dockerfile_debug .
+	docker build ${BUILD_ARG} --build-arg=GOARCH=$(GOARCH) -t $(REGISTRY)/warmer:latest -f deploy/Dockerfile_warmer .
 
 .PHONY: push
 push:
diff --git a/integration/benchmark_fs/cloudbuild.yaml b/integration/benchmark_fs/cloudbuild.yaml
index e8bc93f3e..829fb946b 100644
--- a/integration/benchmark_fs/cloudbuild.yaml
+++ b/integration/benchmark_fs/cloudbuild.yaml
@@ -1,9 +1,9 @@
 steps:
-- name: 'gcr.io/kaniko-project/executor:perf-latest'
+- name: 'gcr.io/kaniko-project/executor:latest'
   args:
   - --build-arg=NUM=${_COUNT}
   - --no-push
-  - --use-new-run=true
+  - --snapshotMode=redo
   env:
   - 'BENCHMARK_FILE=gs://$PROJECT_ID/gcb/benchmark_file_${_COUNT}'
   timeout: 2400s
diff --git a/integration/benchmark_test.go b/integration/benchmark_test.go
index af3f79eab..f7364114d 100644
--- a/integration/benchmark_test.go
+++ b/integration/benchmark_test.go
@@ -125,7 +125,7 @@ func TestSnapshotBenchmarkGcloud(t *testing.T) {
 	}
 	contextDir := filepath.Join(cwd, "benchmark_fs")
 
-	nums := []int{10000} //, 50000, 100000, 200000, 300000, 500000, 700000}
+	nums := []int{10000, 50000, 100000, 200000, 300000, 500000, 700000}
 
 	var wg sync.WaitGroup
 	fmt.Println("Number of Files,Total Build Time,Walking Filesystem, Resolving Files")
diff --git a/integration/images.go b/integration/images.go
index 42560c82d..c221d6504 100644
--- a/integration/images.go
+++ b/integration/images.go
@@ -76,7 +76,6 @@ var additionalDockerFlagsMap = map[string][]string{
 var additionalKanikoFlagsMap = map[string][]string{
 	"Dockerfile_test_add":        {"--single-snapshot"},
 	"Dockerfile_test_run_new":    {"--use-new-run=true"},
-	"Dockerfile_test_run":        {"-v=debug"},
 	"Dockerfile_test_scratch":    {"--single-snapshot"},
 	"Dockerfile_test_maintainer": {"--single-snapshot"},
 	"Dockerfile_test_target":     {"--target=second"},
diff --git a/pkg/snapshot/snapshot.go b/pkg/snapshot/snapshot.go
index c9046514e..f61dcafea 100644
--- a/pkg/snapshot/snapshot.go
+++ b/pkg/snapshot/snapshot.go
@@ -27,8 +27,8 @@ import (
 	"github.com/GoogleContainerTools/kaniko/pkg/config"
 	"github.com/GoogleContainerTools/kaniko/pkg/filesystem"
 	"github.com/GoogleContainerTools/kaniko/pkg/timing"
-
 	"github.com/GoogleContainerTools/kaniko/pkg/util"
+
 	"github.com/sirupsen/logrus"
 )