From f956af3c12edec6087f202e631de57967fce80e7 Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Wed, 7 Aug 2024 13:29:07 +0200 Subject: [PATCH 01/11] Update label schedule daily job for v8.16 --- .buildkite/pipeline.schedule-daily.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline.schedule-daily.yml b/.buildkite/pipeline.schedule-daily.yml index bda7869457e..1f4e386861a 100644 --- a/.buildkite/pipeline.schedule-daily.yml +++ b/.buildkite/pipeline.schedule-daily.yml @@ -26,7 +26,7 @@ steps: - step: "check" allow_failure: false - - label: "Check integrations local stacks - Stack Version v8.15" + - label: "Check integrations local stacks - Stack Version v8.16" trigger: "integrations" build: env: From 413d074fa57b1d5b360dbc31ec811cf6767923a9 Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Wed, 7 Aug 2024 13:54:15 +0200 Subject: [PATCH 02/11] Update updatecli to set label too --- .../bump-latest-snapshot-version.yml | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml b/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml index 65267d2403c..36b1e5432dc 100644 --- a/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml +++ b/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml @@ -30,6 +30,16 @@ sources: spec: file: https://storage.googleapis.com/artifacts-api/snapshots/main.json key: .version + latestSnapshotMajorMinor: + name: Get latest snapshort major and minor + kind: json + spec: + file: https://storage.googleapis.com/artifacts-api/snapshots/main.json + key: .version + transformers: + - findsubmatch: + pattern: '(^\d+\.\d+)\.\d+$' + captureindex: 1 targets: update-snapshot: @@ -41,3 +51,13 @@ targets: file: '.buildkite/pipeline.schedule-daily.yml' matchpattern: '(STACK_VERSION:) 8\.[^\s]*\.[^\s]*' replacepattern: '$1 {{ source "latestSnapshot" }}' + + update-snapshot-label: + name: '[updatecli] Update latest snapshot label to {{ source "latestSnapshotMinor" }}' + kind: file + sourceid: latestSnapshot + scmid: default + spec: + file: '.buildkite/pipeline.schedule-daily.yml' + matchpattern: '(Stack Version v8\.)[^\s]+)+ ' + replacepattern: 'Stack Vresion v{{ source "latestSnapshotMajorMinor" }}' From 6681caab40c5fae94e6fa78a91df09ceea4b7b04 Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Wed, 7 Aug 2024 13:54:26 +0200 Subject: [PATCH 03/11] Revert "Update label schedule daily job for v8.16" This reverts commit f956af3c12edec6087f202e631de57967fce80e7. --- .buildkite/pipeline.schedule-daily.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline.schedule-daily.yml b/.buildkite/pipeline.schedule-daily.yml index 1f4e386861a..bda7869457e 100644 --- a/.buildkite/pipeline.schedule-daily.yml +++ b/.buildkite/pipeline.schedule-daily.yml @@ -26,7 +26,7 @@ steps: - step: "check" allow_failure: false - - label: "Check integrations local stacks - Stack Version v8.16" + - label: "Check integrations local stacks - Stack Version v8.15" trigger: "integrations" build: env: From ed9265b120e3b39895695de5c1b30f53ce8f24b4 Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Wed, 7 Aug 2024 14:06:35 +0200 Subject: [PATCH 04/11] Fix path to trigger action on pull requests --- .github/workflows/bump-elastic-stack-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-elastic-stack-version.yml b/.github/workflows/bump-elastic-stack-version.yml index c3182297576..7f6ab03779b 100644 --- a/.github/workflows/bump-elastic-stack-version.yml +++ b/.github/workflows/bump-elastic-stack-version.yml @@ -7,7 +7,7 @@ on: - cron: '0 1 * * 1-5' pull_request: paths: - - .github/updatecli.d/* + - .github/workflows/updatecli.d/* - .github/workflows/bump-elastic-stack-version.yml permissions: From 08e5d55022d5f8e9ffe73d5006918755ba8d1dfe Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Wed, 7 Aug 2024 14:07:26 +0200 Subject: [PATCH 05/11] Fix typo --- .github/workflows/updatecli.d/bump-latest-snapshot-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml b/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml index 36b1e5432dc..438d607daae 100644 --- a/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml +++ b/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml @@ -60,4 +60,4 @@ targets: spec: file: '.buildkite/pipeline.schedule-daily.yml' matchpattern: '(Stack Version v8\.)[^\s]+)+ ' - replacepattern: 'Stack Vresion v{{ source "latestSnapshotMajorMinor" }}' + replacepattern: 'Stack Version v{{ source "latestSnapshotMajorMinor" }}' From 8e3bebe86249428c728c1e96a5ac13a46b1134eb Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Wed, 7 Aug 2024 14:11:31 +0200 Subject: [PATCH 06/11] Use the right source key --- .github/workflows/updatecli.d/bump-latest-snapshot-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml b/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml index 438d607daae..b912056bb6d 100644 --- a/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml +++ b/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml @@ -53,7 +53,7 @@ targets: replacepattern: '$1 {{ source "latestSnapshot" }}' update-snapshot-label: - name: '[updatecli] Update latest snapshot label to {{ source "latestSnapshotMinor" }}' + name: '[updatecli] Update latest snapshot label step to {{ source "latestSnapshotMajorMinor" }}' kind: file sourceid: latestSnapshot scmid: default From bf81dbcedf3e90f7da6a7192d6876cbb719e000e Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Wed, 7 Aug 2024 14:18:40 +0200 Subject: [PATCH 07/11] Update regex --- .github/workflows/updatecli.d/bump-latest-snapshot-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml b/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml index b912056bb6d..a37ec8e36d4 100644 --- a/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml +++ b/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml @@ -59,5 +59,5 @@ targets: scmid: default spec: file: '.buildkite/pipeline.schedule-daily.yml' - matchpattern: '(Stack Version v8\.)[^\s]+)+ ' + matchpattern: '(Stack Version v8\.)[^\s]+"$' replacepattern: 'Stack Version v{{ source "latestSnapshotMajorMinor" }}' From b853ae392b7aa34dd97c96fe76b86362547f6489 Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Wed, 7 Aug 2024 14:26:19 +0200 Subject: [PATCH 08/11] Update sourceid --- .../workflows/updatecli.d/bump-latest-snapshot-version.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml b/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml index a37ec8e36d4..a1881adcf9e 100644 --- a/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml +++ b/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml @@ -55,9 +55,10 @@ targets: update-snapshot-label: name: '[updatecli] Update latest snapshot label step to {{ source "latestSnapshotMajorMinor" }}' kind: file - sourceid: latestSnapshot + sourceid: latestSnapshotMajorMinor scmid: default spec: file: '.buildkite/pipeline.schedule-daily.yml' matchpattern: '(Stack Version v8\.)[^\s]+"$' - replacepattern: 'Stack Version v{{ source "latestSnapshotMajorMinor" }}' + replacepattern: 'Stack Version v{{ source "latestSnapshotMajorMinor" }}"' + From 1662cad13bd1d68f1298c99eb368166e822539f6 Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Wed, 7 Aug 2024 14:32:46 +0200 Subject: [PATCH 09/11] Update pattern in transformers object --- .github/workflows/updatecli.d/bump-latest-snapshot-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml b/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml index a1881adcf9e..912f92334c6 100644 --- a/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml +++ b/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml @@ -38,7 +38,7 @@ sources: key: .version transformers: - findsubmatch: - pattern: '(^\d+\.\d+)\.\d+$' + pattern: '(^\d+\.\d+)\.[^\s]+$' captureindex: 1 targets: From f7d8b048f57b64078dc7216a13d13bd0838b7fd1 Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Wed, 7 Aug 2024 14:42:36 +0200 Subject: [PATCH 10/11] Update pattern for target --- .github/workflows/updatecli.d/bump-latest-snapshot-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml b/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml index 912f92334c6..ab366e22d1f 100644 --- a/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml +++ b/.github/workflows/updatecli.d/bump-latest-snapshot-version.yml @@ -59,6 +59,6 @@ targets: scmid: default spec: file: '.buildkite/pipeline.schedule-daily.yml' - matchpattern: '(Stack Version v8\.)[^\s]+"$' + matchpattern: '(Stack Version) v8\.\d+"' replacepattern: 'Stack Version v{{ source "latestSnapshotMajorMinor" }}"' From 10a8455dbca9e97344ba5c5cedeb81ffac8d4573 Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Thu, 8 Aug 2024 17:47:47 +0200 Subject: [PATCH 11/11] Remove empty line --- .../updatecli/updatecli.d/bump-latest-snapshot-version.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/updatecli/updatecli.d/bump-latest-snapshot-version.yml b/.github/workflows/updatecli/updatecli.d/bump-latest-snapshot-version.yml index fc73bb146e6..0943b8dab10 100644 --- a/.github/workflows/updatecli/updatecli.d/bump-latest-snapshot-version.yml +++ b/.github/workflows/updatecli/updatecli.d/bump-latest-snapshot-version.yml @@ -62,4 +62,3 @@ targets: file: '.buildkite/pipeline.schedule-daily.yml' matchpattern: '(Stack Version) v8\.\d+"' replacepattern: 'Stack Version v{{ source "latestSnapshotMajorMinor" }}"' -