Skip to content

added 3.7-rc to test matrix, and changed how we build the image a bit #160

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

Closed
wants to merge 1 commit into from
Closed

added 3.7-rc to test matrix, and changed how we build the image a bit #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 tests/.jenkins_exclude.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ exclude:
FRAMEWORK: django-master
- PYTHON_VERSION: python-3.4
FRAMEWORK: django-master
- PYTHON_VERSION: python-3.7-rc
FRAMEWORK: django-1.11 # see https://code.djangoproject.com/ticket/28814
- PYTHON_VERSION: pypy-2
FRAMEWORK: django-2.0
- PYTHON_VERSION: pypy-2
Expand Down
1 change: 1 addition & 0 deletions tests/.jenkins_python.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ PYTHON_VERSION:
- python-3.4
- python-3.5
- python-3.6
- python-3.7-rc
- pypy-2
- pypy-3
4 changes: 1 addition & 3 deletions tests/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ services:
- "6379:6379"

run_tests:
build:
context: .
dockerfile: Dockerfile
image: apm-agent-python:${PYTHON_VERSION}
environment:
MONGODB_HOST: 'mongodb'
REDIS_HOST: 'redis'
Expand Down
4 changes: 2 additions & 2 deletions tests/scripts/docker/docs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ set -e

cd tests

docker build -t "lint-docs" -f ./DockerfileDocs .
docker build -t "docs:python" -f ./DockerfileDocs .
docker run -e LOCAL_USER_ID=$UID \
-v "$(dirname $(pwd))":/app \
-i "lint-docs" \
-i "docs:python" \
make docs
6 changes: 4 additions & 2 deletions tests/scripts/docker/run_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ docker_pip_cache="/tmp/cache/pip"

cd tests

docker-compose build --pull --build-arg PYTHON_IMAGE=${1/-/:} run_tests # replace - with : to get the correct docker image
docker-compose run \
echo ${1}

docker build --pull --force-rm --build-arg PYTHON_IMAGE=${1/-/:} -t apm-agent-python:${1} . # replace - with : to get the correct docker image
PYTHON_VERSION=${1} docker-compose run \
-e LOCAL_USER_ID=$UID \
-e PYTHONDONTWRITEBYTECODE=1 -e WEBFRAMEWORK=$2 -e PIP_CACHE=${docker_pip_cache} \
-e WITH_COVERAGE=true \
Expand Down