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

Merge pull request #4986 from hashicorp/b-vault-e2e 

fix iops bug and increase test matrix coverage
This commit is contained in:
Alex Dadgar 2018-12-11 15:52:29 -08:00 committed by GitHub
parent 3d166e6e9c 86d9ad4397
commit fc14a04612
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
command/agent/job_endpoint.go
View File

@ -853,7 +853,11 @@ func ApiResourcesToStructs(in *api.Resources) *structs.Resources {
out := &structs.Resources{ out := &structs.Resources{
CPU: *in.CPU, CPU: *in.CPU,
MemoryMB: *in.MemoryMB, MemoryMB: *in.MemoryMB,
IOPS: *in.IOPS, // COMPAT(0.10): Only being used to issue warnings }
// COMPAT(0.10): Only being used to issue warnings
if in.IOPS != nil {
out.IOPS = *in.IOPS
} }
if l := len(in.Networks); l != 0 { if l := len(in.Networks); l != 0 {

5
e2e/vault/matrix_test.go
View File

@ -3,6 +3,11 @@ package vault
var ( var (
// versions is the set of Vault versions we test for backwards compatibility // versions is the set of Vault versions we test for backwards compatibility
versions = []string{ versions = []string{
"1.0.0",
"0.11.5",
"0.11.4",
"0.11.3",
"0.11.2",
"0.11.1", "0.11.1",
"0.11.0", "0.11.0",
"0.10.4", "0.10.4",