From 2a731cfaf0c0d27d898721631377f9fb923d8322 Mon Sep 17 00:00:00 2001 From: satya-nr Date: Wed, 29 Jul 2026 11:20:37 +0530 Subject: [PATCH 1/3] Add Debian 13 (trixie) and Windows Server 2025 support --- versions/debian_13_trixie.yml | 7 +++++++ versions/windows-server-2025.yml | 7 +++++++ 2 files changed, 14 insertions(+) create mode 100644 versions/debian_13_trixie.yml create mode 100644 versions/windows-server-2025.yml diff --git a/versions/debian_13_trixie.yml b/versions/debian_13_trixie.yml new file mode 100644 index 00000000..8bae74f5 --- /dev/null +++ b/versions/debian_13_trixie.yml @@ -0,0 +1,7 @@ +osDistro: debian +osVersion: trixie +packages: + - arch: amd64 + ami: ami-05f8ccd3d6e889ba8 + - arch: arm64 + ami: ami-0722cf3363128cd46 diff --git a/versions/windows-server-2025.yml b/versions/windows-server-2025.yml new file mode 100644 index 00000000..f33c5f74 --- /dev/null +++ b/versions/windows-server-2025.yml @@ -0,0 +1,7 @@ +osDistro: windows-server +osVersion: 2025 +packages: + - arch: win64 + ami: ami-0daff962b1c050d36 + - arch: win32 + ami: ami-0daff962b1c050d36 From 662d57c08c36a3d79fe39a9654ef47720564d425 Mon Sep 17 00:00:00 2001 From: satya-nr Date: Fri, 31 Jul 2026 00:47:34 +0530 Subject: [PATCH 2/3] TEMP: force windows-server-2025 to look missing so it gets real E2E test coverage (NR-531052) --- versions/strategyMatrix.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/versions/strategyMatrix.py b/versions/strategyMatrix.py index 80eba03f..c6d1c1c2 100644 --- a/versions/strategyMatrix.py +++ b/versions/strategyMatrix.py @@ -136,7 +136,13 @@ def sles_package_details(pkg): def windows_package_details(data): windows_target_arch = {"win32": "386", "win64": "amd64"}[data["arch"]] - target_package_name = f"fb-windows-{data['fbVersion']}-{windows_target_arch}.zip" + # TEMPORARY (NR-531052): windows-server-2025 shares the same upstream package as + # windows-server-2019/2022, so it never looks "missing" and never gets a real test run. + # Force a distinct, never-yet-published target name just for this one-off validation so it + # gets built/tested for real, while still downloading the real, unmodified 5.0.8 upstream + # package (packageUrl below is untouched). Revert this suffix once validated. + test_suffix = "-test2025" if data.get("osVersion") == 2025 else "" + target_package_name = f"fb-windows-{data['fbVersion']}{test_suffix}-{windows_target_arch}.zip" return { "packageUrl": f"http://packages.fluentbit.io/windows/fluent-bit-{data['fbVersion']}-{data['arch']}.zip", "targetPackageName": target_package_name, From 44b8e2ee30742bde27ed87176904ebebaf1d0c25 Mon Sep 17 00:00:00 2001 From: satya-nr Date: Fri, 31 Jul 2026 02:07:42 +0530 Subject: [PATCH 3/3] Revert "TEMP: force windows-server-2025 to look missing so it gets real E2E test coverage (NR-531052)" This reverts commit 662d57c08c36a3d79fe39a9654ef47720564d425. --- versions/strategyMatrix.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/versions/strategyMatrix.py b/versions/strategyMatrix.py index c6d1c1c2..80eba03f 100644 --- a/versions/strategyMatrix.py +++ b/versions/strategyMatrix.py @@ -136,13 +136,7 @@ def sles_package_details(pkg): def windows_package_details(data): windows_target_arch = {"win32": "386", "win64": "amd64"}[data["arch"]] - # TEMPORARY (NR-531052): windows-server-2025 shares the same upstream package as - # windows-server-2019/2022, so it never looks "missing" and never gets a real test run. - # Force a distinct, never-yet-published target name just for this one-off validation so it - # gets built/tested for real, while still downloading the real, unmodified 5.0.8 upstream - # package (packageUrl below is untouched). Revert this suffix once validated. - test_suffix = "-test2025" if data.get("osVersion") == 2025 else "" - target_package_name = f"fb-windows-{data['fbVersion']}{test_suffix}-{windows_target_arch}.zip" + target_package_name = f"fb-windows-{data['fbVersion']}-{windows_target_arch}.zip" return { "packageUrl": f"http://packages.fluentbit.io/windows/fluent-bit-{data['fbVersion']}-{data['arch']}.zip", "targetPackageName": target_package_name,