From 0d6b02b09963bf77558df8a5acc1d78be60471a5 Mon Sep 17 00:00:00 2001
From: Tim Gross <tgross@hashicorp.com>
Date: Fri, 21 Aug 2020 09:20:09 -0400
Subject: [PATCH] e2e: fix platform path for installing for Linux from s3
 (#8708)

---
 e2e/terraform/packer/linux/install-nomad       | 2 +-
 e2e/terraform/packer/windows/install-nomad.ps1 | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/e2e/terraform/packer/linux/install-nomad b/e2e/terraform/packer/linux/install-nomad
index b9fe8b292..9671c6c00 100755
--- a/e2e/terraform/packer/linux/install-nomad
+++ b/e2e/terraform/packer/linux/install-nomad
@@ -32,7 +32,7 @@ install_from_s3() {
             && echo "$NOMAD_SHA already installed" && exit 0
     fi
 
-    S3_URL="s3://nomad-team-dev-test-binaries/builds-oss/nomad_linux_${NOMAD_SHA}.tar.gz"
+    S3_URL="s3://nomad-team-dev-test-binaries/builds-oss/nomad_${PLATFORM}_${NOMAD_SHA}.tar.gz"
     aws s3 cp --quiet "$S3_URL" nomad.tar.gz
     sudo tar -zxvf nomad.tar.gz -C "$INSTALL_DIR"
     set_ownership
diff --git a/e2e/terraform/packer/windows/install-nomad.ps1 b/e2e/terraform/packer/windows/install-nomad.ps1
index 183f63925..d79da76e1 100755
--- a/e2e/terraform/packer/windows/install-nomad.ps1
+++ b/e2e/terraform/packer/windows/install-nomad.ps1
@@ -30,6 +30,7 @@ if (!$RunningAsAdmin) {
 
 
 $install_path = "C:\opt\nomad.exe"
+$platform = "windows_amd64"
 
 Set-Location C:\opt
 
@@ -50,7 +51,7 @@ function InstallFromS3 {
     }
 
     Try {
-        $key = "builds-oss/nomad_windows_amd64_${nomad_sha}.zip"
+        $key = "builds-oss/nomad_${platform}_${nomad_sha}.zip"
 		Read-S3Object -BucketName nomad-team-dev-test-binaries -Key $key -File ./nomad.zip
 		Remove-Item -Path $install_path -Force -ErrorAction Ignore
 		Expand-Archive ./nomad.zip ./ -Force
@@ -107,7 +108,7 @@ function InstallFromRelease {
 
     Try {
         $releases = "https://releases.hashicorp.com"
-        $url = "${releases}/nomad/${nomad_version}/nomad_${nomad_version}_windows_amd64.zip"
+        $url = "${releases}/nomad/${nomad_version}/nomad_${nomad_version}_${platform}.zip"
 
         Write-Output "Downloading Nomad from: $url"
         Invoke-WebRequest -Uri $url -Outfile nomad.zip