feat(repos): 检出相关逻辑更改为传入任务信息而不是项目信息。

This commit is contained in:
Ivan
2021-03-04 17:02:07 +08:00
parent 33b09594f5
commit f39c801fc2
9 changed files with 169 additions and 96 deletions

View File

@ -0,0 +1,6 @@
import { WorkUnit } from './work-unit.model';
export class WorkUnitMetadata {
version = 1;
units: WorkUnit[];
}

View File

@ -0,0 +1,6 @@
import { PipelineUnits as PipelineUnitTypes } from '../enums/pipeline-units.enum';
export class WorkUnit {
type: PipelineUnitTypes;
scripts: string[];
}

View File

@ -1,5 +1,6 @@
import { Test, TestingModule } from '@nestjs/testing';
import { Job } from 'bull';
import { ReposService } from '../repos/repos.service';
import { PipelineUnits } from './enums/pipeline-units.enum';
import { PipelineTaskConsumer } from './pipeline-task.consumer';
import { PipelineTask } from './pipeline-task.entity';
@ -25,6 +26,12 @@ describe('PipelineTaskConsumer', () => {
doNextTask: () => undefined,
},
},
{
provide: ReposService,
useValue: {
getWorkspaceRootByTask: () => 'workspace-root',
},
},
PipelineTaskConsumer,
],
}).compile();
@ -45,4 +52,8 @@ describe('PipelineTaskConsumer', () => {
expect(doNextTask).toHaveBeenCalledTimes(1);
});
});
describe('doTask', () => {
it('should do all task', () => {});
});
});

View File

@ -1,13 +1,57 @@
import { ReposService } from './../repos/repos.service';
import { OnQueueCompleted, Process, Processor } from '@nestjs/bull';
import { Job } from 'bull';
import { spawn } from 'child_process';
import { PipelineTask } from './pipeline-task.entity';
import { PIPELINE_TASK_QUEUE } from './pipeline-tasks.constants';
import { PipelineTasksService } from './pipeline-tasks.service';
import { ApplicationException } from '../commons/exceptions/application.exception';
import { PipelineUnits } from './enums/pipeline-units.enum';
@Processor(PIPELINE_TASK_QUEUE)
export class PipelineTaskConsumer {
constructor(private readonly service: PipelineTasksService) {}
constructor(
private readonly service: PipelineTasksService,
private readonly reposService: ReposService,
) {}
@Process()
async doTask() {}
async doTask({ data: task }: Job<PipelineTask>) {
const workspaceRoot = this.reposService.getWorkspaceRootByTask(task);
const units = task.units.map(
(type) =>
task.pipeline.workUnitMetadata.units.find(
(unit) => unit.type === type,
) ?? { type: type, scripts: [] },
);
for (const unit of units) {
// 检出代码时,不执行其他脚本。
if (unit.type === PipelineUnits.checkout) {
await this.reposService.checkout(task, workspaceRoot);
continue;
}
for (const script of unit.scripts) {
await this.runScript(task, script, workspaceRoot);
}
}
}
async runScript(task: PipelineTask, script: string, workspaceRoot: string) {
return new Promise((resolve, reject) => {
const errorMessages: string[] = [];
const sub = spawn(script, {
shell: true,
cwd: workspaceRoot,
});
sub.stderr.on('data', (data) => errorMessages.push(data));
sub.addListener('close', (code) => {
if (code === 0) {
return resolve(code);
}
return reject(new ApplicationException(errorMessages.join('\n')));
});
});
}
@OnQueueCompleted()
onCompleted(job: Job<PipelineTask>) {

View File

@ -1,3 +1,4 @@
import { AppBaseEntity } from './../commons/entities/app-base-entity';
import { ObjectType } from '@nestjs/graphql';
import { Column, Entity, ManyToOne } from 'typeorm';
import { Pipeline } from '../pipelines/pipeline.entity';
@ -7,7 +8,7 @@ import { PipelineUnits } from './enums/pipeline-units.enum';
@ObjectType()
@Entity()
export class PipelineTask {
export class PipelineTask extends AppBaseEntity {
@ManyToOne(() => Pipeline)
pipeline: Pipeline;
@Column()

View File

@ -21,7 +21,10 @@ describe('PipelineTasksService', () => {
id: 'test',
name: '测试流水线',
branch: 'master',
workUnitMetadata: [],
workUnitMetadata: {},
project: {
id: 'test-project',
},
} as Pipeline);
let redisClient;
let taskQueue: Queue;