From 672107412b39d6ad7b6b5fda5c81abb5d4cf6955 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Thu, 15 Dec 2022 15:06:02 +0800 Subject: [PATCH] =?UTF-8?q?fixed=20=E5=88=9B=E5=BB=BA=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E5=BC=80=E9=80=9A=E5=BB=BA=E6=9C=A8DevOps=20job?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 1 - app/jobs/migrate_remote_repository_job.rb | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 655573819..53f6d1aea 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -84,7 +84,6 @@ class ProjectsController < ApplicationController else Projects::MigrateService.call(current_user, mirror_params) end - OpenProjectDevOpsJob.perform_later(@project&.id, current_user.id) rescue Exception => e uid_logger_error(e.message) tip_exception(e.message) diff --git a/app/jobs/migrate_remote_repository_job.rb b/app/jobs/migrate_remote_repository_job.rb index 488141910..8420f791c 100644 --- a/app/jobs/migrate_remote_repository_job.rb +++ b/app/jobs/migrate_remote_repository_job.rb @@ -12,6 +12,14 @@ class MigrateRemoteRepositoryJob < ApplicationJob if gitea_repository[0]==201 repo&.project&.update_columns(gpid: gitea_repository[2]["id"]) repo&.mirror&.succeeded! + ## open jianmu devops + project_id = repo&.project&.id + if repo&.project.present? && repo&.project.owner.is_a?(Organization) + user_id = repo&.project.members.take&.user_id + else + user_id = repo&.project.user_id + end + OpenProjectDevOpsJob.perform_later(project_id, user_id) if project_id.present? && user_id.present? puts "############ mirror status: #{repo.mirror.status} ############" else repo&.mirror&.failed!