From 8961be96391dee0ee87eba905aa047405ce3e0b2 Mon Sep 17 00:00:00 2001 From: Damien Grisonnet Date: Tue, 31 Mar 2020 13:35:26 +0200 Subject: [PATCH 1/3] ci: update e2e tests according to compat matrix Signed-off-by: Damien Grisonnet --- tests/e2e/travis-e2e.sh | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/tests/e2e/travis-e2e.sh b/tests/e2e/travis-e2e.sh index c95f763c..9762987f 100755 --- a/tests/e2e/travis-e2e.sh +++ b/tests/e2e/travis-e2e.sh @@ -13,16 +13,30 @@ chmod +x kubectl curl -Lo kind https://github.com/kubernetes-sigs/kind/releases/download/v0.6.1/kind-linux-amd64 chmod +x kind -./kind create cluster --image=kindest/node:v1.17.0 -export KUBECONFIG="$(./kind get kubeconfig-path)" +run_e2e_tests() { + cluster_version=$1 -# create namespace, permissions, and CRDs -./kubectl create -f manifests/setup + ./kind create cluster --image=kindest/node:$cluster_version + export KUBECONFIG="$(./kind get kubeconfig-path)" -# wait for CRD creation to complete -until ./kubectl get servicemonitors --all-namespaces ; do date; sleep 1; echo ""; done + # create namespace, permissions, and CRDs + ./kubectl create -f manifests/setup -# create monitoring components -./kubectl create -f manifests/ + # wait for CRD creation to complete + until ./kubectl get servicemonitors --all-namespaces ; do date; sleep 1; echo ""; done + + # create monitoring components + ./kubectl create -f manifests/ + + make test-e2e + + ./kind delete cluster +} + +cluster_compatible_versions=("v1.16.1" "v1.17.0") + +for cluster_version in "${cluster_compatible_versions[@]}" +do + run_e2e_tests $cluster_version +done -make test-e2e From 106132ac1822bebf33c50d40098b2f1645fe1713 Mon Sep 17 00:00:00 2001 From: Damien Grisonnet Date: Tue, 31 Mar 2020 15:05:46 +0200 Subject: [PATCH 2/3] Makefile: pin jsonnet-ci to 0.36 Signed-off-by: Damien Grisonnet --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 994fa5ae..81d8f5bc 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ CONTAINER_CMD:=docker run --rm \ -v "$(shell go env GOCACHE):/.cache/go-build" \ -v "$(PWD):/go/src/github.com/coreos/kube-prometheus:Z" \ -w "/go/src/github.com/coreos/kube-prometheus" \ - quay.io/coreos/jsonnet-ci + quay.io/coreos/jsonnet-ci:release-0.36 all: generate fmt test From d3bee7fa1ab00dc9f9b1af1358d6d8f569c9adf2 Mon Sep 17 00:00:00 2001 From: Damien Grisonnet Date: Tue, 31 Mar 2020 16:21:46 +0200 Subject: [PATCH 3/3] test: increase pod polling time The original polling time was a bit short for all pods to be up which made e2e tests fail half of the time. Signed-off-by: Damien Grisonnet --- tests/e2e/main_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/e2e/main_test.go b/tests/e2e/main_test.go index eb73108c..1713881f 100644 --- a/tests/e2e/main_test.go +++ b/tests/e2e/main_test.go @@ -87,7 +87,7 @@ func TestQueryPrometheus(t *testing.T) { } // Wait for pod to respond at queries at all. Then start verifying their results. - err := wait.Poll(5*time.Second, 1*time.Minute, func() (bool, error) { + err := wait.Poll(5*time.Second, 2*time.Minute, func() (bool, error) { _, err := promClient.query("up") return err == nil, nil })