diff --git a/packages/k8s/src/k8s/index.ts b/packages/k8s/src/k8s/index.ts index 311a44a..86ac023 100644 --- a/packages/k8s/src/k8s/index.ts +++ b/packages/k8s/src/k8s/index.ts @@ -427,16 +427,16 @@ export async function execCpToPod( } } - const want = await localCalculateOutputHashSorted([ - 'sh', - '-c', - listDirAllCommand(runnerPath) - ]) - let attempts = 15 const delay = 1000 for (let i = 0; i < attempts; i++) { try { + const want = await localCalculateOutputHashSorted([ + 'sh', + '-c', + listDirAllCommand(runnerPath) + ]) + const got = await execCalculateOutputHashSorted( podName, JOB_CONTAINER_NAME, @@ -468,11 +468,6 @@ export async function execCpFromPod( core.debug( `Copying from pod ${podName} ${containerPath} to ${targetRunnerPath}` ) - const want = await execCalculateOutputHashSorted( - podName, - JOB_CONTAINER_NAME, - ['sh', '-c', listDirAllCommand(containerPath)] - ) let attempt = 0 while (true) { @@ -533,6 +528,12 @@ export async function execCpFromPod( const delay = 1000 for (let i = 0; i < attempts; i++) { try { + const want = await execCalculateOutputHashSorted( + podName, + JOB_CONTAINER_NAME, + ['sh', '-c', listDirAllCommand(containerPath)] + ) + const got = await localCalculateOutputHashSorted([ 'sh', '-c', diff --git a/packages/k8s/src/k8s/utils.ts b/packages/k8s/src/k8s/utils.ts index 25428ff..9116919 100644 --- a/packages/k8s/src/k8s/utils.ts +++ b/packages/k8s/src/k8s/utils.ts @@ -296,5 +296,5 @@ export async function sleep(ms: number): Promise { } export function listDirAllCommand(dir: string): string { - return `cd ${shlex.quote(dir)} && find . -not -path '*/_runner_hook_responses*' -exec stat -c '%b %n' {} \\;` + return `cd ${shlex.quote(dir)} && find . -not -path '*/_runner_hook_responses*' -exec stat -c '%s %n' {} \\;` }