NotificationsYou must be signed in to change notification settings
Fork37
Star150

Commitf0bf7a8

authored

CI files are updated (#225)

* [CI] work with 'time' is correctedAltLinux 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.0We 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.* [CI] An initization of python virtualenv is simplifiedLet's avoid creating useless environment variables.

1 parentddfaff4 commitf0bf7a8Copy full SHA for f0bf7a8

File tree

2 files changed

+10

-18

lines changed

2 files changed

+10

-18

lines changed

`‎Dockerfile--ubuntu_24_04.tmpl‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ RUN apt update`
`9`	`9`	`RUN apt install -y sudo curl ca-certificates`
`10`	`10`	`RUN apt update`
`11`	`11`	`RUN apt install -y openssh-server`
	`12`	`+RUN apt install -y time`
`12`	`13`
`13`	`14`	`RUN apt update`
`14`	`15`	`RUN apt install -y postgresql-common`

`‎run_tests.sh‎`

Lines changed: 9 additions & 18 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,24 +8,17 @@ if [ -z ${TEST_FILTER+x} ]; \`
`8`	`8`	`thenexport TEST_FILTER="TestgresTests or (TestTestgresCommon and (not remote_ops))"; \`
`9`	`9`	`fi`
`10`	`10`
`11`		`-# choose python version`
`12`		`-echo python version is$PYTHON_VERSION`
`13`		`-VIRTUALENV="virtualenv --python=/usr/bin/python$PYTHON_VERSION"`
`14`		`-PIP="pip$PYTHON_VERSION"`
`15`		`-`
`16`	`11`	`# fail early`
`17`	`12`	`echo check that pg_config isin PATH`
`18`	`13`	`command -v pg_config`
`19`	`14`
`20`		`-# prepare environment`
`21`		`-VENV_PATH=/tmp/testgres_venv`
	`15`	`+# preparepythonenvironment`
	`16`	`+VENV_PATH="/tmp/testgres_venv"`
`22`	`17`	`rm -rf$VENV_PATH`
`23`		`-$VIRTUALENV$VENV_PATH`
	`18`	`+virtualenv --python="/usr/bin/python${PYTHON_VERSION}""${VENV_PATH}"`
`24`	`19`	`export VIRTUAL_ENV_DISABLE_PROMPT=1`
`25`		`-source$VENV_PATH/bin/activate`
`26`		`-`
`27`		`-# install utilities`
`28`		`-$PIP install coverage flake8 psutil Sphinx pytest pytest-xdist psycopg2 six psutil`
	`20`	`+source"${VENV_PATH}/bin/activate"`
	`21`	`+pip install coverage flake8 psutil Sphinx pytest pytest-xdist psycopg2 six psutil`
`29`	`22`
`30`	`23`	`# install testgres' dependencies`
`31`	`24`	`export PYTHONPATH=$(pwd)`
`@@ -45,15 +38,13 @@ time coverage run -a -m pytest -l -v -n 4 -k "${TEST_FILTER}"`
`45`	`38`
`46`	`39`
`47`	`40`	`# run tests (PG_BIN)`
`48`		`-time \`
`49`		`-PG_BIN=$(pg_config --bindir) \`
`50`		`-coverage run -a -m pytest -l -v -n 4 -k"${TEST_FILTER}"`
	`41`	`+PG_BIN=$(pg_config --bindir) \`
	`42`	`+time coverage run -a -m pytest -l -v -n 4 -k"${TEST_FILTER}"`
`51`	`43`
`52`	`44`
`53`	`45`	`# run tests (PG_CONFIG)`
`54`		`-time \`
`55`		`-PG_CONFIG=$(pg_config --bindir)/pg_config \`
`56`		`-coverage run -a -m pytest -l -v -n 4 -k"${TEST_FILTER}"`
	`46`	`+PG_CONFIG=$(pg_config --bindir)/pg_config \`
	`47`	`+time coverage run -a -m pytest -l -v -n 4 -k"${TEST_FILTER}"`
`57`	`48`
`58`	`49`
`59`	`50`	`# show coverage`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitf0bf7a8

File tree

2 files changed

2 files changed

`‎Dockerfile--ubuntu_24_04.tmpl‎`

`‎run_tests.sh‎`

0 commit comments