From 575b6e6faeeddb77bcc9ee9fffb1f463702896eb Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Tue, 24 Feb 2026 15:40:58 +0100 Subject: [PATCH 1/4] Fix Python calling and enable CI=true Signed-off-by: Petr "Stone" Hracek --- test/run-pytest | 7 ++++--- test/run-upstream | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/test/run-pytest b/test/run-pytest index 35fca679..712e47a8 100755 --- a/test/run-pytest +++ b/test/run-pytest @@ -8,8 +8,9 @@ THISDIR=$(dirname ${BASH_SOURCE[0]}) -PYTHON_VERSION="3.12" -if [[ ! -f "/usr/bin/python$PYTHON_VERSION" ]]; then - PYTHON_VERSION="3.13" +if python3 -c 'import sys; sys.exit(0 if sys.version_info < (3,13) else 1)'; then + PYTHON_VERSION="3.12" +else + PYTHON_VERSION="3" fi cd "${THISDIR}" && "python${PYTHON_VERSION}" -m pytest -s -rA --showlocals -vv test_container_*.py diff --git a/test/run-upstream b/test/run-upstream index c64a785e..712ca6cd 100755 --- a/test/run-upstream +++ b/test/run-upstream @@ -68,6 +68,8 @@ readonly -A gitconfig=( ct_init cid_file=$CID_FILE_DIR/$(mktemp -u -p . --suffix=.cid) +export CI=true + TEST_SET=${TESTS:-$TEST_LIST_CLIENTS} ct_run_tests_from_testset "clients" if [[ "$VERSION" != "18" ]]; then From 3ad10511e95a4123de6c79b00e827262e3013022 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Wed, 25 Feb 2026 13:41:03 +0100 Subject: [PATCH 2/4] Let's deliver variable CI=true into container alone. Signed-off-by: Petr "Stone" Hracek --- test/run-upstream | 2 -- test/test-lib-nodejs.sh | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/test/run-upstream b/test/run-upstream index 712ca6cd..c64a785e 100755 --- a/test/run-upstream +++ b/test/run-upstream @@ -68,8 +68,6 @@ readonly -A gitconfig=( ct_init cid_file=$CID_FILE_DIR/$(mktemp -u -p . --suffix=.cid) -export CI=true - TEST_SET=${TESTS:-$TEST_LIST_CLIENTS} ct_run_tests_from_testset "clients" if [[ "$VERSION" != "18" ]]; then diff --git a/test/test-lib-nodejs.sh b/test/test-lib-nodejs.sh index b000e77f..4fe938ab 100644 --- a/test/test-lib-nodejs.sh +++ b/test/test-lib-nodejs.sh @@ -57,11 +57,11 @@ run_s2i_build_client() { ct_s2i_build_as_df_build_args \ "file://${test_dir}/$1" "${IMAGE_NAME}" "${IMAGE_NAME}-$1" "--ulimit nofile=4096:4096" \ ${s2i_args} \ - $(ct_build_s2i_npm_variables) -e NODE_ENV=development + $(ct_build_s2i_npm_variables) -e NODE_ENV=development -e CI=true } run_s2i_build_binary() { - ct_s2i_build_as_df file://${test_dir}/test-binary ${IMAGE_NAME} ${IMAGE_NAME}-testbinary ${s2i_args} $(ct_build_s2i_npm_variables) $1 + ct_s2i_build_as_df file://${test_dir}/test-binary ${IMAGE_NAME} ${IMAGE_NAME}-testbinary ${s2i_args} $(ct_build_s2i_npm_variables) $1 -e CI=true } run_s2i_multistage_build() { @@ -186,7 +186,7 @@ run_client_test_suite() { local cmd="npm test" # Skip style check tests [ "$1" == "prom-client" ] && cmd="sed -i.bak 's/&& npm run check-prettier //g' package.json && $cmd" - docker run --user=100001 $(ct_mount_ca_file) --rm --cidfile=${cid_file} ${IMAGE_NAME}-$1 bash -c "$cmd" + docker run --user=100001 $(ct_mount_ca_file) -e CI=true --rm --cidfile=${cid_file} ${IMAGE_NAME}-$1 bash -c "$cmd" } kill_test_application() { From 0f8e05d00c1d7d4a29a6f790eda8ba24d25b67ea Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Thu, 26 Feb 2026 08:43:37 +0100 Subject: [PATCH 3/4] Fedora 38 and 40 reached EOL Signed-off-by: Petr "Stone" Hracek --- 20-minimal/.exclude-fedora | 0 20/.exclude-fedora | 0 22-minimal/.exclude-fedora | 0 22/.exclude-fedora | 0 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 20-minimal/.exclude-fedora create mode 100644 20/.exclude-fedora create mode 100644 22-minimal/.exclude-fedora create mode 100644 22/.exclude-fedora diff --git a/20-minimal/.exclude-fedora b/20-minimal/.exclude-fedora new file mode 100644 index 00000000..e69de29b diff --git a/20/.exclude-fedora b/20/.exclude-fedora new file mode 100644 index 00000000..e69de29b diff --git a/22-minimal/.exclude-fedora b/22-minimal/.exclude-fedora new file mode 100644 index 00000000..e69de29b diff --git a/22/.exclude-fedora b/22/.exclude-fedora new file mode 100644 index 00000000..e69de29b From f94ddfe5351e0d32f2d5466fd745b7d9bc2e5ce9 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Thu, 26 Feb 2026 09:07:45 +0100 Subject: [PATCH 4/4] Update README.md file Signed-off-by: Petr "Stone" Hracek --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1c7bb12f..e013c1ba 100644 --- a/README.md +++ b/README.md @@ -26,10 +26,10 @@ Table start --> ||CentOS Stream 9|CentOS Stream 10|Fedora|RHEL 8|RHEL 9|RHEL 10| |:--|:--:|:--:|:--:|:--:|:--:|:--:| -|20|
✓`quay.io/sclorg/nodejs-20-c9s`
||
✓`quay.io/fedora/nodejs-20`
|
✓`registry.redhat.io/rhel8/nodejs-20`
|
✓`registry.redhat.io/rhel9/nodejs-20`
|| -|20-minimal|
✓`quay.io/sclorg/nodejs-20-minimal-c9s`
||
✓`quay.io/fedora/nodejs-20-minimal`
|
✓`registry.redhat.io/rhel8/nodejs-20-minimal`
|
✓`registry.redhat.io/rhel9/nodejs-20-minimal`
|| -|22||
✓`quay.io/sclorg/nodejs-22-c10s`
|
✓`quay.io/fedora/nodejs-22`
|
✓`registry.redhat.io/rhel8/nodejs-22`
|
✓`registry.redhat.io/rhel9/nodejs-22`
|
✓`registry.redhat.io/rhel10/nodejs-22`
| -|22-minimal||
✓`quay.io/sclorg/nodejs-22-minimal-c10s`
|
✓`quay.io/fedora/nodejs-22-minimal`
|
✓`registry.redhat.io/rhel8/nodejs-22-minimal`
|
✓`registry.redhat.io/rhel9/nodejs-22-minimal`
|
✓`registry.redhat.io/rhel10/nodejs-22-minimal`
| +|20|
✓`quay.io/sclorg/nodejs-20-c9s`
|||
✓`registry.redhat.io/rhel8/nodejs-20`
|
✓`registry.redhat.io/rhel9/nodejs-20`
|| +|20-minimal|
✓`quay.io/sclorg/nodejs-20-minimal-c9s`
|||
✓`registry.redhat.io/rhel8/nodejs-20-minimal`
|
✓`registry.redhat.io/rhel9/nodejs-20-minimal`
|| +|22||
✓`quay.io/sclorg/nodejs-22-c10s`
||
✓`registry.redhat.io/rhel8/nodejs-22`
|
✓`registry.redhat.io/rhel9/nodejs-22`
|
✓`registry.redhat.io/rhel10/nodejs-22`
| +|22-minimal||
✓`quay.io/sclorg/nodejs-22-minimal-c10s`
||
✓`registry.redhat.io/rhel8/nodejs-22-minimal`
|
✓`registry.redhat.io/rhel9/nodejs-22-minimal`
|
✓`registry.redhat.io/rhel10/nodejs-22-minimal`
| |24|
✓`quay.io/sclorg/nodejs-24-c9s`
|
✓`quay.io/sclorg/nodejs-24-c10s`
|
✓`quay.io/fedora/nodejs-24`
||
✓`registry.redhat.io/rhel9/nodejs-24`
|
✓`registry.redhat.io/rhel10/nodejs-24`
| |24-minimal|
✓`quay.io/sclorg/nodejs-24-minimal-c9s`
|
✓`quay.io/sclorg/nodejs-24-minimal-c10s`
|
✓`quay.io/fedora/nodejs-24-minimal`
||
✓`registry.redhat.io/rhel9/nodejs-24-minimal`
|
✓`registry.redhat.io/rhel10/nodejs-24-minimal`
|