luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

e2e add deployment to the list of e2e tests, minor fixes

Browse source
This commit is contained in:
Lang Martin 2019-05-21 09:21:44 -04:00
parent 2a11d66258
commit fe69f89476
5 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
e2e/deployment/deployment.go
View file

@ -60,6 +60,8 @@ func (tc *DeploymentTest) TestDeploymentAutoPromote(f *framework.F) {
// Deployment is eventually running
e2eutil.WaitForDeployment(t, nomadClient, deploy.ID, run, structs.DeploymentStatusDescriptionRunning)
deploy, _, _ = nomadClient.Deployments().Info(deploy.ID, nil)
require.Equal(t, run, deploy.Status)
require.Equal(t, structs.DeploymentStatusDescriptionRunning, deploy.StatusDescription)
}

2
e2e/deployment/input/deployment_auto0.nomad
View file

@ -32,7 +32,7 @@ job "deployment_auto.nomad" {
max_parallel = 2
auto_promote = true
canary = 2
min_healthy_time = "5s"
min_healthy_time = "2s"
}
task "two" {

2
e2e/deployment/input/deployment_auto1.nomad
View file

@ -32,7 +32,7 @@ job "deployment_auto.nomad" {
max_parallel = 2
auto_promote = true
canary = 2
min_healthy_time = "5s"
min_healthy_time = "2s"
}
task "two" {

1
e2e/e2e_test.go
View file

@ -8,6 +8,7 @@ import (
_ "github.com/hashicorp/nomad/e2e/clientstate"
_ "github.com/hashicorp/nomad/e2e/consul"
_ "github.com/hashicorp/nomad/e2e/consultemplate"
_ "github.com/hashicorp/nomad/e2e/deployment"
_ "github.com/hashicorp/nomad/e2e/example"
_ "github.com/hashicorp/nomad/e2e/nomad09upgrade"
_ "github.com/hashicorp/nomad/e2e/nomadexec"

2
e2e/e2eutil/utils.go
View file

@ -130,6 +130,6 @@ func WaitForDeployment(t *testing.T, nomadClient *api.Client, deployID string, s
)
}, func(err error) {
t.Fatalf("failed to wait on alloc: %v", err)
t.Fatalf("failed to wait on deployment: %v", err)
})
}