From 29d104cb53b9a466864949abf2adfcef92cea086 Mon Sep 17 00:00:00 2001 From: Dimitrios Liappis Date: Mon, 23 Jun 2025 14:39:13 +0300 Subject: [PATCH 1/3] Add skip-changelog PR label for bump VM PRs (#8627) This commit adds the `skip-changelog` GitHub label for PRs created by automation for Bump VM image PRs. Without it, the mandatory [fragment-in-pr](https://github.com/elastic/elastic-agent/blob/main/.github/workflows/fragment-in-pr.yml) check is failing thus preventing automerge. (cherry picked from commit 7a579fab85cc506939def19cb8f85ccb973cde4d) # Conflicts: # .ci/updatecli/updatecli-bump-vm-images.yml --- .ci/updatecli/updatecli-bump-vm-images.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.ci/updatecli/updatecli-bump-vm-images.yml b/.ci/updatecli/updatecli-bump-vm-images.yml index f1c2d3aa0f5..d70b6cabdd8 100644 --- a/.ci/updatecli/updatecli-bump-vm-images.yml +++ b/.ci/updatecli/updatecli-bump-vm-images.yml @@ -24,8 +24,14 @@ actions: automerge: false labels: - dependencies +<<<<<<< HEAD - backport-active-all title: '[Automation] Bump VM Image version to {{ source "latestVersion" }}' +======= + - backport-skip + - skip-changelog + title: '[{{ requiredEnv "BRANCH_NAME" }}][Automation] Bump VM Image version to {{ source "latestVersion" }}' +>>>>>>> 7a579fab8 (Add skip-changelog PR label for bump VM PRs (#8627)) sources: latestVersion: From 7e9e5011f172e2dae0ac2a5859fd60408326101a Mon Sep 17 00:00:00 2001 From: Dimitrios Liappis Date: Mon, 23 Jun 2025 14:48:05 +0300 Subject: [PATCH 2/3] Fix conflicts --- .ci/updatecli/updatecli-bump-vm-images.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.ci/updatecli/updatecli-bump-vm-images.yml b/.ci/updatecli/updatecli-bump-vm-images.yml index d70b6cabdd8..9fe845f56d4 100644 --- a/.ci/updatecli/updatecli-bump-vm-images.yml +++ b/.ci/updatecli/updatecli-bump-vm-images.yml @@ -24,14 +24,9 @@ actions: automerge: false labels: - dependencies -<<<<<<< HEAD - backport-active-all - title: '[Automation] Bump VM Image version to {{ source "latestVersion" }}' -======= - - backport-skip - skip-changelog title: '[{{ requiredEnv "BRANCH_NAME" }}][Automation] Bump VM Image version to {{ source "latestVersion" }}' ->>>>>>> 7a579fab8 (Add skip-changelog PR label for bump VM PRs (#8627)) sources: latestVersion: From 9589637870b9fe3067b37ff414a4a18d83eb49d5 Mon Sep 17 00:00:00 2001 From: Dimitrios Liappis Date: Mon, 23 Jun 2025 14:48:37 +0300 Subject: [PATCH 3/3] Fix conflicts --- .ci/updatecli/updatecli-bump-vm-images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/updatecli/updatecli-bump-vm-images.yml b/.ci/updatecli/updatecli-bump-vm-images.yml index 9fe845f56d4..3dc42db5604 100644 --- a/.ci/updatecli/updatecli-bump-vm-images.yml +++ b/.ci/updatecli/updatecli-bump-vm-images.yml @@ -26,7 +26,7 @@ actions: - dependencies - backport-active-all - skip-changelog - title: '[{{ requiredEnv "BRANCH_NAME" }}][Automation] Bump VM Image version to {{ source "latestVersion" }}' + title: '[Automation] Bump VM Image version to {{ source "latestVersion" }}' sources: latestVersion: