E2E: AMI software version bumps and cleanup (#9213)

* remove unused vault installation from Windows AMI
* match Windows and Linux Consul versions
* bump AMI base Nomad to current stable

e2e/terraform/packer/packer-windows-2016-amd64.json

@@ -39,8 +39,7 @@
         "windows-2016-amd64/install-docker.ps1",
         "windows-2016-amd64/setup-directories.ps1",
         "windows-2016-amd64/install-openssh.ps1",
-        "windows-2016-amd64/install-consul.ps1",
-        "windows-2016-amd64/install-vault.ps1"
+        "windows-2016-amd64/install-consul.ps1"
       ]
     },
     {
@@ -60,7 +59,7 @@
       "type": "powershell",
       "elevated_user": "Administrator",
       "elevated_password": "{{.WinRMPassword}}",
-      "inline": ["/opt/provision.ps1 -nomad_version 0.9.6 -nostart"]
+      "inline": ["/opt/provision.ps1 -nomad_version 0.12.7 -nostart"]
     },
     {
       "type": "powershell",

e2e/terraform/packer/ubuntu-bionic-amd64/setup.sh

@@ -5,7 +5,7 @@
 set -e
 
 # Will be overwritten at test time with the version specified
-NOMADVERSION=0.9.1
+NOMADVERSION=0.12.7
 CONSULVERSION=1.8.3
 VAULTVERSION=1.5.4
 

e2e/terraform/packer/windows-2016-amd64/install-consul.ps1

@@ -8,7 +8,7 @@ Set-Location C:\opt
 
 Try {
     $releases = "https://releases.hashicorp.com"
-    $version = "1.7.3"
+    $version = "1.8.3"
     $url = "${releases}/consul/${version}/consul_${version}_windows_amd64.zip"
 
     New-Item -ItemType Directory -Force -Path C:\opt\consul

e2e/terraform/packer/windows-2016-amd64/install-vault.ps1

@@ -1,31 +0,0 @@
-Set-StrictMode -Version latest
-$ErrorActionPreference = "Stop"
-
-# Force TLS1.2
-[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-
-Set-Location C:\opt
-
-Try {
-    $releases = "https://releases.hashicorp.com"
-    $version = "1.2.3"
-    $url = "${releases}/vault/${version}/vault_${version}_windows_amd64.zip"
-
-    New-Item -ItemType Directory -Force -Path C:\opt\vault
-    New-Item -ItemType Directory -Force -Path C:\opt\vault.d
-
-    # TODO: check sha!
-    Write-Output "Downloading Vault from: $url"
-    Invoke-WebRequest -Uri $url -Outfile vault.zip
-    Expand-Archive .\vault.zip .\
-    mv vault.exe C:\opt\vault.exe
-    C:\opt\vault.exe version
-    rm vault.zip
-
-} Catch {
-    Write-Error "Failed to install Vault."
-    $host.SetShouldExit(-1)
-    throw
-}
-
-Write-Output "Installed Vault."