public_git
/
kaniko
mirror of https://github.com/GoogleContainerTools/kaniko
1
0
Fork 0
Code Issues Releases Wiki Activity

Actually fix the paths for benchmark uploading during integration test runs. (#543)

This commit is contained in:
dlorenc 2019-01-28 12:52:27 -06:00 committed by GitHub
parent 1ffae47fdd
commit 4c960709df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
integration/gcs.go
View File

@ -55,9 +55,10 @@ func UploadFileToBucket(gcsBucket string, filePath string, gcsPath string) (stri
cmd := exec.Command("gsutil", "cp", filePath, dst)
out, err := RunCommandWithoutTest(cmd)
if err != nil {
log.Printf("Error uploading file %s to GCS at %s: %s", filePath, dst, err)
log.Println(string(out))
return "", fmt.Errorf("Failed to copy tarball to GCS bucket %s: %s", gcsBucket, err)
}
log.Println(string(out))
return dst, nil
}

2
integration/images.go
View File

@ -196,7 +196,7 @@ func (d *DockerFileBuilder) BuildImage(imageRepo, gcsBucket, dockerfilesPath, do
}
if b, err := strconv.ParseBool(os.Getenv("BENCHMARK")); err == nil && b {
benchmarkEnv = "BENCHMARK_FILE=/kaniko/benchmarks/" + dockerfile
benchmarkFile := path.Join("benchmarks", dockerfile)
benchmarkFile := path.Join(benchmarkDir, dockerfile)
dst := path.Join("benchmarks/run_"+time.Now().Format("2006-01-02-15:04:05"), dockerfile)
defer UploadFileToBucket(gcsBucket, benchmarkFile, dst)
}