Skip to content

Commit be7c446

Browse files
backport of commit 87f1d18 (#30579)
Co-authored-by: Luis (LT) Carbonell <[email protected]>
1 parent 348dbf1 commit be7c446

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

enos/enos-scenario-autopilot.hcl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,11 @@ scenario "autopilot" {
267267
license = matrix.edition != "ce" ? step.read_license.license : null
268268
packages = concat(global.packages, global.distro_packages[matrix.distro][global.distro_version[matrix.distro]])
269269
release = {
270-
edition = matrix.edition
270+
edition = strcontains(matrix.edition, "fips1403") ? (
271+
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")
272+
? replace(matrix.edition, "fips1403", "fips1402")
273+
: matrix.edition
274+
) : matrix.edition
271275
version = var.vault_upgrade_initial_version
272276
}
273277
seal_attributes = step.create_seal_key.attributes

enos/enos-scenario-upgrade.hcl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,11 @@ scenario "upgrade" {
321321
manage_service = true # always handle systemd for released bundles
322322
packages = concat(global.packages, global.distro_packages[matrix.distro][global.distro_version[matrix.distro]])
323323
release = {
324-
edition = matrix.edition
324+
edition = strcontains(matrix.edition, "fips1403") ? (
325+
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")
326+
? replace(matrix.edition, "fips1403", "fips1402")
327+
: matrix.edition
328+
) : matrix.edition
325329
version = var.vault_upgrade_initial_version
326330
}
327331
seal_attributes = step.create_seal_key.attributes

0 commit comments

Comments
 (0)