github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 01:59:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1753 from dave-tucker/ci-fixes

Browse Source 
Fix CI
This commit is contained in:
Justin Cormack 2017-05-02 16:52:46 +01:00 committed by GitHub
commit 3406d33d7f
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -58,9 +58,10 @@ test-hyperkit: $(LINUXKIT) test-initrd.img test-bzImage test-cmdline
$(call check_test_log, test.log) $(call check_test_log, test.log)
.PHONY: test-gcp .PHONY: test-gcp
test-gcp: export CLOUDSDK_IMAGE_NAME?=test
test-gcp: $(LINUXKIT) test.img.tar.gz test-gcp: $(LINUXKIT) test.img.tar.gz
$(LINUXKIT) push gcp test.img.tar.gz $(LINUXKIT) push gcp test.img.tar.gz
$(LINUXKIT) run gcp test | tee test-gcp.log $(LINUXKIT) run gcp $(CLOUDSDK_IMAGE_NAME) | tee test-gcp.log
$(call check_test_log, test-gcp.log) $(call check_test_log, test-gcp.log)
.PHONY: test .PHONY: test
@ -72,9 +73,10 @@ test-ltp.img.tar.gz: $(MOBY) test/ltp/test-ltp.yml
$(MOBY) build --pull test/ltp/test-ltp.yml $(MOBY) build --pull test/ltp/test-ltp.yml
.PHONY: test-ltp .PHONY: test-ltp
test-ltp: export CLOUDSDK_IMAGE_NAME?=test-ltp
test-ltp: $(LINUXKIT) test-ltp.img.tar.gz test-ltp: $(LINUXKIT) test-ltp.img.tar.gz
$(LINUXKIT) push gcp test-ltp.img.tar.gz $(LINUXKIT) push gcp test-ltp.img.tar.gz
$(LINUXKIT) run gcp -skip-cleanup -machine n1-highcpu-4 test-ltp | tee test-ltp.log $(LINUXKIT) run gcp -skip-cleanup -machine n1-highcpu-4 $(CLOUDSDK_IMAGE_NAME) | tee test-ltp.log
$(call check_test_log, test-ltp.log) $(call check_test_log, test-ltp.log)
.PHONY: ci ci-tag ci-pr .PHONY: ci ci-tag ci-pr

23
src/cmd/linuxkit/push_gcp.go
View File

@ -5,7 +5,6 @@ import (
"fmt" "fmt"
"os" "os"
"path/filepath" "path/filepath"
"strings"
log "github.com/Sirupsen/logrus" log "github.com/Sirupsen/logrus"
) )
@ -25,7 +24,7 @@ func pushGcp(args []string) {
bucketFlag := gcpCmd.String("bucket", "", "GS Bucket to upload to. *Required*") bucketFlag := gcpCmd.String("bucket", "", "GS Bucket to upload to. *Required*")
publicFlag := gcpCmd.Bool("public", false, "Select if file on GS should be public. *Optional*") publicFlag := gcpCmd.Bool("public", false, "Select if file on GS should be public. *Optional*")
familyFlag := gcpCmd.String("family", "", "GCP Image Family. A group of images where the family name points to the most recent image. *Optional*") familyFlag := gcpCmd.String("family", "", "GCP Image Family. A group of images where the family name points to the most recent image. *Optional*")
nameFlag := gcpCmd.String("img-name", "", "Overrides the Name used to identify the file in Google Storage and Image. Defaults to [name]") nameFlag := gcpCmd.String("img-name", "", "Overrides the Name used to identify the file in Google Storage and Image. Defaults to [name] with the '.img.tar.gz' suffix removed")
if err := gcpCmd.Parse(args); err != nil { if err := gcpCmd.Parse(args); err != nil {
log.Fatal("Unable to parse args") log.Fatal("Unable to parse args")
@ -37,7 +36,8 @@ func pushGcp(args []string) {
gcpCmd.Usage() gcpCmd.Usage()
os.Exit(1) os.Exit(1)
} }
prefix := remArgs[0] src := remArgs[0]
suffix := ".img.tar.gz"
keys := getStringValue(keysVar, *keysFlag, "") keys := getStringValue(keysVar, *keysFlag, "")
project := getStringValue(projectVar, *projectFlag, "") project := getStringValue(projectVar, *projectFlag, "")
@ -51,24 +51,19 @@ func pushGcp(args []string) {
log.Fatalf("Unable to connect to GCP") log.Fatalf("Unable to connect to GCP")
} }
suffix := ".img.tar.gz" if name == "" {
src := prefix name = src[:len(src)-len(suffix)]
if strings.HasSuffix(prefix, suffix) {
prefix = prefix[:len(prefix)-len(suffix)]
} else {
src = prefix + suffix
}
if name != "" {
prefix = name
} }
if bucket == "" { if bucket == "" {
log.Fatalf("No bucket specified. Please provide one using the -bucket flag") log.Fatalf("No bucket specified. Please provide one using the -bucket flag")
} }
err = client.UploadFile(src, prefix+suffix, bucket, public)
err = client.UploadFile(src, name+suffix, bucket, public)
if err != nil { if err != nil {
log.Fatalf("Error copying to Google Storage: %v", err) log.Fatalf("Error copying to Google Storage: %v", err)
} }
err = client.CreateImage(prefix, "https://storage.googleapis.com/"+bucket+"/"+prefix+".img.tar.gz", family, true) err = client.CreateImage(name, "https://storage.googleapis.com/"+bucket+"/"+name+suffix, family, true)
if err != nil { if err != nil {
log.Fatalf("Error creating Google Compute Image: %v", err) log.Fatalf("Error creating Google Compute Image: %v", err)
} }