From 772e3aa75b275d0d59ffd998e156ee1fc3232ca6 Mon Sep 17 00:00:00 2001 From: "d.kovalenko" Date: Fri, 23 Jan 2026 20:18:21 +0300 Subject: [PATCH 1/7] [CI] run_tests.sh uses "pythonX -m venv ..." --- run_tests.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/run_tests.sh b/run_tests.sh index 5dc0e444..a8bb0f44 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -13,8 +13,7 @@ command -v pg_config # prepare python environment VENV_PATH="/tmp/testgres_venv" rm -rf $VENV_PATH -virtualenv --python="/usr/bin/python${PYTHON_VERSION}" "${VENV_PATH}" -export VIRTUAL_ENV_DISABLE_PROMPT=1 +python${PYTHON_VERSION} -m venv "${VENV_PATH}" source "${VENV_PATH}/bin/activate" pip install -r tests/requirements.txt From bf0fdb42b3f8e7b3581c568529e29163d53effd5 Mon Sep 17 00:00:00 2001 From: "d.kovalenko" Date: Fri, 23 Jan 2026 20:22:48 +0300 Subject: [PATCH 2/7] [CI] altlinux does not install python virtualenv --- Dockerfile--altlinux_10.tmpl | 11 ----------- Dockerfile--altlinux_11.tmpl | 11 ----------- 2 files changed, 22 deletions(-) diff --git a/Dockerfile--altlinux_10.tmpl b/Dockerfile--altlinux_10.tmpl index 5752b698..e099cc15 100644 --- a/Dockerfile--altlinux_10.tmpl +++ b/Dockerfile--altlinux_10.tmpl @@ -64,19 +64,8 @@ RUN ln -s /pg/postgres/install/lib/libpq.so.5.17 /usr/lib64/libpq.so.5 FROM base1_with_pg-${PG_VERSION} as base2_with_python-3 RUN apt-get install -y python3 RUN apt-get install -y python3-dev -RUN apt-get install -y python3-module-virtualenv RUN apt-get install -y python3-modules-sqlite3 -# AltLinux does not have "generic" virtualenv utility. Let's create it. -RUN if [[ -f "/usr/bin/virtualenv" ]] ; then \ - echo AAA; \ - elif [[ -f "/usr/bin/virtualenv3" ]] ; then \ - ln -s /usr/bin/virtualenv3 /usr/bin/virtualenv; \ - else \ - echo "/usr/bin/virtualenv is not created!"; \ - exit 1; \ - fi - ENV PYTHON_VERSION=3 # --------------------------------------------- final diff --git a/Dockerfile--altlinux_11.tmpl b/Dockerfile--altlinux_11.tmpl index 5d3615fe..9c997f7e 100644 --- a/Dockerfile--altlinux_11.tmpl +++ b/Dockerfile--altlinux_11.tmpl @@ -67,19 +67,8 @@ RUN ln -s /pg/postgres/install/lib/libpq.so.5.17 /usr/lib64/libpq.so.5 FROM base1_with_pg-${PG_VERSION} as base2_with_python-3 RUN apt-get install -y python3 RUN apt-get install -y python3-dev -RUN apt-get install -y python3-module-virtualenv RUN apt-get install -y python3-modules-sqlite3 -# AltLinux does not have "generic" virtualenv utility. Let's create it. -RUN if [[ -f "/usr/bin/virtualenv" ]] ; then \ - echo AAA; \ - elif [[ -f "/usr/bin/virtualenv3" ]] ; then \ - ln -s /usr/bin/virtualenv3 /usr/bin/virtualenv; \ - else \ - echo "/usr/bin/virtualenv is not created!"; \ - exit 1; \ - fi - ENV PYTHON_VERSION=3 # --------------------------------------------- final From 8e49971e0190f94f4af99905f72b0c7669a24f8a Mon Sep 17 00:00:00 2001 From: "d.kovalenko" Date: Fri, 23 Jan 2026 20:25:35 +0300 Subject: [PATCH 3/7] [CI] ubuntu 24_04 does not install python3-virtualenv --- Dockerfile--ubuntu_24_04.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile--ubuntu_24_04.tmpl b/Dockerfile--ubuntu_24_04.tmpl index bb77b84a..ae68e1a0 100644 --- a/Dockerfile--ubuntu_24_04.tmpl +++ b/Dockerfile--ubuntu_24_04.tmpl @@ -41,7 +41,7 @@ RUN sh -c "echo postgres ALL=NOPASSWD:/usr/sbin/service ssh start" >> /etc/sudoe # --------------------------------------------- base2_with_python-3 FROM base1 as base2_with_python-3 -RUN apt install -y python3 python3-dev python3-virtualenv libpq-dev +RUN apt install -y python3 python3-dev libpq-dev ENV PYTHON_VERSION=3 # --------------------------------------------- final From c8592cbc863d8205b5c53d8bd4cbcfb8a99ebac2 Mon Sep 17 00:00:00 2001 From: "d.kovalenko" Date: Fri, 23 Jan 2026 20:26:45 +0300 Subject: [PATCH 4/7] [CI] std/std-all do not install py-virtualenv --- Dockerfile--std-all.tmpl | 2 +- Dockerfile--std.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile--std-all.tmpl b/Dockerfile--std-all.tmpl index e05acd87..7ebb6194 100644 --- a/Dockerfile--std-all.tmpl +++ b/Dockerfile--std-all.tmpl @@ -6,7 +6,7 @@ FROM postgres:${PG_VERSION}-alpine as base1 # --------------------------------------------- base2_with_python-3 FROM base1 as base2_with_python-3 -RUN apk add --no-cache curl python3 python3-dev build-base musl-dev linux-headers py-virtualenv +RUN apk add --no-cache curl python3 python3-dev build-base musl-dev linux-headers ENV PYTHON_VERSION=3 # --------------------------------------------- final diff --git a/Dockerfile--std.tmpl b/Dockerfile--std.tmpl index f0bbf5b5..76e004f0 100644 --- a/Dockerfile--std.tmpl +++ b/Dockerfile--std.tmpl @@ -6,7 +6,7 @@ FROM postgres:${PG_VERSION}-alpine as base1 # --------------------------------------------- base2_with_python-3 FROM base1 as base2_with_python-3 -RUN apk add --no-cache curl python3 python3-dev build-base musl-dev linux-headers py-virtualenv +RUN apk add --no-cache curl python3 python3-dev build-base musl-dev linux-headers ENV PYTHON_VERSION=3 # --------------------------------------------- final From 26fa916c75e23cd0741cd3b3c4dea23a54d4eed6 Mon Sep 17 00:00:00 2001 From: "d.kovalenko" Date: Fri, 23 Jan 2026 20:29:08 +0300 Subject: [PATCH 5/7] [CI] altlinux dockerfiles are updated (cleanup) --- Dockerfile--altlinux_10.tmpl | 2 -- Dockerfile--altlinux_11.tmpl | 2 -- 2 files changed, 4 deletions(-) diff --git a/Dockerfile--altlinux_10.tmpl b/Dockerfile--altlinux_10.tmpl index e099cc15..e82c9398 100644 --- a/Dockerfile--altlinux_10.tmpl +++ b/Dockerfile--altlinux_10.tmpl @@ -90,8 +90,6 @@ RUN mkdir -p ~/.ssh # # Altlinux 10 and 11 too slowly create a new SSH connection (x6). # -# So, we exclude the "remote" tests until this problem has been resolved. -# ENTRYPOINT sh -c " \ set -eux; \ diff --git a/Dockerfile--altlinux_11.tmpl b/Dockerfile--altlinux_11.tmpl index 9c997f7e..cf549926 100644 --- a/Dockerfile--altlinux_11.tmpl +++ b/Dockerfile--altlinux_11.tmpl @@ -93,8 +93,6 @@ RUN mkdir -p ~/.ssh # # Altlinux 10 and 11 too slowly create a new SSH connection (x6). # -# So, we exclude the "remote" tests until this problem has been resolved. -# ENTRYPOINT sh -c " \ set -eux; \ From 83939ac3545f288145976a20a30bb5744c3264ff Mon Sep 17 00:00:00 2001 From: "d.kovalenko" Date: Fri, 23 Jan 2026 20:51:15 +0300 Subject: [PATCH 6/7] [CI] fix: ubuntu 24.04 requires python3-venv and build-essential --- Dockerfile--ubuntu_24_04.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile--ubuntu_24_04.tmpl b/Dockerfile--ubuntu_24_04.tmpl index ae68e1a0..ca26afea 100644 --- a/Dockerfile--ubuntu_24_04.tmpl +++ b/Dockerfile--ubuntu_24_04.tmpl @@ -41,7 +41,7 @@ RUN sh -c "echo postgres ALL=NOPASSWD:/usr/sbin/service ssh start" >> /etc/sudoe # --------------------------------------------- base2_with_python-3 FROM base1 as base2_with_python-3 -RUN apt install -y python3 python3-dev libpq-dev +RUN apt install -y python3 python3-dev python3-venv libpq-dev build-essential ENV PYTHON_VERSION=3 # --------------------------------------------- final From 0610303ec4ebe85b5724248b395fda511f70f95d Mon Sep 17 00:00:00 2001 From: "d.kovalenko" Date: Fri, 23 Jan 2026 22:31:26 +0300 Subject: [PATCH 7/7] [CI] run_tests.sh sets VIRTUAL_ENV_DISABLE_PROMPT=1 (restored) --- run_tests.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/run_tests.sh b/run_tests.sh index a8bb0f44..f4a978c6 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -14,6 +14,7 @@ command -v pg_config VENV_PATH="/tmp/testgres_venv" rm -rf $VENV_PATH python${PYTHON_VERSION} -m venv "${VENV_PATH}" +export VIRTUAL_ENV_DISABLE_PROMPT=1 source "${VENV_PATH}/bin/activate" pip install -r tests/requirements.txt