This commit is contained in:
Виктор Гладких 2019-10-23 11:44:59 +03:00
parent d6a9fa6ac0
commit 7ed853e7a4
2 changed files with 11 additions and 34 deletions

View File

@ -22,7 +22,6 @@ clean:
buid: buid:
stage: build stage: build
script: script:
- pwd
- docker-compose -f compose-ci.yml build gm_app - docker-compose -f compose-ci.yml build gm_app
when: always when: always
@ -34,29 +33,6 @@ test:
when: always when: always
#clean:
# stage: clean
# script:
# - docker-compose -f compose-ci.yml stop
# - docker-compose -f compose-ci.yml rm --force gm_app
# when: always
#
#
#buid:
# stage: build
# script:
# - docker-compose -f compose-ci.yml build gm_app
# when: always
#
#
#test:
# stage: test
# script:
# - docker-compose -f compose-ci.yml run agro python manage.py test -v 3 --noinput
# when: always
#
#
#deploy-develop: #deploy-develop:
# stage: deploy # stage: deploy
# only: # only:

21
fabfile.py vendored
View File

@ -1,18 +1,12 @@
import os # NOQA import os # NOQA
from fabric.api import * # NOQA from fabric.api import * # NOQA
user = 'gm' user = 'gm'
env.root = '~/'
env.src = '~/project'
env.default_branch = 'feature/develop_ci'
env.tmpdir = '~/tmp'
env.roledefs = { env.roledefs = {
'develop': { 'develop': {
'branch': env.default_branch, 'branch': 'develop',
'hosts': ['%s@rock.spider.ru:31' % user, ] 'hosts': ['%s@rock.spider.ru:31' % user, ]
}, },
'staging': { 'staging': {
@ -25,6 +19,13 @@ env.roledefs = {
} }
env.root = '~/'
env.src = '~/project'
env.default_branch = 'develop'
env.tmpdir = '~/tmp'
def fetch(branch=None): def fetch(branch=None):
with cd(env.src): with cd(env.src):
role = env.roles[0] role = env.roles[0]
@ -72,4 +73,4 @@ def rev():
with hide('running', 'stdout'): with hide('running', 'stdout'):
with cd(env.src): with cd(env.src):
commit = run('git rev-parse HEAD') commit = run('git rev-parse HEAD')
return local('git show -q %s' % commit) return local('git show -q %s' % commit)