github
/
spug
mirror of https://github.com/openspug/spug
1
0
Fork 0
Code Issues Releases Wiki Activity

fix issue

pull/410/head
vapao 2021-08-27 22:09:17 +08:00
parent d90e98c016
commit adeccb08cd
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
spug_api/apps/apis/deploy.py
View File

@ -66,10 +66,10 @@ def _dispatch(deploy_id, ref, commit_id=None):
def _deploy_extend_1(deploy, ref, commit_id=None): def _deploy_extend_1(deploy, ref, commit_id=None):
if commit_id: if commit_id:
extra = ['branch', ref, commit_id] extra = ['branch', ref, commit_id]
version = f'#_b_{commit_id[:6]}' version = f'{ref}#{commit_id[:6]}'
else: else:
extra = ['tag', ref, None] extra = ['tag', ref, None]
version = f'#_t_{ref}' version = ref
rep = Repository.objects.create( rep = Repository.objects.create(
deploy=deploy, deploy=deploy,
app_id=deploy.app_id, app_id=deploy.app_id,
@ -83,7 +83,7 @@ def _deploy_extend_1(deploy, ref, commit_id=None):
if rep.status == '5': if rep.status == '5':
req = DeployRequest.objects.create( req = DeployRequest.objects.create(
type='3', type='3',
status='2', status='0' if deploy.is_audit else '2',
deploy=deploy, deploy=deploy,
repository=rep, repository=rep,
name=rep.version, name=rep.version,
@ -92,15 +92,15 @@ def _deploy_extend_1(deploy, ref, commit_id=None):
host_ids=deploy.host_ids, host_ids=deploy.host_ids,
created_by=deploy.created_by created_by=deploy.created_by
) )
deploy_dispatch(req) if req.status == '2':
deploy_dispatch(req)
def _deploy_extend_2(deploy, ref, commit_id=None): def _deploy_extend_2(deploy, ref, commit_id=None):
# 创建 环境变量 分支 commit-id tag version = f'{ref}#{commit_id[:6]}' if commit_id else ref
version = f'#_b_{commit_id[:6]}' if commit_id else f'#_t_{ref}'
req = DeployRequest.objects.create( req = DeployRequest.objects.create(
type='3', type='3',
status='2', status='0' if deploy.is_audit else '2',
deploy=deploy, deploy=deploy,
name=version, name=version,
version=version, version=version,
@ -108,4 +108,5 @@ def _deploy_extend_2(deploy, ref, commit_id=None):
host_ids=deploy.host_ids, host_ids=deploy.host_ids,
created_by=deploy.created_by created_by=deploy.created_by
) )
deploy_dispatch(req) if req.status == '2':
deploy_dispatch(req)

1
spug_api/apps/repository/utils.py
View File

@ -57,6 +57,7 @@ def dispatch(rep: Repository, helper=None):
rep.save() rep.save()
elif rep.status == '5': elif rep.status == '5':
rep.save() rep.save()
return rep
def _build(rep: Repository, helper, env): def _build(rep: Repository, helper, env):