actions
/
unity-builder
mirror of https://github.com/game-ci/unity-builder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes

pull/524/head
Frostebite 2023-03-26 00:12:12 +00:00
parent ff2ea48f90
commit c19fea4765
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dist/index.js vendored
View File

@ -3696,18 +3696,19 @@ class KubernetesTaskRunner {
sinceTime = ` --since-time="${dateTimeIsoString}"`; sinceTime = ` --since-time="${dateTimeIsoString}"`;
} }
let extraFlags = ``; let extraFlags = ``;
extraFlags += (await kubernetes_pods_1.default.IsPodRunning(podName, namespace, kubeClient)) ? `` : ` -p`; extraFlags += (await kubernetes_pods_1.default.IsPodRunning(podName, namespace, kubeClient))
? ` -c ${containerName}`
: ` -p`;
let lastMessageSeenIncludedInChunk = false; let lastMessageSeenIncludedInChunk = false;
let lastMessageSeen = false; let lastMessageSeen = false;
let logs; let logs;
try { try {
logs = await cloud_runner_system_1.CloudRunnerSystem.Run(`kubectl logs ${podName}${extraFlags} -f -c ${containerName} --timestamps${sinceTime}`, false, true); logs = await cloud_runner_system_1.CloudRunnerSystem.Run(`kubectl logs ${podName}${extraFlags} -f --timestamps${sinceTime}`, false, true);
} }
catch (error) { catch (error) {
const errorString = `${error}`; const errorString = `${error}`;
const continueStreaming = errorString.includes(`dial timeout, backstop`) || const continueStreaming = errorString.includes(`dial timeout, backstop`) ||
errorString.includes(`HttpError: HTTP request failed`) || errorString.includes(`HttpError: HTTP request failed`) ||
errorString.includes(`previous terminated container`) ||
(await kubernetes_pods_1.default.IsPodRunning(podName, namespace, kubeClient)); (await kubernetes_pods_1.default.IsPodRunning(podName, namespace, kubeClient));
cloud_runner_logger_1.default.log(`K8s logging error ${error} ${continueStreaming}`); cloud_runner_logger_1.default.log(`K8s logging error ${error} ${continueStreaming}`);
if (continueStreaming) { if (continueStreaming) {

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

7
src/model/cloud-runner/providers/k8s/kubernetes-task-runner.ts
View File

@ -36,7 +36,9 @@ class KubernetesTaskRunner {
sinceTime = ` --since-time="${dateTimeIsoString}"`; sinceTime = ` --since-time="${dateTimeIsoString}"`;
} }
let extraFlags = ``; let extraFlags = ``;
extraFlags += (await KubernetesPods.IsPodRunning(podName, namespace, kubeClient)) ? `` : ` -p`; extraFlags += (await KubernetesPods.IsPodRunning(podName, namespace, kubeClient))
? ` -c ${containerName}`
: ` -p`;
let lastMessageSeenIncludedInChunk = false; let lastMessageSeenIncludedInChunk = false;
let lastMessageSeen = false; let lastMessageSeen = false;
@ -44,7 +46,7 @@ class KubernetesTaskRunner {
try { try {
logs = await CloudRunnerSystem.Run( logs = await CloudRunnerSystem.Run(
`kubectl logs ${podName}${extraFlags} -f -c ${containerName} --timestamps${sinceTime}`, `kubectl logs ${podName}${extraFlags} -f --timestamps${sinceTime}`,
false, false,
true, true,
); );
@ -53,7 +55,6 @@ class KubernetesTaskRunner {
const continueStreaming = const continueStreaming =
errorString.includes(`dial timeout, backstop`) || errorString.includes(`dial timeout, backstop`) ||
errorString.includes(`HttpError: HTTP request failed`) || errorString.includes(`HttpError: HTTP request failed`) ||
errorString.includes(`previous terminated container`) ||
(await KubernetesPods.IsPodRunning(podName, namespace, kubeClient)); (await KubernetesPods.IsPodRunning(podName, namespace, kubeClient));
CloudRunnerLogger.log(`K8s logging error ${error} ${continueStreaming}`); CloudRunnerLogger.log(`K8s logging error ${error} ${continueStreaming}`);
if (continueStreaming) { if (continueStreaming) {