Wait for the correct object (we weren't waiting for a stateful set)

Prometheus moved to a statefulset but we didn't notice this wait
condition was no longer valid. Also bump a few timeouts.

Author: smarterclayton

test/extended/prometheus/prometheus.go

@@ -13,8 +13,8 @@ import (
 	dto "github.com/prometheus/client_model/go"
 	"github.com/prometheus/common/expfmt"
 
+	apps "k8s.io/api/apps/v1beta1"
 	"k8s.io/api/core/v1"
-	extensions "k8s.io/api/extensions/v1beta1"
 	kapierrs "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/watch"
@@ -26,6 +26,8 @@ import (
 	exutil "github.com/openshift/origin/test/extended/util"
 )
 
+const waitForPrometheusStartSeconds = 240
+
 var _ = g.Describe("[Feature:Prometheus][Conformance] Prometheus", func() {
 	defer g.GinkgoRecover()
 	var (
@@ -49,7 +51,7 @@ var _ = g.Describe("[Feature:Prometheus][Conformance] Prometheus", func() {
 			g.By("checking the unsecured metrics path")
 			success := false
 			var metrics map[string]*dto.MetricFamily
-			for i := 0; i < 120; i++ {
+			for i := 0; i < waitForPrometheusStartSeconds; i++ {
 				results, err := getInsecureURLViaPod(ns, execPodName, fmt.Sprintf("https://%s:%d/metrics", host, statsPort))
 				if err != nil {
 					e2e.Logf("unable to get unsecured metrics: %v", err)
@@ -315,7 +317,8 @@ func bringUpPrometheusFromTemplate(oc *exutil.CLI) (ns, host, bearerToken string
 		if err != nil {
 			fmt.Fprintf(g.GinkgoWriter, "test continuing, but create on the prometheus template resulted in: %#v", err)
 		}
-		e2e.WaitForDeploymentComplete(oc.AdminKubeClient(), &extensions.Deployment{ObjectMeta: metav1.ObjectMeta{Name: "prometheus", Namespace: "kube-system"}})
+		tester := e2e.NewStatefulSetTester(oc.AdminKubeClient())
+		tester.WaitForRunningAndReady(1, &apps.StatefulSet{ObjectMeta: metav1.ObjectMeta{Name: "prometheus", Namespace: "kube-system"}})
 	}
 
 	waitForServiceAccountInNamespace(oc.AdminKubeClient(), "kube-system", "prometheus", 2*time.Minute)

test/extended/prometheus/prometheus_builds.go

@@ -50,7 +50,7 @@ var _ = g.Describe("[Feature:Prometheus][Feature:Builds] Prometheus", func() {
 			// allow for some retry, a la prometheus.go and its initial hitting of the metrics endpoint after
 			// instantiating prometheus tempalte
 			var err error
-			for i := 0; i < 30; i++ {
+			for i := 0; i < waitForPrometheusStartSeconds; i++ {
 				err = expectURLStatusCodeExec(ns, execPodName, fmt.Sprintf("https://%s:%d", host, statsPort), 403)
 				if err == nil {
 					break
@@ -119,9 +119,9 @@ type metricTest struct {
 }
 
 func runQueries(metricTests map[string][]metricTest, oc *exutil.CLI) {
-	// expect all correct metrics within 60 seconds
+	// expect all correct metrics within a reasonable time period
 	errsMap := map[string]error{}
-	for i := 0; i < 120; i++ {
+	for i := 0; i < waitForPrometheusStartSeconds; i++ {
 		for query, tcs := range metricTests {
 			//TODO when the http/query apis discussed at https://github.com/prometheus/client_golang#client-for-the-prometheus-http-api
 			// and introduced at https://github.com/prometheus/client_golang/blob/master/api/prometheus/v1/api.go are vendored into

test/extended/router/metrics.go

@@ -109,7 +109,7 @@ var _ = g.Describe("[Conformance][Area:Networking][Feature:Router] openshift rou
 			times := 10
 			var results string
 			defer func() { e2e.Logf("received metrics:\n%s", results) }()
-			err = wait.PollImmediate(2*time.Second, 120*time.Second, func() (bool, error) {
+			err = wait.PollImmediate(2*time.Second, 240*time.Second, func() (bool, error) {
 				results, err = getAuthenticatedURLViaPod(ns, execPodName, fmt.Sprintf("http://%s:%d/metrics", host, statsPort), username, password)
 				o.Expect(err).NotTo(o.HaveOccurred())