Skip to content

Commit 43374c5

Browse files
committed
Introduce a hidden property to store the os version.
Does not affect jobs in this repo.
1 parent d388a43 commit 43374c5

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

ci/common.jsonnet

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -451,18 +451,21 @@ local common_json = import "../common.json";
451451
local aarch64 = { arch:: "aarch64", capabilities+: [self.arch] },
452452

453453
local ol_distro = { os_distro:: "ol" },
454+
local ol7_distro = ol_distro + { os_distro_version:: "7" },
455+
local ol8_distro = ol_distro + { os_distro_version:: "8" },
456+
local ol9_distro = ol_distro + { os_distro_version:: "9" },
454457

455458
linux_amd64: self.linux_amd64_ol7,
456-
linux_amd64_ol7: linux + amd64 + ol7 + ol_distro,
457-
linux_amd64_ol8: linux + amd64 + ol8 + ol_distro,
458-
linux_amd64_ol9: linux + amd64 + ol9 + ol_distro,
459+
linux_amd64_ol7: linux + amd64 + ol7 + ol7_distro,
460+
linux_amd64_ol8: linux + amd64 + ol8 + ol8_distro,
461+
linux_amd64_ol9: linux + amd64 + ol9 + ol9_distro,
459462

460463
linux_aarch64: self.linux_aarch64_ol7,
461-
linux_aarch64_ol7: linux + aarch64 + ol7 + ol_distro,
462-
linux_aarch64_ol8: linux + aarch64 + ol8 + ol_distro,
463-
linux_aarch64_ol9: linux + aarch64 + ol9 + ol_distro,
464+
linux_aarch64_ol7: linux + aarch64 + ol7 + ol7_distro,
465+
linux_aarch64_ol8: linux + aarch64 + ol8 + ol8_distro,
466+
linux_aarch64_ol9: linux + aarch64 + ol9 + ol9_distro,
464467

465-
linux_amd64_ubuntu: linux + amd64 + ubuntu22 + { os_distro:: "ubuntu" },
468+
linux_amd64_ubuntu: linux + amd64 + ubuntu22 + { os_distro:: "ubuntu", os_distro_version:: "22" },
466469

467470
darwin_amd64: darwin + amd64,
468471
darwin_aarch64: darwin + aarch64,

0 commit comments

Comments
 (0)