support setting a timeout for a job

paritytech · Oct 17, 2023 · 644611b · 644611b
1 parent 3923d4b
commit 644611b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git a/src/api.ts b/src/api.ts
@@ -144,7 +144,8 @@ export const setupApi = (ctx: Context, server: Server): void => {
       command,
       gitlab: {
         job: {
-          ...configuration.gitlab.job,
+          timeout: "24 hours",
+          ...configuration.gitlab.job, // might override default timeout
           variables: { ...configuration.gitlab.job.variables, ...variables },
           image: gitlab.defaultJobImage,
         },

diff --git a/src/bot/events/handlers/genericHandler.ts b/src/bot/events/handlers/genericHandler.ts
@@ -81,6 +81,9 @@ export async function genericHandler(this: EventHandler): Promise<PullRequestErr
     gitlab: {
       job: {
         image,
+        ...(typeof parsedCommand.configuration.gitlab?.job.timeout === "string"
+          ? { timeout: parsedCommand.configuration.gitlab.job.timeout }
+          : {}),
         tags: parsedCommand.configuration.gitlab?.job.tags || [],
         variables: Object.assign(defaultVariables, overriddenVariables),
       },

diff --git a/src/gitlab/createCiConfig.ts b/src/gitlab/createCiConfig.ts
@@ -12,7 +12,7 @@ export function createCiConfig(
     workflow: { rules: [{ if: `$CI_PIPELINE_SOURCE == "api"` }, { if: `$CI_PIPELINE_SOURCE == "web"` }] },
     command: {
       timeout: "24 hours",
-      ...task.gitlab.job,
+      ...task.gitlab.job, // timeout could be overridden from the command configs
       script: [
         ...`
         echo "This job is related to task ${task.id}. ${jobTaskInfoMessage}."

diff --git a/src/schema/schema.cmd.json b/src/schema/schema.cmd.json
@@ -21,6 +21,9 @@
                 "job": {
                   "type": "object",
                   "properties": {
+                    "timeout": {
+                      "type": "string"
+                    },
                     "tags": {
                       "type": "array",
                       "items": {

diff --git a/src/task.ts b/src/task.ts
@@ -37,6 +37,7 @@ type TaskBase<T> = {
   requester: string;
   gitlab: {
     job: {
+      timeout?: string;
       tags: string[];
       image: string;
       variables: {