Update e2e infra provision to expect providers #24694
Conversation
Juanadelacuesta
force-pushed
the
f-NET-11478-module
branch
from
978fb4e to
77148be
Compare
Juanadelacuesta
changed the title
| nomad_license = var.nomad_license | ||
| consul_license = var.consul_license | ||
| nomad_region = var.nomad_region | ||
| } |
There was a problem hiding this comment.
Missing trailing EOL. There's a few of these in this PR.
| variable "hcp_consul_cluster_id" { | ||
| description = "The ID of the HCP Consul cluster" | ||
| type = string | ||
| default = "nomad-e2e-shared-hcp-consul" | ||
| } |
There was a problem hiding this comment.
This variable is unused. We moved off the HCP Consul version in #20256, but missed removing this variable then.
| @@ -0,0 +1,2 @@ | |||
| # enos scenarios | |||
| .enos/ | |||
There was a problem hiding this comment.
Does this enos/ directory need to be in the root of the repo?
| data "aws_kms_alias" "e2e" { | ||
| name = "alias/${var.aws_kms_alias}" | ||
| } | ||
| server_count = var.client_count_linux |
There was a problem hiding this comment.
| server_count = var.client_count_linux | |
| server_count = var.server_count |
| @@ -51,7 +51,7 @@ Linux clients or Windows clients. | |||
| region = "us-east-1" | |||
| instance_type = "t2.medium" | |||
| server_count = "3" | |||
| client_count_ubuntu_jammy_amd64 = "4" | |||
| client_count_linux = "4" | |||
There was a problem hiding this comment.
This variable originally included the specific distro and architecture so that we could spin up different hosts in the same test run (although we never got around to doing so). It's not obvious to me how we're planning on feeding in the architecture/platform if not by this variable.
(Or, if we're planning on adding architecture/platform variables later, shouldn't we make the same change to the windows_2026_amd64` var?)
| @@ -2,7 +2,8 @@ | |||
| # SPDX-License-Identifier: BUSL-1.1 | |||
|
|
|||
| locals { | |||
| ami_prefix = "nomad-e2e-v3" | |||
| ami_prefix = "nomad-e2e-v3" | |||
| ubuntu_instance_name = "ubuntu-jammy-${var.instance_architecture}" | |||
There was a problem hiding this comment.
This is the image (AMI), not the instance, right?
| ubuntu_instance_name = "ubuntu-jammy-${var.instance_architecture}" | |
| ubuntu_image_name = "ubuntu-jammy-${var.instance_architecture}" |
Description
The
e2e/terraformmodule used to provision the infra for the e2e tests uses an older version of terraform that is incompatible with the directivedepends_on. This PR updates it by moving it into its own module and passing the providers from the new main, making it compatible with the current set up an reusable for the upgrade testing pipeline.It also does some renaming to prepare for clients with a different architecture.
Testing & Reproduction steps
Links
Contributor Checklist
changelog entry using the
make clcommand.ensure regressions will be caught.
and job configuration, please update the Nomad website documentation to reflect this. Refer to
the website README for docs guidelines. Please also consider whether the
change requires notes within the upgrade guide.
Reviewer Checklist
backporting document.
in the majority of situations. The main exceptions are long-lived feature branches or merges where
history should be preserved.
within the public repository.