From 48421f1126b5bc7067535d90559401c47f13670d Mon Sep 17 00:00:00 2001 From: Tejal Desai Date: Tue, 26 May 2020 00:16:03 -0700 Subject: [PATCH] more fixes --- integration/benchmark_test.go | 13 +++++++++---- integration/images.go | 2 -- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/integration/benchmark_test.go b/integration/benchmark_test.go index a5e1d08be..2b236fa54 100644 --- a/integration/benchmark_test.go +++ b/integration/benchmark_test.go @@ -47,21 +47,26 @@ func TestSnapshotBenchmark(t *testing.T) { for _, num := range nums { t.Run(fmt.Sprintf("test_benchmark_%d", num), func(t *testing.T) { wg.Add(1) - go func(num int) { + var err error + go func(num int, err error) { dockerfile := "Dockerfile_fs_benchmark" kanikoImage := fmt.Sprintf("%s_%d", GetKanikoImage(config.imageRepo, dockerfile), num) buildArgs := []string{"--build-arg", fmt.Sprintf("NUM=%d", num)} - benchmarkDir, err := buildKanikoImage("", dockerfile, + var benchmarkDir string + benchmarkDir, err = buildKanikoImage("", dockerfile, buildArgs, []string{}, kanikoImage, contextDir, config.gcsBucket, config.serviceAccount, false) if err != nil { - t.Errorf("could not run benchmark results for num %d", num) + return } r := newResult(t, filepath.Join(benchmarkDir, dockerfile)) timeMap.Store(num, r) wg.Done() defer os.Remove(benchmarkDir) - }(num) + }(num, err) + if err != nil { + t.Errorf("could not run benchmark results for num %d due to %s", num, err) + } }) } wg.Wait() diff --git a/integration/images.go b/integration/images.go index 0d2d63e70..476012f1e 100644 --- a/integration/images.go +++ b/integration/images.go @@ -440,9 +440,7 @@ func buildKanikoImage( kanikoCmd := exec.Command("docker", dockerRunFlags...) - timer := timing.Start(dockerfile + "_kaniko") out, err := RunCommandWithoutTest(kanikoCmd) - timing.DefaultRun.Stop(timer) if err != nil { return "", fmt.Errorf("Failed to build image %s with kaniko command \"%s\": %s %s", kanikoImage, kanikoCmd.Args, err, string(out)) }