Try to resolve problem with manual job triggering II. (#180)

pepakriz · Mar 25, 2024 · 0785154 · 0785154
1 parent 9841839
commit 0785154
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 99 deletions.
diff --git a/server/src/Job.ts b/server/src/Job.ts
@@ -8,17 +8,10 @@ export interface JobArgs {
 
 export type JobFunction = (args: JobArgs) => Promise<unknown> | unknown;
 
-interface JobState {
-	checkManualJobs: boolean;
-}
-
 export class Job {
 	private _info: JobInfo;
 	private _status: JobStatus;
 	private _priority: JobPriority;
-	private _state: JobState = {
-		checkManualJobs: true,
-	};
 
 	private readonly _id: string;
 	private readonly _fn: JobFunction;
@@ -67,10 +60,6 @@ export class Job {
 		this.onChange();
 	}
 
-	public updateState(callback: (state: JobState) => JobState) {
-		this._state = callback(this._state);
-	}
-
 	public run(args: JobArgs): Promise<unknown> | unknown {
 		return this._fn(args);
 	}
@@ -91,10 +80,6 @@ export class Job {
 		return this._priority;
 	}
 
-	get state(): JobState {
-		return this._state;
-	}
-
 	public getData(): GQLJob {
 		return {
 			priority: this.priority,

diff --git a/server/src/MergeRequestAcceptor.ts b/server/src/MergeRequestAcceptor.ts
@@ -494,10 +494,6 @@ export const runAcceptingMergeRequest = async (
 		await tryCancelPipeline(gitlabApi, mergeRequestInfo, user);
 		await gitlabApi.rebaseMergeRequest(mergeRequestInfo.project_id, mergeRequestInfo.iid);
 		job.updateStatus(JobStatus.REBASING);
-		job.updateState((state) => ({
-			...state,
-			checkManualJobs: true,
-		}));
 		return;
 	}
 
@@ -513,50 +509,47 @@ export const runAcceptingMergeRequest = async (
 		return;
 	}
 
-	if (job.state.checkManualJobs) {
-		job.updateState((state) => ({
-			...state,
-			checkManualJobs: false,
-		}));
-		const currentPipeline = mergeRequestInfo.head_pipeline;
-		if (currentPipeline !== null) {
-			const jobs = uniqueNamedJobsByDate(
-				await gitlabApi.getPipelineJobs(mergeRequestInfo.project_id, currentPipeline.id),
-			);
+	const currentPipeline = mergeRequestInfo.head_pipeline;
 
-			const manualJobsToRun = jobs.filter(
-				(job) => PipelineJobStatus.Manual === job.status && !job.allow_failure,
-			);
-			const canceledJobsToRun = jobs.filter(
-				(job) => PipelineJobStatus.Canceled === job.status && !job.allow_failure,
-			);
+	if (
+		currentPipeline !== null &&
+		mergeRequestInfo.detailed_merge_status === DetailedMergeStatus.CiMustPass &&
+		[PipelineStatus.Manual, PipelineStatus.Canceled].includes(currentPipeline.status)
+	) {
+		const jobs = uniqueNamedJobsByDate(
+			await gitlabApi.getPipelineJobs(mergeRequestInfo.project_id, currentPipeline.id),
+		);
 
-			if (manualJobsToRun.length > 0 || canceledJobsToRun.length > 0) {
-				if (!config.AUTORUN_MANUAL_BLOCKING_JOBS) {
-					return {
-						kind: AcceptMergeRequestResultKind.WaitingPipeline,
-						mergeRequestInfo,
-						user,
-						pipeline: currentPipeline,
-					};
-				}
-
-				console.log(
-					`[MR][${mergeRequestInfo.iid}] there are some blocking manual or canceled. triggering again`,
-				);
-				job.updateStatus(JobStatus.WAITING_FOR_CI);
-				await Promise.all(
-					manualJobsToRun.map((job) =>
-						gitlabApi.runJob(mergeRequestInfo.project_id, job.id),
-					),
-				);
-				await Promise.all(
-					canceledJobsToRun.map((job) =>
-						gitlabApi.retryJob(mergeRequestInfo.project_id, job.id),
-					),
-				);
-				return;
+		const manualJobsToRun = jobs.filter(
+			(job) => PipelineJobStatus.Manual === job.status && !job.allow_failure,
+		);
+		const canceledJobsToRun = jobs.filter(
+			(job) => PipelineJobStatus.Canceled === job.status && !job.allow_failure,
+		);
+
+		if (manualJobsToRun.length > 0 || canceledJobsToRun.length > 0) {
+			if (!config.AUTORUN_MANUAL_BLOCKING_JOBS) {
+				return {
+					kind: AcceptMergeRequestResultKind.WaitingPipeline,
+					mergeRequestInfo,
+					user,
+					pipeline: currentPipeline,
+				};
 			}
+
+			console.log(
+				`[MR][${mergeRequestInfo.iid}] there are some blocking manual or canceled. triggering again`,
+			);
+			job.updateStatus(JobStatus.WAITING_FOR_CI);
+			await Promise.all(
+				manualJobsToRun.map((job) => gitlabApi.runJob(mergeRequestInfo.project_id, job.id)),
+			);
+			await Promise.all(
+				canceledJobsToRun.map((job) =>
+					gitlabApi.retryJob(mergeRequestInfo.project_id, job.id),
+				),
+			);
+			return;
 		}
 	}
 
@@ -589,7 +582,6 @@ export const runAcceptingMergeRequest = async (
 		};
 	}
 
-	const currentPipeline: MergeRequestPipeline | null = mergeRequestInfo.head_pipeline;
 	if (currentPipeline === null) {
 		console.log(
 			`[MR][${mergeRequestInfo.iid}] Merge request can't be merged. Pipeline does not exist`,
@@ -626,44 +618,6 @@ export const runAcceptingMergeRequest = async (
 		};
 	}
 
-	if ([PipelineStatus.Manual, PipelineStatus.Canceled].includes(currentPipeline.status)) {
-		if (!config.AUTORUN_MANUAL_BLOCKING_JOBS) {
-			return {
-				kind: AcceptMergeRequestResultKind.WaitingPipeline,
-				mergeRequestInfo,
-				user,
-				pipeline: currentPipeline,
-			};
-		}
-
-		const jobs = uniqueNamedJobsByDate(
-			await gitlabApi.getPipelineJobs(mergeRequestInfo.project_id, currentPipeline.id),
-		);
-
-		const manualJobsToRun = jobs.filter(
-			(job) => PipelineJobStatus.Manual === job.status && !job.allow_failure,
-		);
-		const canceledJobsToRun = jobs.filter(
-			(job) => PipelineJobStatus.Canceled === job.status && !job.allow_failure,
-		);
-
-		if (manualJobsToRun.length > 0 || canceledJobsToRun.length > 0) {
-			console.log(
-				`[MR][${mergeRequestInfo.iid}] there are some blocking manual or canceled. triggering again`,
-			);
-			job.updateStatus(JobStatus.WAITING_FOR_CI);
-			await Promise.all(
-				manualJobsToRun.map((job) => gitlabApi.runJob(mergeRequestInfo.project_id, job.id)),
-			);
-			await Promise.all(
-				canceledJobsToRun.map((job) =>
-					gitlabApi.retryJob(mergeRequestInfo.project_id, job.id),
-				),
-			);
-			return;
-		}
-	}
-
 	if (
 		currentPipeline.status !== PipelineStatus.Success &&
 		currentPipeline.status !== PipelineStatus.Skipped &&