Authored by qinchao

docker发布不校验分支

... ... @@ -143,7 +143,7 @@ public class ProjectBuildCtrl {
}
log.info("check environment {} projects {} branch {}",environment,projects,branch);
if (!("master".equals(branch) || "test".equals(branch) || "dev".equals(branch) || "qcloudOnly".equals(branch) || "feature/docker".equals(branch))) {
if (!("master".equals(branch) || "test".equals(branch) || "dev".equals(branch) )) {
map.clear();
map.put("projects", projects);
map.put("branch", branch);
... ...
... ... @@ -313,27 +313,13 @@
return;
}
$.ajax({
url: contextPath+'project/check?projects=' + projectNames + '&branch=' + branch+ '&environment=' + environment+ '&workid=' + workid,
type: 'POST',
success: function (data) {
if (data != "1") {
alert(data);
return;
} else {
$("input[name='operate_name']").val(operate);
$("input[name='project_id']").val(projects);
$("input[name='project_name']").val(projectNames);
$("input[name='environment_name']").val(environment);
$("input[name='branch_name']").val(branch);
$("input[name='workid_name']").val(workid);
$('#confirmSubmitDivId').modal('show');
}
},
error: function (e) {
alert("从后台获取数据出错");
}
});
$("input[name='operate_name']").val(operate);
$("input[name='project_id']").val(projects);
$("input[name='project_name']").val(projectNames);
$("input[name='environment_name']").val(environment);
$("input[name='branch_name']").val(branch);
$("input[name='workid_name']").val(workid);
$('#confirmSubmitDivId').modal('show');
}
}
... ...