Update e2e infra provision to expect providers #24694
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Juanadelacuesta
force-pushed
the
f-NET-11478-module
branch
from
978fb4e to
77148be
Compare
Juanadelacuesta
changed the title
tgross
reviewed
Dec 18, 2024
Comment on lines
82
to
86
| 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.
| @@ -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?)
There was a problem hiding this comment.
we are with a different variable for the the arch, so we can reuse this one for multiple archs, or at least that is how I pictured it
Juanadelacuesta
force-pushed
the
f-NET-11478-module
branch
from
0c492ea to
393e184
Compare
Juanadelacuesta
force-pushed
the
f-NET-11478-module
branch
from
393e184 to
590d0be
Compare
Juanadelacuesta
force-pushed
the
f-NET-11478-module
branch
from
cce8e72 to
ecace27
Compare
Juanadelacuesta
force-pushed
the
f-NET-11478-module
branch
from
ecace27 to
4a8ee83
Compare
Co-authored-by: Tim Gross <[email protected]>
Co-authored-by: Tim Gross <[email protected]>
… for vol to avoid colisions
Juanadelacuesta
force-pushed
the
f-NET-11478-module
branch
from
678d347 to
e62916a
Compare
tgross
reviewed
Jan 9, 2025
| @@ -26,3 +31,5 @@ nomad acl policy apply \ | |||
| -description "Anonymous policy (full-access)" \ | |||
| anonymous \ | |||
| "${DIR}/anonymous.nomad_policy.hcl" | |||
|
|
|||
| echo "Nomad successfully bootstraped" | |||
There was a problem hiding this comment.
Still got a few files with missing trailing EOL
tgross
reviewed
Jan 9, 2025
tgross
added a commit
that referenced
this pull request
Jan 14, 2025
In #24694 we did a major refactoring of the E2E Terraform configuration. After deploying a cluster this morning, I noticed a few moved/removed files were not reflected in the .gitignore files. This changeset updates the .gitignore to have no unstaged files after applying.
tgross
added a commit
that referenced
this pull request
Jan 14, 2025
In #24694 we did a major refactoring of the E2E Terraform configuration. After deploying a cluster this morning, I noticed a few moved/removed files were not reflected in the .gitignore files. This changeset updates the .gitignore to have no unstaged files after applying.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.