Skip to content

Commit

Permalink
[CI] Separate pipeline for packageing elastic-agent v 7.17 (#37863)
Browse files Browse the repository at this point in the history
* [CI] Separate pipeline for packageing elastic-agent v 7.17

* Update catalog-info.yaml

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>

* catalog-info: corrected branch configuration

* Fxed conflicts

* [CI] Left only 7.17 in branch configuration for elastic-agent packaging

* Make elastic-agent packageing pipeline be triggered remotely only

* Disabled cancel_intermediate_builds for elastic-agent pipeline

* Remaned elastic agent packaging pipeline

* Remaned elastic agent packaging pipeline

---------

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
  • Loading branch information
pazone and v1v authored Feb 13, 2024
1 parent c3cedcf commit be66efa
Showing 1 changed file with 53 additions and 18 deletions.
71 changes: 53 additions & 18 deletions catalog-info.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ apiVersion: backstage.io/v1alpha1
kind: Resource
metadata:
name: buildkite-pipeline-beats
description: 'Beats Main pipeline'
description: "Beats Main pipeline"
links:
- title: Pipeline
url: https://buildkite.com/elastic/beats
Expand All @@ -37,9 +37,9 @@ spec:
kind: Pipeline
metadata:
name: beats
description: 'Beats Main pipeline'
description: "Beats Main pipeline"
spec:
branch_configuration: "main 7.* 8.* v7.* v8.*"
branch_configuration: "main 7.17 8.*"
pipeline_file: ".buildkite/pipeline.yml"
provider_settings:
build_pull_request_forks: false
Expand All @@ -50,9 +50,9 @@ spec:
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null)
repository: elastic/beats
cancel_intermediate_builds: true
cancel_intermediate_builds_branch_filter: '!main !7.* !8.*'
cancel_intermediate_builds_branch_filter: "!main !7.* !8.*"
skip_intermediate_builds: true
skip_intermediate_builds_branch_filter: '!main !7.* !8.*'
skip_intermediate_builds_branch_filter: "!main !7.* !8.*"
# TODO uncomment this environment variable when pipeline definition is updated
# env:
# ELASTIC_PR_COMMENTS_ENABLED: 'true'
Expand All @@ -68,7 +68,7 @@ apiVersion: backstage.io/v1alpha1
kind: Resource
metadata:
name: buildkite-pipeline-metricbeat
description: 'Beats: Metricbeat pipeline'
description: "Beats: Metricbeat pipeline"
links:
- title: Pipeline
url: https://buildkite.com/elastic/beats-metricbeat
Expand All @@ -82,9 +82,9 @@ spec:
kind: Pipeline
metadata:
name: beats-metricbeat
description: 'Beats Metricbeat pipeline'
description: "Beats Metricbeat pipeline"
spec:
branch_configuration: "main 7.* 8.* v7.* v8.*"
branch_configuration: "main 7.17 8.*"
pipeline_file: ".buildkite/metricbeat/pipeline.yml"
maximum_timeout_in_minutes: 120
provider_settings:
Expand All @@ -97,11 +97,11 @@ spec:
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null)
repository: elastic/beats
cancel_intermediate_builds: true
cancel_intermediate_builds_branch_filter: '!main !7.* !8.*'
cancel_intermediate_builds_branch_filter: "!main !7.* !8.*"
skip_intermediate_builds: true
skip_intermediate_builds_branch_filter: '!main !7.* !8.*'
skip_intermediate_builds_branch_filter: "!main !7.* !8.*"
env:
ELASTIC_PR_COMMENTS_ENABLED: 'true'
ELASTIC_PR_COMMENTS_ENABLED: "true"
teams:
ingest-fp:
access_level: MANAGE_BUILD_AND_READ
Expand Down Expand Up @@ -130,7 +130,7 @@ spec:
name: filebeat
description: "Filebeat pipeline"
spec:
branch_configuration: "main 7.* 8.* v7.* v8.*"
branch_configuration: "main 7.17 8.*"
pipeline_file: ".buildkite/filebeat/filebeat-pipeline.yml"
maximum_timeout_in_minutes: 120
provider_settings:
Expand Down Expand Up @@ -176,7 +176,7 @@ spec:
name: auditbeat
description: "Auditbeat pipeline"
spec:
# branch_configuration: "main 7.* 8.* v7.* v8.*" TODO: temporarily commented to build PRs from forks
# branch_configuration: "main 7.17 8.*" TODO: temporarily commented to build PRs from forks
pipeline_file: ".buildkite/auditbeat/auditbeat-pipeline.yml"
# maximum_timeout_in_minutes: 120 TODO: uncomment when pipeline is ready
provider_settings:
Expand Down Expand Up @@ -268,7 +268,7 @@ spec:
name: deploy-k8s
description: "Deploy K8S pipeline"
spec:
# branch_configuration: "main 7.* 8.* v7.* v8.*" TODO: temporarily commented to build PRs from forks
# branch_configuration: "main 7.17 8.*" TODO: temporarily commented to build PRs from forks
pipeline_file: ".buildkite/deploy/kubernetes/deploy-k8s-pipeline.yml"
# maximum_timeout_in_minutes: 120 TODO: uncomment when pipeline is ready
provider_settings:
Expand Down Expand Up @@ -635,9 +635,9 @@ spec:
name: beats-xpack-metricbeat
description: "Beats x-pack metricbeat pipeline"
spec:
# branch_configuration: "main 7.17 8.*" #TODO: uncomment after tests
# branch_configuration: "7.17" #TODO: uncomment after tests
pipeline_file: ".buildkite/x-pack/pipeline.xpack.metricbeat.yml"
# maximum_timeout_in_minutes: 120 #TODO: uncomment after tests
maximum_timeout_in_minutes: 120
provider_settings:
trigger_mode: none # don't trigger jobs from github activity
build_pull_request_forks: false
Expand All @@ -648,13 +648,48 @@ spec:
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null)
repository: elastic/beats
cancel_intermediate_builds: true
cancel_intermediate_builds_branch_filter: "!main !7.17 !8.*"
cancel_intermediate_builds_branch_filter: "!7.17"
skip_intermediate_builds: true
skip_intermediate_builds_branch_filter: "!main !7.17 !8.*"
skip_intermediate_builds_branch_filter: "!7.17"
# env:
# ELASTIC_PR_COMMENTS_ENABLED: "true" #TODO: uncomment after tests
teams:
ingest-fp:
access_level: MANAGE_BUILD_AND_READ
everyone:
access_level: READ_ONLY

---
# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/e57ee3bed7a6f73077a3f55a38e76e40ec87a7cf/rre.schema.json
apiVersion: backstage.io/v1alpha1
kind: Resource
metadata:
name: beats-xpack-elastic-agent-package-7-17
description: Buildkite pipeline for packaging Elastic Agent v7.17 package
links:
- title: Pipeline
url: https://buildkite.com/elastic/beats-xpack-elastic-agent-package-7-17
spec:
type: buildkite-pipeline
owner: group:ingest-fp
system: buildkite
implementation:
apiVersion: buildkite.elastic.dev/v1
kind: Pipeline
metadata:
name: beats-xpack-elastic-agent-package-7-17
description: Buildkite pipeline for packaging Elastic Agent package
spec:
repository: elastic/elastic-agent
pipeline_file: ".buildkite/x-pack/elastic-agent/pipeline.xpack.elastic-agent.package.yml"
provider_settings:
trigger_mode: none # this pipeline is only triggered remotely
cancel_intermediate_builds: false
skip_intermediate_builds: false
teams:
ingest-fp:
access_level: MANAGE_BUILD_AND_READ
release-eng:
access_level: BUILD_AND_READ
everyone:
access_level: READ_ONLY

0 comments on commit be66efa

Please sign in to comment.