actions/runner
1
0
Fork 0
mirror of https://github.com/actions/runner.git synced 2025-12-12 05:37:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
TingluoHuang
2021-10-28 19:18:21 -04:00
parent 658d36c1bc
commit a45c0278e6
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Misc/containerEngineHandlers/kubectlHandler/src/kubectlHandler.ts
View File

@@ -76,7 +76,7 @@ async function run(): Promise<void> {
// copy over node.js // copy over node.js
const cpNodeArgs = [ const cpNodeArgs = [
'cp', 'cp',
'/actions-runner/externals/node16/bin', '/actions-runner/externals/node12/bin',
'job-container:/__runner_util/' 'job-container:/__runner_util/'
] ]
await exec.exec('kubectl', cpNodeArgs) await exec.exec('kubectl', cpNodeArgs)
@@ -105,7 +105,7 @@ async function run(): Promise<void> {
core.debug(JSON.stringify(removeInput)) core.debug(JSON.stringify(removeInput))
const jobContainerId = removeInput.jobContainerId const jobContainerId = removeInput.jobContainerId
await exec.exec('kubectl', ['delete', 'pod', jobContainerId]) await exec.exec('kubectl', ['delete', 'pod', jobContainerId, '--force'])
// await exec.exec('podman', ['network', 'rm', '-f', network]) // await exec.exec('podman', ['network', 'rm', '-f', network])
} else if (command === 'Exec') { } else if (command === 'Exec') {
const execInput = inputJson.execInput const execInput = inputJson.execInput

6
src/Misc/layoutbin/kubectlHandler/index.js
View File

@@ -3046,7 +3046,7 @@ function run() {
// copy over node.js // copy over node.js
const cpNodeArgs = [ const cpNodeArgs = [
'cp', 'cp',
'/actions-runner/externals/node16/bin', '/actions-runner/externals/node12/bin',
'job-container:/__runner_util/' 'job-container:/__runner_util/'
]; ];
yield exec.exec('kubectl', cpNodeArgs); yield exec.exec('kubectl', cpNodeArgs);
@@ -3059,7 +3059,7 @@ function run() {
yield exec.exec('kubectl', cpKubeInnerArgs); yield exec.exec('kubectl', cpKubeInnerArgs);
const creationOutput = { const creationOutput = {
JobContainerId: 'job-container', JobContainerId: 'job-container',
Network: "job-container" Network: 'job-container'
}; };
const output = JSON.stringify({ CreationOutput: creationOutput }); const output = JSON.stringify({ CreationOutput: creationOutput });
core.debug(output); core.debug(output);
@@ -3069,7 +3069,7 @@ function run() {
const removeInput = inputJson.removeInput; const removeInput = inputJson.removeInput;
core.debug(JSON.stringify(removeInput)); core.debug(JSON.stringify(removeInput));
const jobContainerId = removeInput.jobContainerId; const jobContainerId = removeInput.jobContainerId;
yield exec.exec('kubectl', ['delete', 'pod', jobContainerId]); yield exec.exec('kubectl', ['delete', 'pod', jobContainerId, '--force']);
// await exec.exec('podman', ['network', 'rm', '-f', network]) // await exec.exec('podman', ['network', 'rm', '-f', network])
} }
else if (command === 'Exec') { else if (command === 'Exec') {