From 32bdb2d349ea7f893998a4f226fa44c194b7bd1c Mon Sep 17 00:00:00 2001 From: Brad White Date: Tue, 17 Dec 2024 20:36:54 +0000 Subject: [PATCH 1/9] test agent config --- .buildkite/scripts/pipelines/pull_request/pipeline.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/scripts/pipelines/pull_request/pipeline.ts b/.buildkite/scripts/pipelines/pull_request/pipeline.ts index b1c877bb3db0..d8c388c7c6e0 100644 --- a/.buildkite/scripts/pipelines/pull_request/pipeline.ts +++ b/.buildkite/scripts/pipelines/pull_request/pipeline.ts @@ -39,7 +39,8 @@ const getPipeline = (filename: string, removeSteps = true) => { return; } - const onlyRunQuickChecks = await areChangesSkippable([/^renovate\.json$/], REQUIRED_PATHS); + pipeline.push(getAgentImageConfig({ returnYaml: true })); + const onlyRunQuickChecks = true; // await areChangesSkippable([/^renovate\.json$/], REQUIRED_PATHS); if (onlyRunQuickChecks) { pipeline.push(getPipeline('.buildkite/pipelines/pull_request/renovate.yml', false)); pipeline.push(getPipeline('.buildkite/pipelines/pull_request/post_build.yml')); @@ -47,7 +48,6 @@ const getPipeline = (filename: string, removeSteps = true) => { return; } - pipeline.push(getAgentImageConfig({ returnYaml: true })); pipeline.push(getPipeline('.buildkite/pipelines/pull_request/base.yml', false)); if (await doAnyChangesMatch([/^packages\/kbn-handlebars/])) { From cd665a2ee2af495b951a0118351e49047cdb1c76 Mon Sep 17 00:00:00 2001 From: Brad White Date: Tue, 17 Dec 2024 20:42:29 +0000 Subject: [PATCH 2/9] fix stdin --- .buildkite/scripts/pipelines/pull_request/pipeline.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.buildkite/scripts/pipelines/pull_request/pipeline.ts b/.buildkite/scripts/pipelines/pull_request/pipeline.ts index d8c388c7c6e0..b6193603ed84 100644 --- a/.buildkite/scripts/pipelines/pull_request/pipeline.ts +++ b/.buildkite/scripts/pipelines/pull_request/pipeline.ts @@ -40,11 +40,13 @@ const getPipeline = (filename: string, removeSteps = true) => { } pipeline.push(getAgentImageConfig({ returnYaml: true })); + const onlyRunQuickChecks = true; // await areChangesSkippable([/^renovate\.json$/], REQUIRED_PATHS); if (onlyRunQuickChecks) { pipeline.push(getPipeline('.buildkite/pipelines/pull_request/renovate.yml', false)); pipeline.push(getPipeline('.buildkite/pipelines/pull_request/post_build.yml')); - console.log('Isolated changes to renovate.json. Skipping main PR pipeline.'); + // console.log('Isolated changes to renovate.json. Skipping main PR pipeline.'); + console.log([...new Set(pipeline)].join('\n')); return; } From c09f91a86a2ba11b2dcfe85b1b329b706d5cac56 Mon Sep 17 00:00:00 2001 From: Brad White Date: Tue, 17 Dec 2024 23:29:47 +0000 Subject: [PATCH 3/9] disable ci stats --- .buildkite/pipelines/pull_request/renovate.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.buildkite/pipelines/pull_request/renovate.yml b/.buildkite/pipelines/pull_request/renovate.yml index 3b441cfe5375..4911fad07d66 100644 --- a/.buildkite/pipelines/pull_request/renovate.yml +++ b/.buildkite/pipelines/pull_request/renovate.yml @@ -1,3 +1,5 @@ +env: + DISABLE_CI_STATS_SHIPPING: 'true' steps: - command: .buildkite/scripts/lifecycle/pre_build.sh label: Pre-Build From 9dec99497bb7e8fd206a418851c08a80566dcada Mon Sep 17 00:00:00 2001 From: Brad White Date: Tue, 17 Dec 2024 23:35:23 +0000 Subject: [PATCH 4/9] cleanup --- .buildkite/scripts/pipelines/pull_request/pipeline.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/scripts/pipelines/pull_request/pipeline.ts b/.buildkite/scripts/pipelines/pull_request/pipeline.ts index b6193603ed84..d802ed666e55 100644 --- a/.buildkite/scripts/pipelines/pull_request/pipeline.ts +++ b/.buildkite/scripts/pipelines/pull_request/pipeline.ts @@ -41,11 +41,11 @@ const getPipeline = (filename: string, removeSteps = true) => { pipeline.push(getAgentImageConfig({ returnYaml: true })); - const onlyRunQuickChecks = true; // await areChangesSkippable([/^renovate\.json$/], REQUIRED_PATHS); + const onlyRunQuickChecks = await areChangesSkippable([/^renovate\.json$/], REQUIRED_PATHS); if (onlyRunQuickChecks) { pipeline.push(getPipeline('.buildkite/pipelines/pull_request/renovate.yml', false)); pipeline.push(getPipeline('.buildkite/pipelines/pull_request/post_build.yml')); - // console.log('Isolated changes to renovate.json. Skipping main PR pipeline.'); + console.log([...new Set(pipeline)].join('\n')); return; } From 5ddf0cf2c8c7be433f4cf969121e08e8209b39fb Mon Sep 17 00:00:00 2001 From: Brad White Date: Tue, 17 Dec 2024 23:41:52 +0000 Subject: [PATCH 5/9] force pipeline --- .buildkite/scripts/pipelines/pull_request/pipeline.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/scripts/pipelines/pull_request/pipeline.ts b/.buildkite/scripts/pipelines/pull_request/pipeline.ts index d802ed666e55..c2818b40ed70 100644 --- a/.buildkite/scripts/pipelines/pull_request/pipeline.ts +++ b/.buildkite/scripts/pipelines/pull_request/pipeline.ts @@ -41,7 +41,7 @@ const getPipeline = (filename: string, removeSteps = true) => { pipeline.push(getAgentImageConfig({ returnYaml: true })); - const onlyRunQuickChecks = await areChangesSkippable([/^renovate\.json$/], REQUIRED_PATHS); + const onlyRunQuickChecks = true; // await areChangesSkippable([/^renovate\.json$/], REQUIRED_PATHS); if (onlyRunQuickChecks) { pipeline.push(getPipeline('.buildkite/pipelines/pull_request/renovate.yml', false)); pipeline.push(getPipeline('.buildkite/pipelines/pull_request/post_build.yml')); From 464d38399fb88bade196b3be45e8991aed4bb0ee Mon Sep 17 00:00:00 2001 From: Brad White Date: Wed, 18 Dec 2024 00:13:42 +0000 Subject: [PATCH 6/9] ignore error --- .buildkite/pipelines/pull_request/renovate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipelines/pull_request/renovate.yml b/.buildkite/pipelines/pull_request/renovate.yml index 4911fad07d66..f8aa422ebf3d 100644 --- a/.buildkite/pipelines/pull_request/renovate.yml +++ b/.buildkite/pipelines/pull_request/renovate.yml @@ -1,5 +1,5 @@ env: - DISABLE_CI_STATS_SHIPPING: 'true' + IGNORE_SHIP_CI_STATS_ERROR: 'true' steps: - command: .buildkite/scripts/lifecycle/pre_build.sh label: Pre-Build From d4d21cf4952a7f6449b3aafba0da871038071c50 Mon Sep 17 00:00:00 2001 From: Brad White Date: Wed, 18 Dec 2024 00:26:16 +0000 Subject: [PATCH 7/9] mark ci --- .buildkite/pipelines/pull_request/renovate.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.buildkite/pipelines/pull_request/renovate.yml b/.buildkite/pipelines/pull_request/renovate.yml index f8aa422ebf3d..392512bb911f 100644 --- a/.buildkite/pipelines/pull_request/renovate.yml +++ b/.buildkite/pipelines/pull_request/renovate.yml @@ -1,5 +1,3 @@ -env: - IGNORE_SHIP_CI_STATS_ERROR: 'true' steps: - command: .buildkite/scripts/lifecycle/pre_build.sh label: Pre-Build @@ -9,6 +7,16 @@ steps: - wait + - command: .buildkite/scripts/steps/ci_stats_ready.sh + label: Mark CI Stats as ready + agents: + machineType: n2-standard-2 + timeout_in_minutes: 10 + retry: + automatic: + - exit_status: '*' + limit: 1 + - command: .buildkite/scripts/steps/renovate.sh label: 'Renovate validation' agents: From d8b84c89b05d120cd71f45f7539d2a88224cf11a Mon Sep 17 00:00:00 2001 From: Brad White Date: Wed, 18 Dec 2024 00:42:21 +0000 Subject: [PATCH 8/9] remove steps --- .buildkite/pipelines/pull_request/renovate.yml | 18 ------------------ .../scripts/pipelines/pull_request/pipeline.ts | 1 - 2 files changed, 19 deletions(-) diff --git a/.buildkite/pipelines/pull_request/renovate.yml b/.buildkite/pipelines/pull_request/renovate.yml index 392512bb911f..98302a8d7912 100644 --- a/.buildkite/pipelines/pull_request/renovate.yml +++ b/.buildkite/pipelines/pull_request/renovate.yml @@ -1,22 +1,4 @@ steps: - - command: .buildkite/scripts/lifecycle/pre_build.sh - label: Pre-Build - timeout_in_minutes: 10 - agents: - machineType: n2-standard-2 - - - wait - - - command: .buildkite/scripts/steps/ci_stats_ready.sh - label: Mark CI Stats as ready - agents: - machineType: n2-standard-2 - timeout_in_minutes: 10 - retry: - automatic: - - exit_status: '*' - limit: 1 - - command: .buildkite/scripts/steps/renovate.sh label: 'Renovate validation' agents: diff --git a/.buildkite/scripts/pipelines/pull_request/pipeline.ts b/.buildkite/scripts/pipelines/pull_request/pipeline.ts index c2818b40ed70..abbe428903c6 100644 --- a/.buildkite/scripts/pipelines/pull_request/pipeline.ts +++ b/.buildkite/scripts/pipelines/pull_request/pipeline.ts @@ -44,7 +44,6 @@ const getPipeline = (filename: string, removeSteps = true) => { const onlyRunQuickChecks = true; // await areChangesSkippable([/^renovate\.json$/], REQUIRED_PATHS); if (onlyRunQuickChecks) { pipeline.push(getPipeline('.buildkite/pipelines/pull_request/renovate.yml', false)); - pipeline.push(getPipeline('.buildkite/pipelines/pull_request/post_build.yml')); console.log([...new Set(pipeline)].join('\n')); return; From 2c894e6738443cbb6cdd6fc664d42d4474de7805 Mon Sep 17 00:00:00 2001 From: Brad White Date: Wed, 18 Dec 2024 01:02:47 +0000 Subject: [PATCH 9/9] remove hard coded skip --- .buildkite/scripts/pipelines/pull_request/pipeline.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/scripts/pipelines/pull_request/pipeline.ts b/.buildkite/scripts/pipelines/pull_request/pipeline.ts index abbe428903c6..51587280c4ed 100644 --- a/.buildkite/scripts/pipelines/pull_request/pipeline.ts +++ b/.buildkite/scripts/pipelines/pull_request/pipeline.ts @@ -41,7 +41,7 @@ const getPipeline = (filename: string, removeSteps = true) => { pipeline.push(getAgentImageConfig({ returnYaml: true })); - const onlyRunQuickChecks = true; // await areChangesSkippable([/^renovate\.json$/], REQUIRED_PATHS); + const onlyRunQuickChecks = await areChangesSkippable([/^renovate\.json$/], REQUIRED_PATHS); if (onlyRunQuickChecks) { pipeline.push(getPipeline('.buildkite/pipelines/pull_request/renovate.yml', false));