From e73ce4982a64d92bdc2f2f23687a99f53f13f219 Mon Sep 17 00:00:00 2001 From: Brad White Date: Wed, 18 Dec 2024 05:35:36 -0700 Subject: [PATCH] Fix/renovate pipeline (#204672) ## Summary Renovate pipeline isn't being uploaded to Buildkite properly and `pre` and `post` build steps were not necessary and create errors with CI stats. [Successful CI run](https://buildkite.com/elastic/kibana-pull-request/builds/261627) (cherry picked from commit ecd4567ac6d0663756724f7a4ed34401a0873389) --- .buildkite/pipelines/pull_request/renovate.yml | 8 -------- .buildkite/scripts/pipelines/pull_request/pipeline.ts | 7 ++++--- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.buildkite/pipelines/pull_request/renovate.yml b/.buildkite/pipelines/pull_request/renovate.yml index 3b441cfe5375a..98302a8d7912f 100644 --- a/.buildkite/pipelines/pull_request/renovate.yml +++ b/.buildkite/pipelines/pull_request/renovate.yml @@ -1,12 +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/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 54176fdc125b8..934d3d06180e3 100644 --- a/.buildkite/scripts/pipelines/pull_request/pipeline.ts +++ b/.buildkite/scripts/pipelines/pull_request/pipeline.ts @@ -39,15 +39,16 @@ const getPipeline = (filename: string, removeSteps = true) => { return; } + pipeline.push(getAgentImageConfig({ returnYaml: true })); + 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; } - pipeline.push(getAgentImageConfig({ returnYaml: true })); pipeline.push(getPipeline('.buildkite/pipelines/pull_request/base.yml', false)); if (await doAnyChangesMatch([/^packages\/kbn-handlebars/])) {