diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e3163c20..7668f645 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: diff --git a/fabfile.py b/fabfile.py index 643080be..90052b4c 100644 --- a/fabfile.py +++ b/fabfile.py @@ -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) \ No newline at end of file