VAULT-29583: Modernize default distributions in enos scenarios #28012
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
ryancragun
added
pr/no-changelog
pr/no-milestone
backport/ent/1.15.x+ent
github-actions
bot
added
the
hashicorp-contributed-pr
ryancragun
commented
Aug 7, 2024
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| data "aws_ami" "ubuntu_2004" { | ||
| data "aws_ami" "amzn_2" { |
There was a problem hiding this comment.
Sorry for the messy diff here. I reordered the data blocks by name and that resulted in this ugliness.
ryancragun
commented
Aug 7, 2024
| @@ -31,7 +31,7 @@ if ! out=$(jq -eMc --arg version "$version" '.keys | contains([$version])' <<< " | |||
| fi | |||
|
|
|||
| if ! out=$(jq -eMc --arg version "$version" --arg bd "$VAULT_BUILD_DATE" '.key_info[$version].build_date == $bd' <<< "$vh"); then | |||
| fail "cluster version history build date is not the expected date: expected: $VAULT_BUILD_DATE, output: $out" | |||
| fail "cluster version history build date is not the expected date: expected: true, expected date: $VAULT_BUILD_DATE, key_info: $(jq -eMc '.key_info' <<< "$vh"), output: $out" | |||
There was a problem hiding this comment.
This is fairly unrelated but when I was testing a random new SHA I didn't have the build date so this failed initially. This just improves the error message to both help that development case and to also aid any future failure discovery.
There was a problem hiding this comment.
Sweet, this error message had room for improvement for sure.
|
CI Results: |
|
Build Results: |
rebwill
approved these changes
Aug 7, 2024
| @@ -27,6 +27,7 @@ variable "token_base64" { | |||
| locals { | |||
| // The user/group name for softhsm | |||
| softhsm_groups = { | |||
| "amzn" = "ods" | |||
There was a problem hiding this comment.
Sweet to see amzn finally working with the softhsm/pkcs11 stuff 🙌
| @@ -37,14 +37,51 @@ variable "timeout" { | |||
| } | |||
|
|
|||
| locals { | |||
| packages = var.include_tools ? ["softhsm", "opensc"] : ["softhsm"] | |||
| packages = var.include_tools ? { | |||
There was a problem hiding this comment.
Packages are pain 🩸 but this is a more clear way to define them.
| @@ -31,7 +31,7 @@ if ! out=$(jq -eMc --arg version "$version" '.keys | contains([$version])' <<< " | |||
| fi | |||
|
|
|||
| if ! out=$(jq -eMc --arg version "$version" --arg bd "$VAULT_BUILD_DATE" '.key_info[$version].build_date == $bd' <<< "$vh"); then | |||
| fail "cluster version history build date is not the expected date: expected: $VAULT_BUILD_DATE, output: $out" | |||
| fail "cluster version history build date is not the expected date: expected: true, expected date: $VAULT_BUILD_DATE, key_info: $(jq -eMc '.key_info' <<< "$vh"), output: $out" | |||
There was a problem hiding this comment.
Sweet, this error message had room for improvement for sure.
Our scenarios have been running the last gen of distributions in CI. This updates our default distributions as follows: - Amazon: 2023 - Leap: 15.6 - RHEL: 8.10, 9.4 - SLES: 15.6 - Ubuntu: 20.04, 24.04 With these changes we also unlock a few new variants combinations: - `distro:amzn seal:pkcs11` - `arch:arm64 distro:leap` We also normalize our distro key for Amazon Linux to `amzn`, which matches the uname output on both versions that we've supported. Signed-off-by: Ryan Cragun <me@ryan.ec>
Signed-off-by: Ryan Cragun <me@ryan.ec>
6 tasks
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
Our scenarios have been running the last gen of distributions in CI. This updates our default distributions as follows:
With these changes we also unlock a few new variants combinations:
distro:amzn seal:pkcs11arch:arm64 distro:leapWe also normalize our distro key for Amazon Linux to
amzn, which matches the uname output on both versions that we've supported.TODO only if you're a HashiCorp employee
getting backported to N-2, use the new style
backport/ent/x.x.x+entlabelsinstead of the old style
backport/x.x.xlabels.the normal
backport/x.x.xlabel (there should be only 1).of a public function, even if that change is in a CE file, double check that
applying the patch for this PR to the ENT repo and running tests doesn't
break any tests. Sometimes ENT only tests rely on public functions in CE
files.
in the PR description, commit message, or branch name.
description. Also, make sure the changelog is in this PR, not in your ENT PR.