e2e: smoke test per-alloc option for CSI

hashicorp · Mar 11, 2021 · 3ff2917 · 3ff2917
1 parent 1683f68
commit 3ff2917
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/e2e/csi/input/use-ebs-volume.nomad b/e2e/csi/input/use-ebs-volume.nomad
@@ -9,8 +9,9 @@ job "use-ebs-volume" {
 
   group "group" {
     volume "test" {
-      type   = "csi"
-      source = "ebs-vol0"
+      type      = "csi"
+      source    = "ebs-vol"
+      per_alloc = true
     }
 
     task "task" {

diff --git a/e2e/terraform/compute.tf b/e2e/terraform/compute.tf
@@ -63,7 +63,7 @@ data "external" "packer_sha" {
 sha=$(git log -n 1 --pretty=format:%H packer)
 echo "{\"sha\":\"$${sha}\"}"
 EOT
-]
+  ]
 
 }
 

diff --git a/e2e/terraform/terraform.tfvars b/e2e/terraform/terraform.tfvars
@@ -15,5 +15,5 @@ nomad_local_binary = ""      # overrides nomad_sha and nomad_version if set
 
 # Example overrides:
 # nomad_sha = "38e23b62a7700c96f4898be777543869499fea0a"
-# nomad_local_binary = "../../pkg/linux_amd/nomad"
+# nomad_local_binary = "../../pkg/linux_amd64/nomad"
 # nomad_local_binary_client_windows_2016_amd64 = ["../../pkg/windows_amd64/nomad.exe"]
diff --git a/e2e/terraform/volumes.tf b/e2e/terraform/volumes.tf
@@ -30,8 +30,8 @@ data "template_file" "ebs_volume_hcl" {
   count    = var.volumes ? 1 : 0
   template = <<EOT
 type = "csi"
-id = "ebs-vol0"
-name = "ebs-vol0"
+id = "ebs-vol[0]"
+name = "ebs-vol"
 external_id = "${aws_ebs_volume.csi[0].id}"
 access_mode = "single-node-writer"
 attachment_mode = "file-system"
-Original file line number
+Diff line change
@@ Expand Up / @@ -63,7 +63,7 @@ data "external" "packer_sha" { @@
     sha=$(git log -n 1 --pretty=format:%H packer)
     echo "{\"sha\":\"$${sha}\"}"
     EOT
-    ]
+      ]
     }
@@ Expand Down @@