github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 17:26:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1653 from dave-tucker/ltp-ci

Browse Source 
Changes required to run LTP tests in CI
This commit is contained in:
Riyaz Faizullabhoy 2017-04-23 13:22:40 -07:00 committed by GitHub
commit c1a5c412fb
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/cmd/moby/run_gcp.go
View File

@ -45,6 +45,7 @@ func runGcp(args []string) {
familyFlag := gcpCmd.String("family", "", "GCP Image Family. A group of images where the family name points to the most recent image. *Optional* when 'prefix' is a filename")
nameFlag := gcpCmd.String("img-name", "", "Overrides the Name used to identify the file in Google Storage, Image and Instance. Defaults to [name]")
diskSizeFlag := gcpCmd.Int("disk-size", 0, "Size of system disk in GB")
skipCleanup := gcpCmd.Bool("skip-cleanup", false, "Don't remove images or VMs")
if err := gcpCmd.Parse(args); err != nil {
log.Fatal("Unable to parse args")
@ -107,7 +108,9 @@ func runGcp(args []string) {
log.Fatal(err)
}
if err = client.DeleteInstance(name, zone, true); err != nil {
log.Fatal(err)
if !*skipCleanup {
if err = client.DeleteInstance(name, zone, true); err != nil {
log.Fatal(err)
}
}
}