F 修复自动发布常规发布异常问题

pull/410/head
vapao 2021-11-12 17:03:30 +08:00
parent 9b174532f1
commit 69d5bf74e5
2 changed files with 12 additions and 22 deletions

View File

@ -70,30 +70,20 @@ def _deploy_extend_1(deploy, ref, commit_id=None):
else:
extra = ['tag', ref, None]
version = ref
rep = Repository.objects.create(
req = DeployRequest.objects.create(
type='3',
status='0' if deploy.is_audit else '2',
deploy=deploy,
app_id=deploy.app_id,
env_id=deploy.env_id,
version=version,
status='1',
name=version,
extra=json.dumps(extra),
version=version,
spug_version=Repository.make_spug_version(deploy.id),
created_by=deploy.created_by)
rep = build_dispatch(rep)
if rep.status == '5':
req = DeployRequest.objects.create(
type='3',
status='0' if deploy.is_audit else '2',
deploy=deploy,
repository=rep,
name=rep.version,
version=rep.version,
spug_version=rep.spug_version,
host_ids=deploy.host_ids,
created_by=deploy.created_by
)
if req.status == '2':
deploy_dispatch(req)
host_ids=deploy.host_ids,
created_by=deploy.created_by
)
if req.status == '2':
deploy_dispatch(req)
def _deploy_extend_2(deploy, ref, commit_id=None):

View File

@ -47,7 +47,7 @@ class DeployRequest(models.Model, ModelMixin):
@property
def is_quick_deploy(self):
if self.type == '1' and self.deploy.extend == '1' and self.extra:
if self.type in ('1', '3') and self.deploy.extend == '1' and self.extra:
extra = json.loads(self.extra)
return extra[0] in ('branch', 'tag')
return False