From 126608d4c2f654122b29e132a97ea32112440c4b Mon Sep 17 00:00:00 2001
From: "d.kovalenko" <dmitry.lipetsk@gmail.com>
Date: Fri, 21 Mar 2025 12:41:30 +0300
Subject: [PATCH 1/2] [CI] work with 'time' is corrected

AltLinux 10 does not support the sequential "time <set_env> coverage run ...".

Because this OS does not has a builtin command 'time' in bash.

https://forum.altlinux.org/index.php?topic=48342.0

We will install 'time' manually and use another command "<set_env> time coverage run ..." that works without problems but it requires to install 'time' on Ubuntu 2024.04, too.

AlpineLinux processes a new command line without any problems.
---
 Dockerfile--ubuntu_24_04.tmpl |  1 +
 run_tests.sh                  | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Dockerfile--ubuntu_24_04.tmpl b/Dockerfile--ubuntu_24_04.tmpl
index c1ddeab6..3bdc6640 100644
--- a/Dockerfile--ubuntu_24_04.tmpl
+++ b/Dockerfile--ubuntu_24_04.tmpl
@@ -9,6 +9,7 @@ RUN apt update
 RUN apt install -y sudo curl ca-certificates
 RUN apt update
 RUN apt install -y openssh-server
+RUN apt install -y time
 
 RUN apt update
 RUN apt install -y postgresql-common
diff --git a/run_tests.sh b/run_tests.sh
index 0fecde60..f12b329b 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -45,15 +45,13 @@ time coverage run -a -m pytest -l -v -n 4 -k "${TEST_FILTER}"
 
 
 # run tests (PG_BIN)
-time \
-	PG_BIN=$(pg_config --bindir) \
-	coverage run -a -m pytest -l -v -n 4 -k "${TEST_FILTER}"
+PG_BIN=$(pg_config --bindir) \
+time coverage run -a -m pytest -l -v -n 4 -k "${TEST_FILTER}"
 
 
 # run tests (PG_CONFIG)
-time \
-	PG_CONFIG=$(pg_config --bindir)/pg_config \
-	coverage run -a -m pytest -l -v -n 4 -k "${TEST_FILTER}"
+PG_CONFIG=$(pg_config --bindir)/pg_config \
+time coverage run -a -m pytest -l -v -n 4 -k "${TEST_FILTER}"
 
 
 # show coverage

From 62d1d2048fd8906ceed7099a4440617842d3e1c4 Mon Sep 17 00:00:00 2001
From: "d.kovalenko" <dmitry.lipetsk@gmail.com>
Date: Fri, 21 Mar 2025 12:44:34 +0300
Subject: [PATCH 2/2] [CI] An initization of python virtualenv is simplified

Let's avoid creating useless environment variables.
---
 run_tests.sh | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/run_tests.sh b/run_tests.sh
index f12b329b..a40a97cf 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -8,24 +8,17 @@ if [ -z ${TEST_FILTER+x} ]; \
 then export TEST_FILTER="TestgresTests or (TestTestgresCommon and (not remote_ops))"; \
 fi
 
-# choose python version
-echo python version is $PYTHON_VERSION
-VIRTUALENV="virtualenv --python=/usr/bin/python$PYTHON_VERSION"
-PIP="pip$PYTHON_VERSION"
-
 # fail early
 echo check that pg_config is in PATH
 command -v pg_config
 
-# prepare environment
-VENV_PATH=/tmp/testgres_venv
+# prepare python environment
+VENV_PATH="/tmp/testgres_venv"
 rm -rf $VENV_PATH
-$VIRTUALENV $VENV_PATH
+virtualenv --python="/usr/bin/python${PYTHON_VERSION}" "${VENV_PATH}"
 export VIRTUAL_ENV_DISABLE_PROMPT=1
-source $VENV_PATH/bin/activate
-
-# install utilities
-$PIP install coverage flake8 psutil Sphinx pytest pytest-xdist psycopg2 six psutil
+source "${VENV_PATH}/bin/activate"
+pip install coverage flake8 psutil Sphinx pytest pytest-xdist psycopg2 six psutil
 
 # install testgres' dependencies
 export PYTHONPATH=$(pwd)