Fix fab
This commit is contained in:
parent
d6a9fa6ac0
commit
7ed853e7a4
|
|
@ -22,7 +22,6 @@ clean:
|
|||
buid:
|
||||
stage: build
|
||||
script:
|
||||
- pwd
|
||||
- docker-compose -f compose-ci.yml build gm_app
|
||||
when: always
|
||||
|
||||
|
|
@ -34,29 +33,6 @@ test:
|
|||
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:
|
||||
# stage: deploy
|
||||
# only:
|
||||
|
|
|
|||
21
fabfile.py
vendored
21
fabfile.py
vendored
|
|
@ -1,18 +1,12 @@
|
|||
import os # NOQA
|
||||
import os # NOQA
|
||||
from fabric.api import * # NOQA
|
||||
|
||||
|
||||
user = 'gm'
|
||||
|
||||
env.root = '~/'
|
||||
env.src = '~/project'
|
||||
|
||||
env.default_branch = 'feature/develop_ci'
|
||||
env.tmpdir = '~/tmp'
|
||||
|
||||
|
||||
env.roledefs = {
|
||||
'develop': {
|
||||
'branch': env.default_branch,
|
||||
'branch': 'develop',
|
||||
'hosts': ['%s@rock.spider.ru:31' % user, ]
|
||||
},
|
||||
'staging': {
|
||||
|
|
@ -25,6 +19,13 @@ env.roledefs = {
|
|||
}
|
||||
|
||||
|
||||
env.root = '~/'
|
||||
env.src = '~/project'
|
||||
|
||||
env.default_branch = 'develop'
|
||||
env.tmpdir = '~/tmp'
|
||||
|
||||
|
||||
def fetch(branch=None):
|
||||
with cd(env.src):
|
||||
role = env.roles[0]
|
||||
|
|
@ -72,4 +73,4 @@ def rev():
|
|||
with hide('running', 'stdout'):
|
||||
with cd(env.src):
|
||||
commit = run('git rev-parse HEAD')
|
||||
return local('git show -q %s' % commit)
|
||||
return local('git show -q %s' % commit)
|
||||
Loading…
Reference in New Issue
Block a user