better named tests and log local-docker params
parent
66ca790ba6
commit
fe9da282a7
|
|
@ -3571,7 +3571,6 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
|
||||||
const cloud_runner_logger_1 = __importDefault(__nccwpck_require__(22855));
|
const cloud_runner_logger_1 = __importDefault(__nccwpck_require__(22855));
|
||||||
const docker_1 = __importDefault(__nccwpck_require__(16934));
|
const docker_1 = __importDefault(__nccwpck_require__(16934));
|
||||||
const model_1 = __nccwpck_require__(41359);
|
const model_1 = __nccwpck_require__(41359);
|
||||||
const cloud_runner_1 = __importDefault(__nccwpck_require__(79144));
|
|
||||||
class LocalDockerCloudRunner {
|
class LocalDockerCloudRunner {
|
||||||
inspect() {
|
inspect() {
|
||||||
throw new Error('Method not implemented.');
|
throw new Error('Method not implemented.');
|
||||||
|
|
@ -3607,13 +3606,21 @@ class LocalDockerCloudRunner {
|
||||||
branchName,
|
branchName,
|
||||||
// eslint-disable-next-line no-unused-vars
|
// eslint-disable-next-line no-unused-vars
|
||||||
defaultSecretsArray) { }
|
defaultSecretsArray) { }
|
||||||
runTask(buildGuid, image, commands, mountdir, workingdir, environment, secrets) {
|
runTask(buildGuid, image, commands,
|
||||||
|
// eslint-disable-next-line no-unused-vars
|
||||||
|
mountdir,
|
||||||
|
// eslint-disable-next-line no-unused-vars
|
||||||
|
workingdir,
|
||||||
|
// eslint-disable-next-line no-unused-vars
|
||||||
|
environment,
|
||||||
|
// eslint-disable-next-line no-unused-vars
|
||||||
|
secrets) {
|
||||||
return __awaiter(this, void 0, void 0, function* () {
|
return __awaiter(this, void 0, void 0, function* () {
|
||||||
cloud_runner_logger_1.default.log(buildGuid);
|
cloud_runner_logger_1.default.log(buildGuid);
|
||||||
cloud_runner_logger_1.default.log(commands);
|
cloud_runner_logger_1.default.log(commands);
|
||||||
const { workspace, actionFolder } = model_1.Action;
|
const { workspace, actionFolder } = model_1.Action;
|
||||||
let myOutput = '';
|
let myOutput = '';
|
||||||
yield docker_1.default.run(image, Object.assign(Object.assign(Object.assign({ workspace, actionFolder }, cloud_runner_1.default.buildParameters), secrets), environment), false, commands, {
|
yield docker_1.default.run(image, { workspace, actionFolder }, false, commands, {
|
||||||
listeners: {
|
listeners: {
|
||||||
stdout: (data) => {
|
stdout: (data) => {
|
||||||
myOutput += data.toString();
|
myOutput += data.toString();
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -5,7 +5,6 @@ import { ProviderInterface } from '../provider-interface';
|
||||||
import CloudRunnerSecret from '../../services/cloud-runner-secret';
|
import CloudRunnerSecret from '../../services/cloud-runner-secret';
|
||||||
import Docker from '../../../docker';
|
import Docker from '../../../docker';
|
||||||
import { Action } from '../../../../model';
|
import { Action } from '../../../../model';
|
||||||
import CloudRunner from '../../cloud-runner';
|
|
||||||
|
|
||||||
class LocalDockerCloudRunner implements ProviderInterface {
|
class LocalDockerCloudRunner implements ProviderInterface {
|
||||||
inspect(): Promise<string> {
|
inspect(): Promise<string> {
|
||||||
|
|
@ -49,9 +48,13 @@ class LocalDockerCloudRunner implements ProviderInterface {
|
||||||
buildGuid: string,
|
buildGuid: string,
|
||||||
image: string,
|
image: string,
|
||||||
commands: string,
|
commands: string,
|
||||||
|
// eslint-disable-next-line no-unused-vars
|
||||||
mountdir: string,
|
mountdir: string,
|
||||||
|
// eslint-disable-next-line no-unused-vars
|
||||||
workingdir: string,
|
workingdir: string,
|
||||||
|
// eslint-disable-next-line no-unused-vars
|
||||||
environment: CloudRunnerEnvironmentVariable[],
|
environment: CloudRunnerEnvironmentVariable[],
|
||||||
|
// eslint-disable-next-line no-unused-vars
|
||||||
secrets: CloudRunnerSecret[],
|
secrets: CloudRunnerSecret[],
|
||||||
): Promise<string> {
|
): Promise<string> {
|
||||||
CloudRunnerLogger.log(buildGuid);
|
CloudRunnerLogger.log(buildGuid);
|
||||||
|
|
@ -59,12 +62,7 @@ class LocalDockerCloudRunner implements ProviderInterface {
|
||||||
|
|
||||||
const { workspace, actionFolder } = Action;
|
const { workspace, actionFolder } = Action;
|
||||||
let myOutput = '';
|
let myOutput = '';
|
||||||
await Docker.run(
|
await Docker.run(image, { workspace, actionFolder }, false, commands, {
|
||||||
image,
|
|
||||||
{ workspace, actionFolder, ...CloudRunner.buildParameters, ...secrets, ...environment },
|
|
||||||
false,
|
|
||||||
commands,
|
|
||||||
{
|
|
||||||
listeners: {
|
listeners: {
|
||||||
stdout: (data: Buffer) => {
|
stdout: (data: Buffer) => {
|
||||||
myOutput += data.toString();
|
myOutput += data.toString();
|
||||||
|
|
@ -73,8 +71,7 @@ class LocalDockerCloudRunner implements ProviderInterface {
|
||||||
myOutput += `[ERROR]${data.toString()}`;
|
myOutput += `[ERROR]${data.toString()}`;
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
});
|
||||||
);
|
|
||||||
|
|
||||||
return myOutput;
|
return myOutput;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ import { Cli } from '../../cli/cli';
|
||||||
import UnityVersioning from '../../unity-versioning';
|
import UnityVersioning from '../../unity-versioning';
|
||||||
import CloudRunner from '../cloud-runner';
|
import CloudRunner from '../cloud-runner';
|
||||||
import { CloudRunnerSystem } from '../services/cloud-runner-system';
|
import { CloudRunnerSystem } from '../services/cloud-runner-system';
|
||||||
import { Caching } from './caching';
|
import { Caching } from '../remote-client/caching';
|
||||||
import { v4 as uuidv4 } from 'uuid';
|
import { v4 as uuidv4 } from 'uuid';
|
||||||
import GitHub from '../../github';
|
import GitHub from '../../github';
|
||||||
describe('Cloud Runner (Remote Client) Caching', () => {
|
describe('Cloud Runner (Remote Client) Caching', () => {
|
||||||
Loading…
Reference in New Issue