Merge #517

517: [backports/ci/1.3] backport CI updates r=falfaro a=sameersbn Co-authored-by: Sameer Naik <sameer@bitnami.com>
vmware-archive · Apr 29, 2019 · 87fe4cd · 87fe4cd
2 parents a3de976 + 1efe989
commit 87fe4cd
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 38 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -294,7 +294,8 @@ spec:
                 // See:
                 //  gcloud container get-server-config
                 def gkeKversions = ["1.11", "1.12"]
-                for (kversion in gkeKversions) {
+                for (x in gkeKversions) {
+                    def kversion = x  // local bind required because closures
                     def project = 'bkprtesting'
                     def zone = 'us-east1-b'
                     def platform = "gke-" + kversion
@@ -384,7 +385,8 @@ spec:
                 // See:
                 //  az aks get-versions -l centralus --query 'sort(orchestrators[?orchestratorType==`Kubernetes`].orchestratorVersion)'
                 def aksKversions = ["1.11", "1.12"]
-                for (kversion in aksKversions) {
+                for (x in aksKversions) {
+                    def kversion = x  // local bind required because closures
                     def resourceGroup = 'jenkins-bkpr-rg'
                     def location = "eastus"
                     def platform = "aks-" + kversion
@@ -501,7 +503,8 @@ spec:
                 }
 
                 def eksKversions = ["1.11"]
-                for (kversion in eksKversions) {
+                for (x in eksKversions) {
+                    def kversion = x  // local bind required because closures
                     def awsRegion = "us-east-1"
                     def awsUserPoolId = "${awsRegion}_zkRzdsjxA"
                     def awsZones = ["us-east-1b", "us-east-1f"]
@@ -593,7 +596,7 @@ spec:
                                                     }
                                                 }
                                                 container('eksctl') {
-                                                    sh "eksctl delete cluster --name ${clusterName}"
+                                                    sh "eksctl delete cluster --name ${clusterName} --timeout 10m0s || true"
                                                 }
                                             }
                                             // dnsSetup

diff --git a/tests/ingress_test.go b/tests/ingress_test.go
@@ -211,7 +211,7 @@ var _ = Describe("Ingress", func() {
 				}
 
 				return lbAddr, nil
-			}, "20m", "5s").
+			}, "5m", "5s").
 				ShouldNot(WithTransform(isPrivateIP, BeTrue()))
 		})
 
@@ -249,7 +249,7 @@ var _ = Describe("Ingress", func() {
 
 				resp, err = getURL(client, url)
 				return resp, err
-			}, "20m", "5s").
+			}, "5m", "5s").
 				Should(WithTransform(statusCode, Equal(200)))
 
 			defer resp.Body.Close()
@@ -295,7 +295,7 @@ var _ = Describe("Ingress", func() {
 			Eventually(func() (*http.Response, error) {
 				resp, err = getURL(client, url)
 				return resp, err
-			}, "30m", "5s").
+			}, "10m", "5s").
 				Should(WithTransform(statusCode, Equal(200)))
 
 			defer resp.Body.Close()
@@ -336,7 +336,7 @@ var _ = Describe("Ingress", func() {
 					// NB: will follow redirects
 					resp, err = getURL(client, testUrl)
 					return resp, err
-				}, "20m", "5s").
+				}, "10m", "5s").
 					Should(WithTransform(statusCode, Or(Equal(200), Equal(400))))
 
 				fmt.Fprintf(GinkgoWriter, "Response:\n%#v", resp)
@@ -400,7 +400,7 @@ var _ = Describe("Ingress", func() {
 					// NB: will follow redirects
 					resp, err = getURL(client, testUrl)
 					return resp, err
-				}, "20m", "5s").
+				}, "10m", "5s").
 					Should(WithTransform(statusCode, Equal(200)))
 
 				fmt.Fprintf(GinkgoWriter, "Response:\n%#v", resp)

diff --git a/tests/logging_test.go b/tests/logging_test.go
@@ -103,7 +103,7 @@ var _ = Describe("Logging", func() {
 				resp := apiResponse{}
 				json.Unmarshal(resultRaw, &resp)
 				return &resp, err
-			}, "15m", "5s").
+			}, "5m", "5s").
 				Should(WithTransform(totalHits, BeNumerically(">", 0)))
 		})
 	})

diff --git a/tests/monitoring_test.go b/tests/monitoring_test.go
@@ -96,33 +96,23 @@ var _ = Describe("Exporters", func() {
 			"match[]": selector,
 			"start":   fmt.Sprintf("%d", time.Now().Add(-20*time.Minute).Unix()),
 		}
-		resultRaw, err := c.CoreV1().
-			Services("kubeprod").
-			ProxyGet("http", "prometheus", "9090", "api/v1/series", params).
-			DoRaw()
-		Expect(err).NotTo(HaveOccurred())
-
-		resp := promResponse{}
-		json.Unmarshal(resultRaw, &resp)
-		var series []map[string]string
-		json.Unmarshal(resp.Data, &series)
 
-		fmt.Fprintf(GinkgoWriter, "%s found %d timeseries:\n", selector, len(series))
-		for i, s := range series {
-			if i >= 10 {
-				fmt.Fprintf(GinkgoWriter, "(truncated ...)\n")
-				break
-			}
-			fmt.Fprintf(GinkgoWriter, "%s{", s["__name__"])
-			for k, v := range s {
-				if k != "__name__" {
-					fmt.Fprintf(GinkgoWriter, "%s=%q,", k, v)
-				}
+		Eventually(func() ([]map[string]string, error) {
+			var series []map[string]string
+			resultRaw, err := c.CoreV1().
+				Services("kubeprod").
+				ProxyGet("http", "prometheus", "9090", "api/v1/series", params).
+				DoRaw()
+			if err != nil {
+				return nil, err
 			}
-			fmt.Fprintf(GinkgoWriter, "}\n")
-		}
 
-		Expect(series).To(match)
+			resp := promResponse{}
+			json.Unmarshal(resultRaw, &resp)
+			json.Unmarshal(resp.Data, &series)
+
+			return series, err
+		}, "5m", "5s").Should(match)
 	},
 		Entry("prometheus", `prometheus_tsdb_head_chunks{kubernetes_namespace="kubeprod",name="prometheus"}`, Not(BeEmpty())),
 		Entry("alertmanager", `alertmanager_peer_position`, Not(BeEmpty())),
@@ -180,7 +170,7 @@ var _ = Describe("Monitoring", func() {
 				json.Unmarshal(resp.Data, &series)
 
 				return series, err
-			}, "20m", "5s").
+			}, "5m", "5s").
 				Should(WithTransform(countSeries, BeNumerically(">", 0)))
 
 			Expect(series[0].Container).To(Equal(deploy.Spec.Template.Spec.Containers[0].Name))
@@ -203,7 +193,7 @@ var _ = Describe("Monitoring", func() {
 				json.Unmarshal(resp.Data, &managers)
 
 				return managers.Active, err
-			}, "20m", "5s").
+			}, "5m", "5s").
 				Should(WithTransform(countEndpoints, BeNumerically(">", 0)))
 
 			Expect(managers.Active[0].Url).To(ContainSubstring(am_path + "/api/v1/alerts"))
@@ -233,7 +223,7 @@ var _ = Describe("Monitoring", func() {
 				json.Unmarshal(resp.Data, &series)
 
 				return series, err
-			}, "20m", "5s").
+			}, "5m", "5s").
 				Should(WithTransform(countSeries, BeNumerically(">", 0)))
 
 			Expect(series[0].Container).To(Equal(deploy.Spec.Template.Spec.Containers[0].Name))
@@ -257,7 +247,7 @@ var _ = Describe("Monitoring", func() {
 				json.Unmarshal(resp.Data, &alerts)
 
 				return alerts, err
-			}, "20m", "5s").
+			}, "5m", "5s").
 				Should(WithTransform(countAlerts, BeNumerically(">", 0)))
 
 			Expect(alerts[0].Label.Container).To(Equal(deploy.Spec.Template.Spec.Containers[0].Name))