make GCI the default node e2e test image. Fix bugs in runner

Signed-off-by: Vishnu kannan <vishnuk@google.com>

hack/make-rules/test-e2e-node.sh

@@ -31,17 +31,20 @@ artifacts=${ARTIFACTS:-"/tmp/_artifacts"}
 remote=${REMOTE:-"false"}
 images=${IMAGES:-""}
 hosts=${HOSTS:-""}
+metadata=${INSTANCE_METADATA:-""}
+gci_image=$(gcloud compute images list --project google-containers \
+    --no-standard-images --regexp="gci-dev.*" --format="table[no-heading](name)")
 if [[ $hosts == "" && $images == "" ]]; then
-  images="e2e-node-containervm-v20160321-image"
+  images=$gci_image
+  metadata="user-data<${KUBE_ROOT}/test/e2e_node/jenkins/gci-init.yaml"
 fi
-image_project=${IMAGE_PROJECT:-"kubernetes-node-e2e-images"}
+image_project=${IMAGE_PROJECT:-"google-containers"}
 instance_prefix=${INSTANCE_PREFIX:-"test"}
 cleanup=${CLEANUP:-"true"}
 delete_instances=${DELETE_INSTANCES:-"false"}
 run_until_failure=${RUN_UNTIL_FAILURE:-"false"}
 list_images=${LIST_IMAGES:-"false"}
 test_args=${TEST_ARGS:-""}
-metadata=${INSTANCE_METADATA:-""}
 
 if  [[ $list_images == "true" ]]; then
   gcloud compute images list --project="${image_project}" | grep "e2e-node"
@@ -126,7 +129,7 @@ if [ $remote = true ] ; then
   echo "Ginkgo Flags: $ginkgoflags"
   echo "Instance Metadata: $metadata"
   # Invoke the runner
-  go run test/e2e_node/runner/run_e2e.go  --logtostderr --vmodule=*=2 --ssh-env="gce" \
+  go run test/e2e_node/runner/run_e2e.go  --logtostderr --vmodule=*=4 --ssh-env="gce" \
     --zone="$zone" --project="$project"  \
     --hosts="$hosts" --images="$images" --cleanup="$cleanup" \
     --results-dir="$artifacts" --ginkgo-flags="$ginkgoflags" \

test/e2e_node/image_list.go

@@ -18,6 +18,7 @@ package e2e_node
 
 import (
 	"os/exec"
+	"os/user"
 	"time"
 
 	"github.com/golang/glog"
@@ -66,6 +67,10 @@ var NoPullImageRegistry = map[int]string{
 
 // Pre-fetch all images tests depend on so that we don't fail in an actual test
 func PrePullAllImages() error {
+	usr, err := user.Current()
+	if err != nil {
+		return err
+	}
 	for _, image := range ImageRegistry {
 		var (
 			err    error
@@ -78,8 +83,8 @@ func PrePullAllImages() error {
 			if output, err = exec.Command("docker", "pull", image).CombinedOutput(); err == nil {
 				break
 			}
-			glog.Warningf("Failed to pull %s, retrying in %s (%d of %d): %v",
+			glog.Warningf("Failed to pull %s as user %q, retrying in %s (%d of %d): %v",
-				image, imagePullRetryDelay.String(), i+1, maxImagePullRetries, err)
+				image, usr.Username, imagePullRetryDelay.String(), i+1, maxImagePullRetries, err)
 		}
 		if err != nil {
 			glog.Warningf("Could not pre-pull image %s %v output:  %s", image, err, output)

test/e2e_node/jenkins/gci-init.yaml

@@ -2,9 +2,8 @@
 
 runcmd:
   - mount /tmp /tmp -o remount,exec,suid
-  - ETCD_VERSION=v3.0.3
+  - etcd_version=v2.2.5
-  - curl -L https://github.com/coreos/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz -o /tmp/etcd.tar.gz
+  - curl -L https://github.com/coreos/etcd/releases/download/${etcd_version}/etcd-${etcd_version}-linux-amd64.tar.gz -o /tmp/etcd.tar.gz
   - tar xzvf /tmp/etcd.tar.gz -C /tmp
-  - cp /tmp/etcd-${ETCD_VERSION}-linux-amd64/etcd* /tmp/
+  - cp  /tmp/etcd-${etcd_version}-linux-amd64/etcd* /tmp/
-  - rm -rf /tmp/etcd-${ETCD_VERSION}-linux-amd64/
+  - rm -rf /tmp/etcd-${etcd_version}-linux-amd64/
-  - usermod -a -G docker jenkins

test/e2e_node/runner/run_e2e.go

@@ -119,6 +119,12 @@ func main() {
 	if *hosts == "" && *imageConfigFile == "" && *images == "" {
 		glog.Fatalf("Must specify one of --image-config-file, --hosts, --images.")
 	}
+	var err error
+	computeService, err = getComputeClient()
+	if err != nil {
+		glog.Fatalf("Unable to create gcloud compute service using defaults.  Make sure you are authenticated. %v", err)
+	}
+
 	gceImages := &internalImageConfig{
 		images: make(map[string]internalGCEImage),
 	}
@@ -133,7 +139,7 @@ func main() {
 		if err != nil {
 			glog.Fatalf("Could not parse image config file: %v", err)
 		}
-		for key, imageConfig := range externalImageConfig.Images {
+		for _, imageConfig := range externalImageConfig.Images {
 			var images []string
 			if imageConfig.ImageRegex != "" && imageConfig.Image == "" {
 				images, err = getGCEImages(imageConfig.ImageRegex, imageConfig.Project, imageConfig.PreviousImages)
@@ -201,12 +207,6 @@ func main() {
 	go arc.getArchive()
 	defer arc.deleteArchive()
 
-	var err error
-	computeService, err = getComputeClient()
-	if err != nil {
-		glog.Fatalf("Unable to create gcloud compute service using defaults.  Make sure you are authenticated. %v", err)
-	}
-
 	results := make(chan *TestResult)
 	running := 0
 	for shortName := range gceImages.images {
@@ -329,7 +329,7 @@ type imageObj struct {
 }
 
 func (io imageObj) string() string {
-	return fmt.Sprintf("%q created % %q", io.name, io.creationTime.String())
+	return fmt.Sprintf("%q created %q", io.name, io.creationTime.String())
 }
 
 type byCreationTime []imageObj