Skip to content

Fix Python calling and enable CI=true #528

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
phracek wants to merge 4 commits into
base: master
Choose a base branch
from
+11 −10
Open

Fix Python calling and enable CI=true #528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
575b6e6
Fix Python calling and enable CI=true
phracek Feb 24, 2026
3ad1051
Let's deliver variable CI=true into container alone.
phracek Feb 25, 2026
0f8e05d
Fedora 38 and 40 reached EOL
phracek Feb 26, 2026
f94ddfe
Update README.md file
phracek Feb 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added 20-minimal/.exclude-fedora
View file
Open in desktop
Empty file.
Empty file added 20/.exclude-fedora
View file
Open in desktop
Empty file.
Empty file added 22-minimal/.exclude-fedora
View file
Open in desktop
Empty file.
Empty file added 22/.exclude-fedora
View file
Open in desktop
Empty file.
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ Table start
-->
||CentOS Stream 9|CentOS Stream 10|Fedora|RHEL 8|RHEL 9|RHEL 10|
|:--|:--:|:--:|:--:|:--:|:--:|:--:|
|20|<details><summary>✓</summary>`quay.io/sclorg/nodejs-20-c9s`</details>||<details><summary>✓</summary>`quay.io/fedora/nodejs-20`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel8/nodejs-20`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel9/nodejs-20`</details>||
|20-minimal|<details><summary>✓</summary>`quay.io/sclorg/nodejs-20-minimal-c9s`</details>||<details><summary>✓</summary>`quay.io/fedora/nodejs-20-minimal`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel8/nodejs-20-minimal`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel9/nodejs-20-minimal`</details>||
|22||<details><summary>✓</summary>`quay.io/sclorg/nodejs-22-c10s`</details>|<details><summary>✓</summary>`quay.io/fedora/nodejs-22`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel8/nodejs-22`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel9/nodejs-22`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel10/nodejs-22`</details>|
|22-minimal||<details><summary>✓</summary>`quay.io/sclorg/nodejs-22-minimal-c10s`</details>|<details><summary>✓</summary>`quay.io/fedora/nodejs-22-minimal`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel8/nodejs-22-minimal`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel9/nodejs-22-minimal`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel10/nodejs-22-minimal`</details>|
|20|<details><summary>✓</summary>`quay.io/sclorg/nodejs-20-c9s`</details>|||<details><summary>✓</summary>`registry.redhat.io/rhel8/nodejs-20`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel9/nodejs-20`</details>||
|20-minimal|<details><summary>✓</summary>`quay.io/sclorg/nodejs-20-minimal-c9s`</details>|||<details><summary>✓</summary>`registry.redhat.io/rhel8/nodejs-20-minimal`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel9/nodejs-20-minimal`</details>||
|22||<details><summary>✓</summary>`quay.io/sclorg/nodejs-22-c10s`</details>||<details><summary>✓</summary>`registry.redhat.io/rhel8/nodejs-22`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel9/nodejs-22`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel10/nodejs-22`</details>|
|22-minimal||<details><summary>✓</summary>`quay.io/sclorg/nodejs-22-minimal-c10s`</details>||<details><summary>✓</summary>`registry.redhat.io/rhel8/nodejs-22-minimal`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel9/nodejs-22-minimal`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel10/nodejs-22-minimal`</details>|
|24|<details><summary>✓</summary>`quay.io/sclorg/nodejs-24-c9s`</details>|<details><summary>✓</summary>`quay.io/sclorg/nodejs-24-c10s`</details>|<details><summary>✓</summary>`quay.io/fedora/nodejs-24`</details>||<details><summary>✓</summary>`registry.redhat.io/rhel9/nodejs-24`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel10/nodejs-24`</details>|
|24-minimal|<details><summary>✓</summary>`quay.io/sclorg/nodejs-24-minimal-c9s`</details>|<details><summary>✓</summary>`quay.io/sclorg/nodejs-24-minimal-c10s`</details>|<details><summary>✓</summary>`quay.io/fedora/nodejs-24-minimal`</details>||<details><summary>✓</summary>`registry.redhat.io/rhel9/nodejs-24-minimal`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel10/nodejs-24-minimal`</details>|
<!--
Expand Down
7 changes: 4 additions & 3 deletions test/run-pytest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions test/test-lib-nodejs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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() {
Expand Down