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

fix iops bug and increase test matrix coverage

command/agent/job_endpoint.go

@@ -853,7 +853,11 @@ func ApiResourcesToStructs(in *api.Resources) *structs.Resources {
 	out := &structs.Resources{
 		CPU:      *in.CPU,
 		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 {

e2e/vault/matrix_test.go

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