enos: handle upgrade from FIPS 140-2 editions for all mixed release branches (#9408) (#9472)

Signed-off-by: Ryan Cragun <me@ryan.ec>
Co-authored-by: Ryan Cragun <me@ryan.ec>
This commit is contained in:
Vault Automation 2025-09-23 14:36:29 -04:00 committed by GitHub
parent 5d9b28301a
commit 3886debfa1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 8 deletions

View file

@ -303,10 +303,8 @@ scenario "autopilot" {
packages = concat(global.packages, global.distro_packages[matrix.distro][global.distro_version[matrix.distro]])
release = {
edition = strcontains(matrix.edition, "fips1403") ? (
// Our eventual constraint will need to factor in each release branch that is mixed, e.g.
// semverconstraint(var.vault_upgrade_initial_version, "<=1.19.4-0,>=1.19.0-0 || <=1.18.10-0,>=1.18.0-0 || <=1.17.17-0,>=1.17.0-0 || <=1.16.21-0")
// But for now we've only got to consider before and after 1.19.4
semverconstraint(var.vault_upgrade_initial_version, "<1.19.4-0")
// Handle mixed fips1402 edition lineages.
semverconstraint(var.vault_upgrade_initial_version, "<1.19.4-0,>=1.19.0-0 || <1.18.15-0,>=1.18.0-0 || <1.18.0,>=1.17.0-0 || <1.16.26-0")
? replace(matrix.edition, "fips1403", "fips1402")
: matrix.edition
) : matrix.edition

View file

@ -357,10 +357,8 @@ scenario "upgrade" {
packages = concat(global.packages, global.distro_packages[matrix.distro][global.distro_version[matrix.distro]])
release = {
edition = strcontains(matrix.edition, "fips1403") ? (
// Our eventual constraint will need to factor in each release branch that is mixed, e.g.
// semverconstraint(var.vault_upgrade_initial_version, "<=1.19.4-0,>=1.19.0-0 || <=1.18.10-0,>=1.18.0-0 || <=1.17.17-0,>=1.17.0-0 || <=1.16.21-0")
// But for now we've only got to consider before and after 1.19.4
semverconstraint(var.vault_upgrade_initial_version, "<1.19.4-0")
// Handle mixed fips1402 edition lineages.
semverconstraint(var.vault_upgrade_initial_version, "<1.19.4-0,>=1.19.0-0 || <1.18.15-0,>=1.18.0-0 || <1.18.0,>=1.17.0-0 || <1.16.26-0")
? replace(matrix.edition, "fips1403", "fips1402")
: matrix.edition
) : matrix.edition