diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 758a52f9..6d852c07 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ image: docker:latest stages: - build - test - - deploy +# - deploy - clean #before_script: @@ -28,28 +28,17 @@ buid: test: stage: test script: - - docker-compose -f compose-ci.yml run db up -d - - docker-compose -f compose-ci.yml run db down + - docker-compose -f compose-ci.yml run db - docker-compose -f compose-ci.yml run gm_app python -B manage.py test -v 3 --noinput when: always -deploy-develop: - stage: deploy - only: - - feature/develop_ci - script: - - fab --roles=develop deploy - environment: - name: Develop - - -deploy-staging: - stage: deploy - only: - - master - script: - - fab --roles=staging deploy - environment: - name: Staging +#deploy-develop: +# stage: deploy +# only: +# - feature/develop_ci +# script: +# - fab --roles=develop deploy +# environment: +# name: Develop diff --git a/fabfile.py b/fabfile.py index 6f300c37..9ad7f871 100644 --- a/fabfile.py +++ b/fabfile.py @@ -3,19 +3,12 @@ from fabric.api import * # NOQA -user = 'gitlab-runner' +user = 'gm' env.roledefs = { 'develop': { 'branch': 'develop', - 'hosts': ['%s@rock.spider.ru:31' % user, ] - }, - 'staging': { - 'hosts': ['%s@5.200.53.99' % user, ] - }, - 'production': { - 'branch': 'master', - 'hosts': ['%s@87.226.166.80' % user, ] + 'hosts': ['%s@95.213.204.126' % user, ] } }