Make paths in e2e/terraform/ directory relative to the module #24664
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
tgross
reviewed
Dec 13, 2024
e2e/terraform/terraform.tfvars
Outdated
| #nomad_local_binary_client_windows_2016_amd64 = ["../../pkg/windows_amd64/nomad.exe"] | ||
| nomad_license = "" | ||
| consul_license = "" |
| EOM | ||
| } | ||
| } |
e2e/terraform/nomad-acls.tf
Outdated
Comment on lines
39
to
40
| export NOMAD_CLIENT_CERT="${path.module}/etc/nomad.d/tls/agent.crt" | ||
| export NOMAD_CLIENT_KEY="${path.module}/etc/nomad.d/tls/agent.key" |
There was a problem hiding this comment.
Isn't this path the path on the server, not the terraform environment? I don't think we want to change this.
e2e/terraform/compute.tf
Outdated
| @@ -98,10 +100,10 @@ data "aws_ami" "ubuntu_jammy_amd64" { | |||
| values = ["Ubuntu"] | |||
| } | |||
|
|
|||
| filter { | |||
| /* filter { | |||
There was a problem hiding this comment.
This filter was removed for testing, but should we restore it for the merge to main?
There was a problem hiding this comment.
right, my bad, they are commented for local testing
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
As part if the effort to make the e2e terraform cluster provide code an independent usable module, all the calls to internal paths need to be make relative to the module instead of absolute to the root. This PR introduces that change.
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.