better named tests and log local-docker params
parent
3861aac122
commit
16c6f661ee
|
|
@ -3597,15 +3597,13 @@ class LocalDockerCloudRunner {
|
|||
branchName,
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
defaultSecretsArray) { }
|
||||
setup(
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
buildGuid,
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
buildParameters,
|
||||
setup(buildGuid, buildParameters,
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
branchName,
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
defaultSecretsArray) { }
|
||||
defaultSecretsArray) {
|
||||
this.buildParameters = buildParameters;
|
||||
}
|
||||
runTask(buildGuid, image, commands, mountdir, workingdir, environment, secrets) {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
cloud_runner_logger_1.default.log(buildGuid);
|
||||
|
|
@ -3622,7 +3620,7 @@ class LocalDockerCloudRunner {
|
|||
return;
|
||||
}),
|
||||
];
|
||||
yield docker_1.default.run(image, Object.assign(Object.assign({ workspace, actionFolder, mountdir, workingdir }, model_1.CloudRunner.buildParameters), content), false, commands, {
|
||||
yield docker_1.default.run(image, Object.assign(Object.assign({ workspace, actionFolder }, this.buildParameters), content), false, commands, {
|
||||
listeners: {
|
||||
stdout: (data) => {
|
||||
myOutput += data.toString();
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -4,9 +4,11 @@ import CloudRunnerLogger from '../../services/cloud-runner-logger';
|
|||
import { ProviderInterface } from '../provider-interface';
|
||||
import CloudRunnerSecret from '../../services/cloud-runner-secret';
|
||||
import Docker from '../../../docker';
|
||||
import { Action, CloudRunner } from '../../../../model';
|
||||
import { Action } from '../../../../model';
|
||||
|
||||
class LocalDockerCloudRunner implements ProviderInterface {
|
||||
public buildParameters: BuildParameters | undefined;
|
||||
|
||||
inspect(): Promise<string> {
|
||||
throw new Error('Method not implemented.');
|
||||
}
|
||||
|
|
@ -35,15 +37,16 @@ class LocalDockerCloudRunner implements ProviderInterface {
|
|||
defaultSecretsArray: { ParameterKey: string; EnvironmentVariable: string; ParameterValue: string }[],
|
||||
) {}
|
||||
setup(
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
buildGuid: string,
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
buildParameters: BuildParameters,
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
branchName: string,
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
defaultSecretsArray: { ParameterKey: string; EnvironmentVariable: string; ParameterValue: string }[],
|
||||
) {}
|
||||
) {
|
||||
this.buildParameters = buildParameters;
|
||||
}
|
||||
|
||||
public async runTask(
|
||||
buildGuid: string,
|
||||
image: string,
|
||||
|
|
@ -70,12 +73,7 @@ class LocalDockerCloudRunner implements ProviderInterface {
|
|||
return;
|
||||
}),
|
||||
];
|
||||
await Docker.run(
|
||||
image,
|
||||
{ workspace, actionFolder, mountdir, workingdir, ...CloudRunner.buildParameters, ...content },
|
||||
false,
|
||||
commands,
|
||||
{
|
||||
await Docker.run(image, { workspace, actionFolder, ...this.buildParameters, ...content }, false, commands, {
|
||||
listeners: {
|
||||
stdout: (data: Buffer) => {
|
||||
myOutput += data.toString();
|
||||
|
|
@ -84,8 +82,7 @@ class LocalDockerCloudRunner implements ProviderInterface {
|
|||
myOutput += `[ERROR]${data.toString()}`;
|
||||
},
|
||||
},
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
return myOutput;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue