Merge pull request #18321 from openshift-cherrypick-robot/cherry-pick-18182-to-release-3.8

Automatic merge from submit-queue.

[release-3.8] Prometheus scrape is 60s, so ensure we see at least one

This is an automated cherry-pick of #18182

/assign smarterclayton

Author: openshift-merge-robot

test/extended/prometheus/prometheus.go

@@ -49,7 +49,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 < 30; i++ {
+			for i := 0; i < 120; 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)
@@ -93,7 +93,7 @@ var _ = g.Describe("[Feature:Prometheus][Conformance] Prometheus", func() {
 			g.By("verifying a service account token is able to access the Prometheus API")
 			// expect all endpoints within 60 seconds
 			var lastErrs []error
-			for i := 0; i < 60; i++ {
+			for i := 0; i < 120; i++ {
 				contents, err := getBearerTokenURLViaPod(ns, execPodName, fmt.Sprintf("https://%s:%d/api/v1/targets", host, statsPort), bearerToken)
 				o.Expect(err).NotTo(o.HaveOccurred())
 

test/extended/prometheus/prometheus_builds.go

@@ -129,7 +129,7 @@ type metricTest struct {
 func runQueries(metricTests map[string][]metricTest) {
 	// expect all correct metrics within 60 seconds
 	errsMap := map[string]error{}
-	for i := 0; i < 60; i++ {
+	for i := 0; i < 120; 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