Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions Dockerfile--alpine.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ RUN apk add --no-cache \
sudo \
git

ENV PYTHON_BINARY=python3

# --------------------------------------------- base2
FROM base1 AS base2

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile--altlinux_10.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN apt-get update && apt-get install -y \
python3-dev \
&& apt-get clean

ENV PYTHON_VERSION=3
ENV PYTHON_BINARY=python3

# --------------------------------------------- final
FROM base2_with_python-${PYTHON_VERSION} AS final
Expand Down Expand Up @@ -90,7 +90,7 @@ if [ -n \"${TEST_CFG__REMOTE_SSH_KEY:-}\" ]; then \
fi; \
ls -la ./; \
# AUTOMATIC TRANSFER: Save all TEST_CFG__xxx variables to a temporary file \
(env | grep '^TEST_CFG__' | sed 's/^/export /' || echo '') > ./test_cfg_env.sh; \
(env | grep -E '^(TEST_CFG__|PYTHON_BINARY)' | sed 's/^/export /' || echo '') > ./test_cfg_env.sh; \
chown test:test ./test_cfg_env.sh; \
cat ./test_cfg_env.sh; \
# Run su -, pull in the file with variables and start the tests \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile--altlinux_11.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ RUN apt-get update && apt-get install -y \
python3-dev \
&& apt-get clean

ENV PYTHON_VERSION=3
ENV PYTHON_BINARY=python3

# --------------------------------------------- final
FROM base2_with_python-${PYTHON_VERSION} AS final
Expand Down Expand Up @@ -91,7 +91,7 @@ if [ -n \"${TEST_CFG__REMOTE_SSH_KEY:-}\" ]; then \
fi; \
ls -la ./; \
# AUTOMATIC TRANSFER: Save all TEST_CFG__xxx variables to a temporary file \
(env | grep '^TEST_CFG__' | sed 's/^/export /' || echo '') > ./test_cfg_env.sh; \
(env | grep -E '^(TEST_CFG__|PYTHON_BINARY)' | sed 's/^/export /' || echo '') > ./test_cfg_env.sh; \
chown test:test ./test_cfg_env.sh; \
cat ./test_cfg_env.sh; \
# Run su -, pull in the file with variables and start the tests \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile--astralinux_1_7.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
python3-venv \
&& rm -rf /var/lib/apt/lists/*

ENV PYTHON_VERSION=3
ENV PYTHON_BINARY=python3

# --------------------------------------------- final
FROM base2_with_python-${PYTHON_VERSION} AS final
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile--ubuntu_24_04.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
python3-venv \
&& rm -rf /var/lib/apt/lists/*

ENV PYTHON_VERSION=3
ENV PYTHON_BINARY=python3

# --------------------------------------------- final
FROM base2_with_python-${PYTHON_VERSION} AS final
Expand Down
6 changes: 3 additions & 3 deletions run_tests3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ set -eux
# prepare python environment
VENV_PATH="/tmp/testgres_venv"
rm -rf $VENV_PATH
python3 -m venv "${VENV_PATH}"
${PYTHON_BINARY} -m venv "${VENV_PATH}"
export VIRTUAL_ENV_DISABLE_PROMPT=1
source "${VENV_PATH}/bin/activate"
pip install --upgrade pip setuptools wheel
python3 -m pip install -r tests/requirements.txt
${PYTHON_BINARY} -m pip install -r tests/requirements.txt

export -p

# run builtin tests
python3 -m pytest -l -vvv -n 4
${PYTHON_BINARY} -m pytest -l -vvv -n 4

set +eux