Skip to content

Commit e688b51

Browse files
v1vmergify[bot]
v1v
authored and
mergify[bot]
committed
7.17 reached EoL (#48364)
(cherry picked from commit 7e90e2c) # Conflicts: # .github/workflows/bump-golang.yml # .github/workflows/updatecli.d/bump-golang-7.17.yml
1 parent 4d27bec commit e688b51

3 files changed

Lines changed: 62 additions & 56 deletions

File tree

‎.github/workflows/bump-golang.yml‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,25 @@ jobs:
1515
permissions:
1616
contents: write
1717
pull-requests: write
18-
strategy:
19-
fail-fast: false
20-
matrix:
21-
file: ['bump-golang.yml', 'bump-golang-7.17.yml']
2218
steps:
2319
- uses: actions/checkout@v4
2420

21+
<<<<<<< HEAD
2522
- name: Install Updatecli in the runner
2623
uses: updatecli/updatecli-action@704a64517239e0993c5e3bf6749a063b8f950d9f # v0.76.1
2724

2825
- name: Run Updatecli in Apply mode
2926
run: updatecli --experimental apply --config .github/workflows/updatecli.d/${{ matrix.file }} --values .github/workflows/updatecli.d/values.d/scm.yml
27+
=======
28+
- uses: elastic/oblt-actions/updatecli/run-and-notify@v1
29+
with:
30+
command: --experimental apply --config .github/workflows/updatecli.d/bump-golang.yml --values .github/workflows/updatecli.d/values.d/scm.yml
31+
slack-bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
32+
slack-channel-id: "#ingest-notifications"
33+
slack-message: ":traffic_cone: updatecli failed for `${{ github.repository }}@${{ github.ref_name }}`, @robots-ci please look what's going on <https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|here>"
34+
slack-send-when: "failure"
35+
version-file: .updatecli-version
36+
>>>>>>> 7e90e2cbc (7.17 reached EoL (#48364))
3037
env:
3138
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3239

‎.github/workflows/golangci-lint.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ on:
55
# branches:
66
# - main
77
# - 8.*
8-
# - 7.17
98
pull_request:
109
permissions:
1110
contents: read

‎catalog-info.yaml‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ spec:
3939
name: beats
4040
description: "Beats Main pipeline"
4141
spec:
42-
branch_configuration: "main 7.17 8.* 9.*"
42+
branch_configuration: "main 8.19 9.*"
4343
pipeline_file: ".buildkite/pipeline.yml"
4444
provider_settings:
4545
build_pull_request_forks: false
@@ -51,9 +51,9 @@ spec:
5151
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null)
5252
repository: elastic/beats
5353
cancel_intermediate_builds: true
54-
cancel_intermediate_builds_branch_filter: "!main !7.* !8.* !9.*"
54+
cancel_intermediate_builds_branch_filter: "!main !8.19 !9.*"
5555
skip_intermediate_builds: true
56-
skip_intermediate_builds_branch_filter: "!main !7.* !8.* !9.*"
56+
skip_intermediate_builds_branch_filter: "!main !8.19 !9.*"
5757
env:
5858
# TODO set to true once https://github.com/elastic/ingest-dev/issues/3001 has been resolved
5959
ELASTIC_PR_COMMENTS_ENABLED: "false"
@@ -89,7 +89,7 @@ spec:
8989
name: beats-metricbeat
9090
description: "Beats Metricbeat pipeline"
9191
spec:
92-
branch_configuration: "main 7.17 8.* 9.*"
92+
branch_configuration: "main 8.19 9.*"
9393
pipeline_file: ".buildkite/metricbeat/pipeline.yml"
9494
maximum_timeout_in_minutes: 120
9595
provider_settings:
@@ -102,9 +102,9 @@ spec:
102102
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null)
103103
repository: elastic/beats
104104
cancel_intermediate_builds: true
105-
cancel_intermediate_builds_branch_filter: "!main !7.* !8.* !9.*"
105+
cancel_intermediate_builds_branch_filter: "!main !8.19 !9.*"
106106
skip_intermediate_builds: true
107-
skip_intermediate_builds_branch_filter: "!main !7.* !8.* !9.*"
107+
skip_intermediate_builds_branch_filter: "!main !8.19 !9.*"
108108
env:
109109
# TODO set to truue once https://github.com/elastic/ingest-dev/issues/3001 has been resolved
110110
ELASTIC_PR_COMMENTS_ENABLED: "false"
@@ -136,7 +136,7 @@ spec:
136136
name: filebeat
137137
description: "Filebeat pipeline"
138138
spec:
139-
branch_configuration: "main 7.17 8.* 9.*"
139+
branch_configuration: "main 8.19 9.*"
140140
pipeline_file: ".buildkite/filebeat/filebeat-pipeline.yml"
141141
maximum_timeout_in_minutes: 120
142142
provider_settings:
@@ -149,9 +149,9 @@ spec:
149149
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null)
150150
repository: elastic/beats
151151
cancel_intermediate_builds: true
152-
cancel_intermediate_builds_branch_filter: "!main !7.* !8.* !9.*"
152+
cancel_intermediate_builds_branch_filter: "!main !8.19 !9.*"
153153
skip_intermediate_builds: true
154-
skip_intermediate_builds_branch_filter: "!main !7.* !8.* !9.*"
154+
skip_intermediate_builds_branch_filter: "!main !8.19 !9.*"
155155
env:
156156
# TODO set to truue once https://github.com/elastic/ingest-dev/issues/3001 has been resolved
157157
ELASTIC_PR_COMMENTS_ENABLED: "false"
@@ -196,9 +196,9 @@ spec:
196196
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null)
197197
repository: elastic/beats
198198
cancel_intermediate_builds: true
199-
cancel_intermediate_builds_branch_filter: "!main !7.* !8.* !9.*"
199+
cancel_intermediate_builds_branch_filter: "!main !8.19 !9.*"
200200
skip_intermediate_builds: true
201-
skip_intermediate_builds_branch_filter: "!main !7.* !8.* !9.*"
201+
skip_intermediate_builds_branch_filter: "!main !8.19 !9.*"
202202
env:
203203
# TODO set to true once https://github.com/elastic/ingest-dev/issues/3001 has been resolved
204204
ELASTIC_PR_COMMENTS_ENABLED: "false"
@@ -230,7 +230,7 @@ spec:
230230
name: heartbeat
231231
description: "Heartbeat pipeline"
232232
spec:
233-
branch_configuration: "main 7.17 8.* 9.*"
233+
branch_configuration: "main 8.19 9.*"
234234
pipeline_file: ".buildkite/heartbeat/heartbeat-pipeline.yml"
235235
maximum_timeout_in_minutes: 120
236236
provider_settings:
@@ -243,9 +243,9 @@ spec:
243243
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null)
244244
repository: elastic/beats
245245
cancel_intermediate_builds: true
246-
cancel_intermediate_builds_branch_filter: "!main !7.* !8.* !9.*"
246+
cancel_intermediate_builds_branch_filter: "!main !8.19 !9.*"
247247
skip_intermediate_builds: true
248-
skip_intermediate_builds_branch_filter: "!main !7.* !8.* !9.*"
248+
skip_intermediate_builds_branch_filter: "!main !8.19 !9.*"
249249
env:
250250
# TODO set to true once https://github.com/elastic/ingest-dev/issues/3001 has been resolved
251251
ELASTIC_PR_COMMENTS_ENABLED: "false"
@@ -290,9 +290,9 @@ spec:
290290
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null)
291291
repository: elastic/beats
292292
cancel_intermediate_builds: true
293-
cancel_intermediate_builds_branch_filter: "!main !7.* !8.* !9.*"
293+
cancel_intermediate_builds_branch_filter: "!main !8.19 !9.*"
294294
skip_intermediate_builds: true
295-
skip_intermediate_builds_branch_filter: "!main !7.* !8.* !9.*"
295+
skip_intermediate_builds_branch_filter: "!main !8.19 !9.*"
296296
env:
297297
# TODO set to true once https://github.com/elastic/ingest-dev/issues/3001 has been resolved
298298
ELASTIC_PR_COMMENTS_ENABLED: "false"
@@ -324,7 +324,7 @@ spec:
324324
name: beats-libbeat
325325
description: "Beats libbeat pipeline"
326326
spec:
327-
branch_configuration: "main 7.17 8.* 9.*"
327+
branch_configuration: "main 8.19 9.*"
328328
pipeline_file: ".buildkite/libbeat/pipeline.libbeat.yml"
329329
maximum_timeout_in_minutes: 120
330330
provider_settings:
@@ -337,9 +337,9 @@ spec:
337337
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null)
338338
repository: elastic/beats
339339
cancel_intermediate_builds: true
340-
cancel_intermediate_builds_branch_filter: "!main !7.17 !8.* !9.*"
340+
cancel_intermediate_builds_branch_filter: "!main !8.19 !9.*"
341341
skip_intermediate_builds: true
342-
skip_intermediate_builds_branch_filter: "!main !7.17 !8.* !9.*"
342+
skip_intermediate_builds_branch_filter: "!main !8.19 !9.*"
343343
env:
344344
# TODO set to true once https://github.com/elastic/ingest-dev/issues/3001 has been resolved
345345
ELASTIC_PR_COMMENTS_ENABLED: "false"
@@ -371,7 +371,7 @@ spec:
371371
name: beats-packetbeat
372372
description: "Beats packetbeat pipeline"
373373
spec:
374-
branch_configuration: "main 7.17 8.* 9.*"
374+
branch_configuration: "main 8.19 9.*"
375375
pipeline_file: ".buildkite/packetbeat/pipeline.packetbeat.yml"
376376
maximum_timeout_in_minutes: 120
377377
provider_settings:
@@ -384,9 +384,9 @@ spec:
384384
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null)
385385
repository: elastic/beats
386386
cancel_intermediate_builds: true
387-
cancel_intermediate_builds_branch_filter: "!main !7.17 !8.* !9.*"
387+
cancel_intermediate_builds_branch_filter: "!main !8.19 !9.*"
388388
skip_intermediate_builds: true
389-
skip_intermediate_builds_branch_filter: "!main !7.17 !8.* !9.*"
389+
skip_intermediate_builds_branch_filter: "!main !8.19 !9.*"
390390
env:
391391
# TODO set to true once https://github.com/elastic/ingest-dev/issues/3001 has been resolved
392392
ELASTIC_PR_COMMENTS_ENABLED: "false"
@@ -430,9 +430,9 @@ spec:
430430
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null)
431431
repository: elastic/beats
432432
cancel_intermediate_builds: true
433-
cancel_intermediate_builds_branch_filter: "!main !7.17 !8.* !9.*"
433+
cancel_intermediate_builds_branch_filter: "!main !8.19 !9.*"
434434
skip_intermediate_builds: true
435-
skip_intermediate_builds_branch_filter: "!main !7.17 !8.* !9.*"
435+
skip_intermediate_builds_branch_filter: "!main !8.19 !9.*"
436436
env:
437437
# TODO set to true once https://github.com/elastic/ingest-dev/issues/3001 has been resolved
438438
ELASTIC_PR_COMMENTS_ENABLED: "false"
@@ -464,7 +464,7 @@ spec:
464464
name: beats-winlogbeat
465465
description: "Beats winlogbeat pipeline"
466466
spec:
467-
branch_configuration: "main 7.17 8.* 9.*"
467+
branch_configuration: "main 8.19 9.*"
468468
pipeline_file: ".buildkite/winlogbeat/pipeline.winlogbeat.yml"
469469
maximum_timeout_in_minutes: 120
470470
provider_settings:
@@ -477,9 +477,9 @@ spec:
477477
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null)
478478
repository: elastic/beats
479479
cancel_intermediate_builds: true
480-
cancel_intermediate_builds_branch_filter: "!main !7.17 !8.* !9.*"
480+
cancel_intermediate_builds_branch_filter: "!main !8.19 !9.*"
481481
skip_intermediate_builds: true
482-
skip_intermediate_builds_branch_filter: "!main !7.17 !8.* !9.*"
482+
skip_intermediate_builds_branch_filter: "!main !8.19 !9.*"
483483
env:
484484
# TODO set to true once https://github.com/elastic/ingest-dev/issues/3001 has been resolved
485485
ELASTIC_PR_COMMENTS_ENABLED: "false"
@@ -511,7 +511,7 @@ spec:
511511
name: beats-xpack-winlogbeat
512512
description: "Beats x-pack winlogbeat pipeline"
513513
spec:
514-
branch_configuration: "main 7.17 8.* 9.*"
514+
branch_configuration: "main 8.19 9.*"
515515
pipeline_file: ".buildkite/x-pack/pipeline.xpack.winlogbeat.yml"
516516
maximum_timeout_in_minutes: 120
517517
provider_settings:
@@ -524,9 +524,9 @@ spec:
524524
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null)
525525
repository: elastic/beats
526526
cancel_intermediate_builds: true
527-
cancel_intermediate_builds_branch_filter: "!main !7.17 !8.* !9.*"
527+
cancel_intermediate_builds_branch_filter: "!main !8.19 !9.*"
528528
skip_intermediate_builds: true
529-
skip_intermediate_builds_branch_filter: "!main !7.17 !8.* !9.*"
529+
skip_intermediate_builds_branch_filter: "!main !8.19 !9.*"
530530
env:
531531
# TODO set to true once https://github.com/elastic/ingest-dev/issues/3001 has been resolved
532532
ELASTIC_PR_COMMENTS_ENABLED: "false"
@@ -558,7 +558,7 @@ spec:
558558
name: beats-xpack-packetbeat
559559
description: "Beats x-pack packetbeat pipeline"
560560
spec:
561-
branch_configuration: "main 7.17 8.* 9.*"
561+
branch_configuration: "main 8.19 9.*"
562562
pipeline_file: ".buildkite/x-pack/pipeline.xpack.packetbeat.yml"
563563
maximum_timeout_in_minutes: 120
564564
provider_settings:
@@ -571,9 +571,9 @@ spec:
571571
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null)
572572
repository: elastic/beats
573573
cancel_intermediate_builds: true
574-
cancel_intermediate_builds_branch_filter: "!main !7.17 !8.* !9.*"
574+
cancel_intermediate_builds_branch_filter: "!main !8.19 !9.*"
575575
skip_intermediate_builds: true
576-
skip_intermediate_builds_branch_filter: "!main !7.17 !8.* !9.*"
576+
skip_intermediate_builds_branch_filter: "!main !8.19 !9.*"
577577
env:
578578
# TODO set to true once https://github.com/elastic/ingest-dev/issues/3001 has been resolved
579579
ELASTIC_PR_COMMENTS_ENABLED: "false"
@@ -605,7 +605,7 @@ spec:
605605
name: beats-xpack-libbeat
606606
description: "Beats x-pack libbeat pipeline"
607607
spec:
608-
branch_configuration: "main 7.17 8.* 9.*"
608+
branch_configuration: "main 8.19 9.*"
609609
pipeline_file: ".buildkite/x-pack/pipeline.xpack.libbeat.yml"
610610
maximum_timeout_in_minutes: 120
611611
provider_settings:
@@ -618,9 +618,9 @@ spec:
618618
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null)
619619
repository: elastic/beats
620620
cancel_intermediate_builds: true
621-
cancel_intermediate_builds_branch_filter: "!main !7.17 !8.* !9.*"
621+
cancel_intermediate_builds_branch_filter: "!main !8.19 !9.*"
622622
skip_intermediate_builds: true
623-
skip_intermediate_builds_branch_filter: "!main !7.17 !8.* !9.*"
623+
skip_intermediate_builds_branch_filter: "!main !8.19 !9.*"
624624
env:
625625
# TODO set to true once https://github.com/elastic/ingest-dev/issues/3001 has been resolved
626626
ELASTIC_PR_COMMENTS_ENABLED: "false"
@@ -652,7 +652,7 @@ spec:
652652
name: beats-xpack-metricbeat
653653
description: "Beats x-pack metricbeat pipeline"
654654
spec:
655-
branch_configuration: "main 7.17 8.* 9.*"
655+
branch_configuration: "main 8.19 9.*"
656656
pipeline_file: ".buildkite/x-pack/pipeline.xpack.metricbeat.yml"
657657
maximum_timeout_in_minutes: 120
658658
provider_settings:
@@ -665,9 +665,9 @@ spec:
665665
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null)
666666
repository: elastic/beats
667667
cancel_intermediate_builds: true
668-
cancel_intermediate_builds_branch_filter: "!main !7.17 !8.* !9.*"
668+
cancel_intermediate_builds_branch_filter: "!main !8.19 !9.*"
669669
skip_intermediate_builds: true
670-
skip_intermediate_builds_branch_filter: "!main !7.17 !8.* !9.*"
670+
skip_intermediate_builds_branch_filter: "!main !8.19 !9.*"
671671
env:
672672
# TODO set to true once https://github.com/elastic/ingest-dev/issues/3001 has been resolved
673673
ELASTIC_PR_COMMENTS_ENABLED: "false"
@@ -782,9 +782,9 @@ spec:
782782
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null)
783783
repository: elastic/beats
784784
cancel_intermediate_builds: true
785-
cancel_intermediate_builds_branch_filter: "!main !7.17 !8.* !9.*"
785+
cancel_intermediate_builds_branch_filter: "!main !8.19 !9.*"
786786
skip_intermediate_builds: true
787-
skip_intermediate_builds_branch_filter: "!main !7.17 !8.* !9.*"
787+
skip_intermediate_builds_branch_filter: "!main !8.19 !9.*"
788788
env:
789789
# TODO set to true once https://github.com/elastic/ingest-dev/issues/3001 has been resolved
790790
ELASTIC_PR_COMMENTS_ENABLED: "false"
@@ -829,9 +829,9 @@ spec:
829829
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null)
830830
repository: elastic/beats
831831
cancel_intermediate_builds: true
832-
cancel_intermediate_builds_branch_filter: "!main !7.17 !8.* !9.*"
832+
cancel_intermediate_builds_branch_filter: "!main !8.19 !9.*"
833833
skip_intermediate_builds: true
834-
skip_intermediate_builds_branch_filter: "!main !7.17 !8.* !9.*"
834+
skip_intermediate_builds_branch_filter: "!main !8.19 !9.*"
835835
env:
836836
# TODO set to true once https://github.com/elastic/ingest-dev/issues/3001 has been resolved
837837
ELASTIC_PR_COMMENTS_ENABLED: "false"
@@ -876,9 +876,9 @@ spec:
876876
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null)
877877
repository: elastic/beats
878878
cancel_intermediate_builds: true
879-
cancel_intermediate_builds_branch_filter: "!main !7.17 !8.* !9.*"
879+
cancel_intermediate_builds_branch_filter: "!main !8.19 !9.*"
880880
skip_intermediate_builds: true
881-
skip_intermediate_builds_branch_filter: "!main !7.17 !8.* !9.*"
881+
skip_intermediate_builds_branch_filter: "!main !8.19 !9.*"
882882
env:
883883
# TODO set to true once https://github.com/elastic/ingest-dev/issues/3001 has been resolved
884884
ELASTIC_PR_COMMENTS_ENABLED: "false"
@@ -923,9 +923,9 @@ spec:
923923
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null)
924924
repository: elastic/beats
925925
cancel_intermediate_builds: true
926-
cancel_intermediate_builds_branch_filter: "!main !7.17 !8.* !9.*"
926+
cancel_intermediate_builds_branch_filter: "!main !8.19 !9.*"
927927
skip_intermediate_builds: true
928-
skip_intermediate_builds_branch_filter: "!main !7.17 !8.* !9.*"
928+
skip_intermediate_builds_branch_filter: "!main !8.19 !9.*"
929929
env:
930930
# TODO set to true once https://github.com/elastic/ingest-dev/issues/3001 has been resolved
931931
ELASTIC_PR_COMMENTS_ENABLED: "false"
@@ -970,9 +970,9 @@ spec:
970970
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null)
971971
repository: elastic/beats
972972
cancel_intermediate_builds: true
973-
cancel_intermediate_builds_branch_filter: "!main !7.17 !8.* !9.*"
973+
cancel_intermediate_builds_branch_filter: "!main !8.19 !9.*"
974974
skip_intermediate_builds: true
975-
skip_intermediate_builds_branch_filter: "!main !7.17 !8.* !9.*"
975+
skip_intermediate_builds_branch_filter: "!main !8.19 !9.*"
976976
env:
977977
# TODO set to true once https://github.com/elastic/ingest-dev/issues/3001 has been resolved
978978
ELASTIC_PR_COMMENTS_ENABLED: "false"
@@ -1053,7 +1053,7 @@ spec:
10531053
spec:
10541054
repository: elastic/beats
10551055
pipeline_file: ".buildkite/packaging.pipeline.yml"
1056-
branch_configuration: "main 8.* 7.17 9.*"
1056+
branch_configuration: "main 8.19 9.*"
10571057
cancel_intermediate_builds: false
10581058
skip_intermediate_builds: false
10591059
maximum_timeout_in_minutes: 90
@@ -1102,7 +1102,7 @@ spec:
11021102
spec:
11031103
repository: elastic/beats
11041104
pipeline_file: ".buildkite/ironbank-validation.yml"
1105-
branch_configuration: "main 8.* 7.17 9.*"
1105+
branch_configuration: "main 8.19 9.*"
11061106
cancel_intermediate_builds: false
11071107
skip_intermediate_builds: false
11081108
provider_settings:

0 commit comments

Comments
 (0)