From 198e0d9f2408540c2cfa5c53f806226aba386dbb Mon Sep 17 00:00:00 2001 From: Seth Hoenig Date: Wed, 14 Apr 2021 12:05:53 -0600 Subject: [PATCH] e2e: get consul ent in e2e packer builds Using Consul Enterprise is going to be necessary for testing Nomad's Consul Namespace integration in Nomad v1.1 in e2e. --- e2e/terraform/packer/ubuntu-bionic-amd64/setup.sh | 2 +- e2e/terraform/packer/windows-2016-amd64/install-consul.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/terraform/packer/ubuntu-bionic-amd64/setup.sh b/e2e/terraform/packer/ubuntu-bionic-amd64/setup.sh index a91e9a8a2..88316de1d 100755 --- a/e2e/terraform/packer/ubuntu-bionic-amd64/setup.sh +++ b/e2e/terraform/packer/ubuntu-bionic-amd64/setup.sh @@ -6,7 +6,7 @@ set -e # Will be overwritten at test time with the version specified NOMADVERSION=0.12.7 -CONSULVERSION=1.9.0 +CONSULVERSION=1.9.4+ent VAULTVERSION=1.5.4 NOMAD_PLUGIN_DIR=/opt/nomad/plugins/ diff --git a/e2e/terraform/packer/windows-2016-amd64/install-consul.ps1 b/e2e/terraform/packer/windows-2016-amd64/install-consul.ps1 index c66f02905..5765c4eab 100755 --- a/e2e/terraform/packer/windows-2016-amd64/install-consul.ps1 +++ b/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.9.0" + $version = "1.9.4+ent" $url = "${releases}/consul/${version}/consul_${version}_windows_amd64.zip" New-Item -ItemType Directory -Force -Path C:\opt\consul