Merge branch 'kerl/ci' into 'master'

Bump python and postrgres in CI

See merge request klub-dev-ens/gestioCOF!419
This commit is contained in:
Ludovic Stephan 2020-05-08 13:06:29 +02:00
commit d4a9e96e38

View file

@ -1,4 +1,4 @@
image: "python:3.5" image: "python:3.7"
variables: variables:
# GestioCOF settings # GestioCOF settings
@ -18,7 +18,8 @@ variables:
# psql password authentication # psql password authentication
PGPASSWORD: $POSTGRES_PASSWORD PGPASSWORD: $POSTGRES_PASSWORD
.test_template: test:
stage: test
before_script: before_script:
- mkdir -p vendor/{pip,apt} - mkdir -p vendor/{pip,apt}
- apt-get update -q && apt-get -o dir::cache::archives="vendor/apt" install -yqq postgresql-client - apt-get update -q && apt-get -o dir::cache::archives="vendor/apt" install -yqq postgresql-client
@ -33,7 +34,7 @@ variables:
after_script: after_script:
- coverage report - coverage report
services: services:
- postgres:9.6 - postgres:11.7
- redis:latest - redis:latest
cache: cache:
key: test key: test
@ -43,18 +44,7 @@ variables:
# Keep this disabled for now, as it may kill GitLab... # Keep this disabled for now, as it may kill GitLab...
# coverage: '/TOTAL.*\s(\d+\.\d+)\%$/' # coverage: '/TOTAL.*\s(\d+\.\d+)\%$/'
test35:
extends: ".test_template"
image: "python:3.5"
stage: test
test37:
extends: ".test_template"
image: "python:3.7"
stage: test
linters: linters:
image: python:3.6
stage: test stage: test
before_script: before_script:
- mkdir -p vendor/pip - mkdir -p vendor/pip
@ -81,7 +71,7 @@ migration_checks:
script: python manage.py makemigrations --dry-run --check script: python manage.py makemigrations --dry-run --check
services: services:
# this should not be necessary… # this should not be necessary…
- postgres:9.6 - postgres:11.7
cache: cache:
key: migration_checks key: migration_checks
paths: paths: