diff options
| -rw-r--r-- | .gitlab-ci.yml | 18 | 
1 files changed, 9 insertions, 9 deletions
| diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 66e83da9..a0575019 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -78,12 +78,12 @@ test-3.7-alpine:      dependencies:          - build-alpine-3.7      before_script: -        - docker load < docker_alpine_py37.tar.gz +        - docker load < djano_alpine_py37.tar.gz          - docker run --network=host --env DATABASE_URL=$DATABASE_URL django:alpine-3.7 python manage.py migrate      script: -        - docker container run --network=host --env DATABASE_URL=$DATABASE_URL -v ./:/app django:alpine-3.7 coverage run --source=api,home,pysite,wiki --branch manage.py test +        - docker run --network=host --env DATABASE_URL=$DATABASE_URL -v ./:/app django:alpine-3.7 coverage run --source=api,home,pysite,wiki --branch manage.py test      after_script: -        - docker container run -v ./:/app coverage report +        - docker run -v ./:/app coverage report      artifacts:          paths:              - .coverage @@ -94,10 +94,10 @@ test-3.6-alpine:      dependencies:          - build-alpine-3.6      before_script: -        - docker load < docker_alpine_py36.tar.gz +        - docker load < django_alpine_py36.tar.gz          - docker run --network=host --env DATABASE_URL=$DATABASE_URL django:alpine-3.6 python manage.py migrate      script: -        - docker container run --network=host --env DATABASE_URL=$DATABASE_URL django:alpine-3.6 python manage.py test +        - docker run --network=host --env DATABASE_URL=$DATABASE_URL django:alpine-3.6 python manage.py test  test-3.7-stretch:      <<: *test-template @@ -105,10 +105,10 @@ test-3.7-stretch:      dependencies:          - build-stretch-3.7      before_script: -        - docker load < docker_stretch_py37.tar.gz +        - docker load < django_stretch_py37.tar.gz          - docker run --network=host --env DATABASE_URL=$DATABASE_URL django:stretch-3.7 python manage.py migrate      script: -        - docker container run --network=host --env DATABASE_URL=$DATABASE_URL django:stretch-3.7 python manage.py test +        - docker run --network=host --env DATABASE_URL=$DATABASE_URL django:stretch-3.7 python manage.py test  test-3.6-stretch:      <<: *test-template @@ -116,10 +116,10 @@ test-3.6-stretch:      dependencies:          - build-stretch-3.6      before_script: -        - docker load < docker_stretch_py36.tar.gz +        - docker load < django_stretch_py36.tar.gz          - docker run --network=host --env DATABASE_URL=$DATABASE_URL django:stretch-3.6 python manage.py migrate      script: -        - docker container run --network=host --env DATABASE_URL=$DATABASE_URL django:stretch-3.6 python manage.py test +        - docker run --network=host --env DATABASE_URL=$DATABASE_URL django:stretch-3.6 python manage.py test  pages:      stage: publish | 
