From d77a2e0d2450465a34fafb05e3a3a98a19ab9918 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Mon, 12 Jan 2026 09:55:20 +0100 Subject: [PATCH 1/3] fix(testing-tools): Re-add pytest and diff This should fix the Trino and NiFi integration tests --- CHANGELOG.md | 4 ++++ testing-tools/Dockerfile | 4 +++- testing-tools/requirements.txt | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7bbee3b11..8d321f560 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,10 @@ All notable changes to this project will be documented in this file. - opensearch: Remove the `performance-analyzer` plugin from the OpenSearch image ([#1357]). +### Fixed + +- testing-tools: Re-add `pytest` Python package as well as `diffutils` package ([#XXXX]). + [#1336]: https://github.com/stackabletech/docker-images/pull/1336 [#1337]: https://github.com/stackabletech/docker-images/pull/1337 [#1340]: https://github.com/stackabletech/docker-images/pull/1340 diff --git a/testing-tools/Dockerfile b/testing-tools/Dockerfile index d19a4309e..7bb73bf75 100644 --- a/testing-tools/Dockerfile +++ b/testing-tools/Dockerfile @@ -63,7 +63,9 @@ microdnf install \ curl \ tar \ zip \ - unzip + unzip \ + `# Required to do test assertions of files` \ + diffutils microdnf clean all rm -rf /var/cache/yum diff --git a/testing-tools/requirements.txt b/testing-tools/requirements.txt index 3a7636da1..e65890974 100644 --- a/testing-tools/requirements.txt +++ b/testing-tools/requirements.txt @@ -2,6 +2,7 @@ # Beautiful Soup pulls data out of HTML. beautifulsoup4==4.14.2 requests==2.32.5 +pytest==9.0.2 # Packages that were previously installed as system packages certifi==2025.11.12 From 337b21c71c2543974e1d71f7c6fe440b125a13a9 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Mon, 12 Jan 2026 09:56:47 +0100 Subject: [PATCH 2/3] changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d321f560..7b90a43de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,7 +28,7 @@ All notable changes to this project will be documented in this file. ### Fixed -- testing-tools: Re-add `pytest` Python package as well as `diffutils` package ([#XXXX]). +- testing-tools: Re-add `pytest` Python package as well as `diffutils` package ([#1388]). [#1336]: https://github.com/stackabletech/docker-images/pull/1336 [#1337]: https://github.com/stackabletech/docker-images/pull/1337 @@ -42,6 +42,7 @@ All notable changes to this project will be documented in this file. [#1367]: https://github.com/stackabletech/docker-images/pull/1367 [#1373]: https://github.com/stackabletech/docker-images/pull/1373 [#1386]: https://github.com/stackabletech/docker-images/pull/1386 +[#1388]: https://github.com/stackabletech/docker-images/pull/1388 ## [25.11.0] - 2025-11-07 From 0c08cd49988b616850d760628e45f3cce0d689f8 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Mon, 12 Jan 2026 09:57:23 +0100 Subject: [PATCH 3/3] Add comment --- testing-tools/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/testing-tools/requirements.txt b/testing-tools/requirements.txt index e65890974..ef48ae2a4 100644 --- a/testing-tools/requirements.txt +++ b/testing-tools/requirements.txt @@ -2,6 +2,7 @@ # Beautiful Soup pulls data out of HTML. beautifulsoup4==4.14.2 requests==2.32.5 +# Needed to run Python tests pytest==9.0.2 # Packages that were previously installed as system packages