Commit f4c7a7d4 authored by Johan Bloemberg's avatar Johan Bloemberg

Adjust gitlab CI config for make

parent 5fbf86ee
Pipeline #38234319 failed with stage
in 4 minutes and 6 seconds
...@@ -18,7 +18,7 @@ test: &test_template ...@@ -18,7 +18,7 @@ test: &test_template
key: "$CI_JOB_NAME" key: "$CI_JOB_NAME"
script: script:
- tox -e test - make test
retry: 1 retry: 1
...@@ -36,8 +36,6 @@ test_mysql: &test_mysql_template ...@@ -36,8 +36,6 @@ test_mysql: &test_mysql_template
# select mysql database settings, all settings default to 'failmap' # select mysql database settings, all settings default to 'failmap'
# so they don't need to be passed explicitly # so they don't need to be passed explicitly
DJANGO_DATABASE: production DJANGO_DATABASE: production
# add mysqlclient to tox environment
TOX_EXTRAS: deploy
retry: 1 retry: 1
# functional testing using postgres database instead of sqlite # functional testing using postgres database instead of sqlite
...@@ -56,8 +54,6 @@ test_postgres: &test_postgres_template ...@@ -56,8 +54,6 @@ test_postgres: &test_postgres_template
DJANGO_DATABASE: production DJANGO_DATABASE: production
DB_ENGINE: postgresql_psycopg2 DB_ENGINE: postgresql_psycopg2
DB_HOST: postgres DB_HOST: postgres
# add mysqlclient to tox environment
TOX_EXTRAS: deploy
# run long/non-critical tests only on master # run long/non-critical tests only on master
only: [master] only: [master]
...@@ -69,7 +65,7 @@ check: ...@@ -69,7 +65,7 @@ check:
stage: test stage: test
script: script:
- tox -e check - make check
- shellcheck tests/*.sh tools/*.sh - shellcheck tests/*.sh tools/*.sh
# integration tests # integration tests
...@@ -86,24 +82,24 @@ integration: ...@@ -86,24 +82,24 @@ integration:
C_FORCE_ROOT: 1 C_FORCE_ROOT: 1
script: script:
- tox -e integration - make test_integration
dataset: dataset:
<<: *test_template <<: *test_template
script: script:
- tox -e datasets - make test_datasets
dataset_mysql: dataset_mysql:
<<: *test_mysql_template <<: *test_mysql_template
script: script:
- tox -e datasets - make test_datasets
# run long tests only on master # run long tests only on master
only: [master] only: [master]
dataset_postgres: dataset_postgres:
<<: *test_postgres_template <<: *test_postgres_template
script: script:
- tox -e datasets - make test_datasets
# run long tests only on master # run long tests only on master
only: [master] only: [master]
...@@ -156,7 +152,7 @@ image_test: ...@@ -156,7 +152,7 @@ image_test:
# for quicker docker builds # for quicker docker builds
key: "test" key: "test"
# don't update the cache after run as it will not be updated # don't update the cache after run as it will not be updated
# by this job # by this job
policy: pull policy: pull
services: services:
...@@ -179,7 +175,7 @@ image_test: ...@@ -179,7 +175,7 @@ image_test:
- time tests/docker.sh docker - time tests/docker.sh docker
# run system tests against image # run system tests against image
- time tox -e system - time make test_system
# run on merge request to determine if build will not break on master # run on merge request to determine if build will not break on master
except: [master] except: [master]
...@@ -200,7 +196,7 @@ test_system: ...@@ -200,7 +196,7 @@ test_system:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD"
script: script:
- time tox -e system - time make test_system
only: [master] only: [master]
retry: 1 retry: 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment