kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 10:25:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

e2e: more retries for RequireConsulDeregistered (#19801)

Browse Source
This commit is contained in:
Piotr Kazmierczak
2024-01-22 20:11:48 +01:00
committed by GitHub
parent b7fa4447bd
commit 543ba16e61
2 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e2e/e2eutil/consul.go
View File

@@ -39,7 +39,7 @@ func serviceStatus(require *require.Assertions, client *capi.Client, namespace,
// RequireConsulDeregistered asserts that the service eventually is de-registered from Consul.
func RequireConsulDeregistered(require *require.Assertions, client *capi.Client, namespace, service string) {
testutil.WaitForResultRetries(5, func() (bool, error) {
testutil.WaitForResultRetries(10, func() (bool, error) {
defer time.Sleep(time.Second)
services, _, err := client.Health().Service(service, "", false, &capi.QueryOptions{Namespace: namespace})

20
e2e/e2eutil/utils.go
View File

@@ -209,26 +209,8 @@ func WaitForAllocNotPending(t *testing.T, nomadClient *api.Client, allocID strin
// WaitForJobStopped stops a job and waits for all of its allocs to terminate.
func WaitForJobStopped(t *testing.T, nomadClient *api.Client, job string) {
evalID, _, err := nomadClient.Jobs().Deregister(job, true, nil)
_, _, err := nomadClient.Jobs().Deregister(job, true, nil)
require.NoError(t, err, "error deregistering job %q", job)
testutil.WaitForResultRetries(retries, func() (bool, error) {
time.Sleep(time.Millisecond * 100)
eval, _, err := nomadClient.Evaluations().Info(evalID, nil)
if err != nil {
return false, err
}
switch eval.Status {
case api.EvalStatusComplete:
return true, nil
case api.EvalStatusFailed:
return true, nil
default:
return false, fmt.Errorf("expected stopped eval, but was: %s", eval.Status)
}
}, func(err error) {
require.NoError(t, err, "failed to wait for eval")
})
}
func WaitForAllocsStopped(t *testing.T, nomadClient *api.Client, allocIDs []string) {