DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve e2e speed execution time

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-09-30 11:24:51 -03:00
parent 9dbfc11f01
commit c4f78ef11d
4 changed files with 16 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

24
test/e2e/framework/framework.go
View file

@ -25,9 +25,6 @@ import (
"github.com/gavv/httpexpect/v2"
"github.com/onsi/ginkgo"
"github.com/pkg/errors"
dto "github.com/prometheus/client_model/go"
"github.com/prometheus/common/expfmt"
"github.com/prometheus/common/model"
"github.com/stretchr/testify/assert"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
@ -364,21 +361,22 @@ func (f *Framework) UpdateNginxConfigMapData(key string, value string) {
}
func (f *Framework) waitForReload(fn func()) {
reloadCount := getReloadCount(f.pod, f.Namespace, f.KubeClientSet)
initialReloadCount := getReloadCount(f.pod, f.Namespace, f.KubeClientSet)
fn()
count := 0
err := wait.Poll(2*time.Second, DefaultTimeout, func() (bool, error) {
err := wait.Poll(1*time.Second, DefaultTimeout, func() (bool, error) {
reloads := getReloadCount(f.pod, f.Namespace, f.KubeClientSet)
// most of the cases reload the ingress controller
// in cases where the value is not modified we could wait forever
if count > 3 {
if count > 5 && reloads == initialReloadCount {
return true, nil
}
count++
return (getReloadCount(f.pod, f.Namespace, f.KubeClientSet) > reloadCount), nil
return (reloads > initialReloadCount), nil
})
assert.Nil(ginkgo.GinkgoT(), err, "while waiting for ingress controller reload")
}
@ -397,18 +395,6 @@ func getReloadCount(pod *corev1.Pod, namespace string, client kubernetes.Interfa
return reloadCount
}
func extractReloadCount(mf *dto.MetricFamily) (float64, error) {
vec, err := expfmt.ExtractSamples(&expfmt.DecodeOptions{
Timestamp: model.Now(),
}, mf)
if err != nil {
return 0, err
}
return float64(vec[0].Value), nil
}
// DeleteNGINXPod deletes the currently running pod. It waits for the replacement pod to be up.
// Grace period to wait for pod shutdown is in seconds.
func (f *Framework) DeleteNGINXPod(grace int64) {