Fix e2e test

Author: hakman

test/e2e/metriconly/metrics_test.go

@@ -37,18 +37,15 @@ var _ = ginkgo.Describe("NPD should export Prometheus metrics.", func() {
 	var instance gce.Instance
 
 	ginkgo.BeforeEach(func() {
-		var err error
-		// TODO(xueweiz): Creating instance for each test case is slow. We should either reuse the instance
-		// between tests, or have a way to run these tests in parallel.
-		if *imageFamily != "" && *image == "" {
-			gceImage, err := computeService.Images.GetFromFamily(*imageProject, *imageFamily).Do()
-			if err != nil {
-				ginkgo.Fail(fmt.Sprintf("Unable to get image from family %s at project %s: %v",
-					*imageFamily, *imageProject, err))
-			}
-			*image = gceImage.Name
-			fmt.Printf("Using image %s from image family %s at project %s\n", *image, *imageFamily, *imageProject)
+		imageProject := "ubuntu-os-gke-cloud"
+		imageFamily := "ubuntu"
+		gceImage, err := computeService.Images.GetFromFamily(imageProject, imageFamily).Do()
+		if err != nil {
+			ginkgo.Fail(fmt.Sprintf("Unable to get image from family %s at project %s: %v",
+				imageFamily, imageProject, err))
 		}
+		*image = gceImage.Name
+		fmt.Printf("Using image %s from image family %s at project %s\n", *image, imageFamily, imageProject)
 		instance, err = gce.CreateInstance(
 			gce.Instance{
 				Name:           "npd-metrics-" + *image + "-" + uuid.NewUUID().String()[:8],
@@ -59,7 +56,7 @@ var _ = ginkgo.Describe("NPD should export Prometheus metrics.", func() {
 				ComputeService: computeService,
 			},
 			*image,
-			*imageProject)
+			imageProject)
 		Expect(err).NotTo(HaveOccurred(), fmt.Sprintf("Unable to create test instance: %v", err))
 
 		err = npd.SetupNPD(instance, *npdBuildTar)