Testing commit

Author: davidz627

Gopkg.lock

@@ -24,6 +24,7 @@ import (
 	"math/rand"
 	"net/http"
 	"os"
+	"os/exec"
 	"strings"
 	"sync"
 	"time"
@@ -36,6 +37,7 @@ import (
 
 	"github.com/golang/glog"
 	"golang.org/x/oauth2/google"
+	"google.golang.org/api/cloudresourcemanager/v1"
 	compute "google.golang.org/api/compute/v0.beta"
 )
 
@@ -110,7 +112,9 @@ func main() {
 		glog.Fatal("You must specify a service account to create an instance under that has at least OWNERS permissions on disks and READER on instances.")
 	}
 
-	if *project == "" {
+	// TODO: OVERWRITE PROJECT FOR TEST PURPOSES ONLY
+	if true /* *project == "" */ {
+		// TODO: Check if we're on CI and just overwrite project anyway if we are.
 		// Try get a Boskos Project
 		glog.Infof("--project is missing, trying to fetch a project from boskos.\n" +
 			"(for local runs please set --project to your dev project)")
@@ -126,6 +130,8 @@ func main() {
 
 		*project = p.GetName()
 
+		glog.Infof("Fetched project from Boskos: %v", *project)
+
 		go func(c *client.Client, proj string) {
 			for range time.Tick(time.Minute * 5) {
 				if err := c.UpdateOne(p.Name, "busy", nil); err != nil {
@@ -300,7 +306,8 @@ func createInstance(serviceAccount string) (string, error) {
 	myuuid := string(uuid.NewUUID())
 	glog.V(2).Infof("Creating instance: %v", name)
 
-	imageURL := "https://www.googleapis.com/compute/v1/projects/ml-images/global/images/debian-9-tf-1-9-v20180626"
+	// TODO: Pick a better boot disk image
+	imageURL := "projects/ml-images/global/images/family/tf-1-9"
 	i := &compute.Instance{
 		Name:        name,
 		MachineType: machineType(""),
@@ -326,18 +333,49 @@ func createInstance(serviceAccount string) (string, error) {
 		},
 	}
 
-	if serviceAccount != "" {
-		saObj := &compute.ServiceAccount{
-			Email:  serviceAccount,
-			Scopes: []string{"https://www.googleapis.com/auth/cloud-platform"},
+	// TODO: OVERWRITE SERVICEACCOUNT FOR TEST PURPOSES ONLY
+	if true /* serviceAccount == "" */ {
+		// TODO: Check if on CI
+		// Assume we are on CI and grab service account from gcloud
+		glog.Infof("Running on CI, getting gcloud account")
+		cmd := exec.Command("gcloud", "config", "get-value", "account")
+		out, err := cmd.Output()
+
+		if err != nil {
+			return "", fmt.Errorf("Failed to get current gclou account: %v", err)
 		}
-		i.ServiceAccounts = []*compute.ServiceAccount{saObj}
+
+		serviceAccount = strings.TrimSpace(string(out))
+		glog.Infof("Got service account: %v", serviceAccount)
+
 	}
 
-	var err error
+	c, err := google.DefaultClient(context.TODO(), cloudresourcemanager.CloudPlatformScope)
+	if err != nil {
+		glog.Fatal(err)
+	}
+
+	cloudresourcemanagerService, err := cloudresourcemanager.New(c)
+	if err != nil {
+		glog.Fatal(err)
+	}
+
+	resp, err := cloudresourcemanagerService.Projects.Get(*project).Do()
+	if err != nil {
+		glog.Fatal(err)
+	}
+
+	// TODO: Somehow need to get that one default Compute Engine service account
+	// [PROJECT_NUMBER][email protected]
+	saObj := &compute.ServiceAccount{
+		Email:  fmt.Sprintf("%[email protected]", resp.ProjectNumber),
+		Scopes: []string{"https://www.googleapis.com/auth/cloud-platform"},
+	}
+	i.ServiceAccounts = []*compute.ServiceAccount{saObj}
+
 	if gotInstance, err := computeService.Instances.Get(*project, *zone, i.Name).Do(); err != nil {
 		op, err := computeService.Instances.Insert(*project, *zone, i).Do()
-		glog.V(4).Infof("Inserted instance in project %v, zone %v: %#v", *project, *zone, i)
+		glog.Infof("Inserted instance in project %v, zone %v: %#v", *project, *zone, i)
 		if err != nil {
 			ret := fmt.Sprintf("could not create instance %s: API error: %v", name, err)
 			if op != nil {
@@ -348,7 +386,7 @@ func createInstance(serviceAccount string) (string, error) {
 			return "", fmt.Errorf("could not create instance %s: %+v", name, op.Error)
 		}
 	} else {
-		glog.V(4).Infof("Compute service GOT instance %v, skipping instance creation: %#v", i.Name, gotInstance)
+		glog.Infof("Compute service GOT instance %v, skipping instance creation: %#v", i.Name, gotInstance)
 	}
 
 	pubkey, ok := os.LookupEnv("JENKINS_GCE_SSH_PUBLIC_KEY_FILE")
@@ -360,7 +398,7 @@ func createInstance(serviceAccount string) (string, error) {
 			return "", fmt.Errorf("could not add Jenkins public key %v to instance %v: %v", pubkey, i.Name, err)
 		}
 	} else {
-		glog.V(4).Infof("JENKINS_GCE_SSH_PUBLIC_KEY_FILE not set, not adding SSH public key to instance")
+		glog.Infof("JENKINS_GCE_SSH_PUBLIC_KEY_FILE not set, not adding SSH public key to instance")
 	}
 
 	then := time.Now()
@@ -521,3 +559,7 @@ func testsToGinkgoFocus(tests []string) string {
 	}
 	return focus + "\""
 }
+
+func opIsDone(op *compute.Operation) bool {
+	return op != nil && op.Status == "DONE"
+}