Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BK] - Remove certain steps from running for Branches #39533

Merged

Conversation

alexsapran
Copy link
Contributor

Proposed commit message

This commit makes some adjustments in the step conditions after reviewing the Jenkins files and how we perform the step validations in Jenkinsfile.

If a key when is inside the Jenkinsfile step 1, it will validate the required conditions 2, and if there are no branches: true, it will not include that step.

I tried to go over the various project and try to consolidate the conditions.

This commit makes some adjustments in the step conditions after
reviewing the Jenkins files and how we perform the step validations in
Jenkinsfile.

If there is a key `when` inside the Jenkinsfile step it will validate the required
conditions and if there is no `branches: true` then it will not include that
step.

Signed-off-by: Alexandros Sapranidis <alexandros@elastic.co>
@alexsapran alexsapran added ci backport-v7.17.0 Automated backport with mergify backport-v8.13.0 Automated backport with mergify backport-v8.14.0 Automated backport with mergify labels May 13, 2024
@alexsapran alexsapran requested a review from dliappis May 13, 2024 12:30
@alexsapran alexsapran self-assigned this May 13, 2024
@alexsapran alexsapran requested a review from a team as a code owner May 13, 2024 12:30
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 13, 2024
@alexsapran alexsapran changed the title Remove certain steps from running for Branches [BK] - Remove certain steps from running for Branches May 13, 2024
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label May 13, 2024
Copy link
Contributor

@dliappis dliappis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@alexsapran alexsapran merged commit 176e9b8 into elastic:main May 14, 2024
77 checks passed
@alexsapran alexsapran deleted the buildkite/fix-main-steps-from-jenkins branch May 14, 2024 10:26
mergify bot pushed a commit that referenced this pull request May 14, 2024
This commit makes some adjustments in the step conditions after
reviewing the Jenkins files and how we perform the step validations in
Jenkinsfile.

If there is a key `when` inside the Jenkinsfile step, it will validate the required
conditions, and if there are no `branches: true`, then it will not include that
step.

Signed-off-by: Alexandros Sapranidis <alexandros@elastic.co>
(cherry picked from commit 176e9b8)
mergify bot pushed a commit that referenced this pull request May 14, 2024
This commit makes some adjustments in the step conditions after
reviewing the Jenkins files and how we perform the step validations in
Jenkinsfile.

If there is a key `when` inside the Jenkinsfile step, it will validate the required
conditions, and if there are no `branches: true`, then it will not include that
step.

Signed-off-by: Alexandros Sapranidis <alexandros@elastic.co>
(cherry picked from commit 176e9b8)
mergify bot pushed a commit that referenced this pull request May 14, 2024
This commit makes some adjustments in the step conditions after
reviewing the Jenkins files and how we perform the step validations in
Jenkinsfile.

If there is a key `when` inside the Jenkinsfile step, it will validate the required
conditions, and if there are no `branches: true`, then it will not include that
step.

Signed-off-by: Alexandros Sapranidis <alexandros@elastic.co>
(cherry picked from commit 176e9b8)

# Conflicts:
#	.buildkite/packetbeat/pipeline.packetbeat.yml
alexsapran added a commit that referenced this pull request May 14, 2024
…Branches (#39549)

This commit makes some adjustments in the step conditions after
reviewing the Jenkins files and how we perform the step validations in
Jenkinsfile.

If there is a key `when` inside the Jenkinsfile step, it will validate the required
conditions, and if there are no `branches: true`, then it will not include that
step.

Signed-off-by: Alexandros Sapranidis <alexandros@elastic.co>
(cherry picked from commit 176e9b8)

Co-authored-by: Alexandros Sapranidis <alexandros@elastic.co>
alexsapran added a commit that referenced this pull request May 14, 2024
…Branches (#39550)

This commit makes some adjustments in the step conditions after
reviewing the Jenkins files and how we perform the step validations in
Jenkinsfile.

If there is a key `when` inside the Jenkinsfile step, it will validate the required
conditions, and if there are no `branches: true`, then it will not include that
step.

Signed-off-by: Alexandros Sapranidis <alexandros@elastic.co>
(cherry picked from commit 176e9b8)

Co-authored-by: Alexandros Sapranidis <alexandros@elastic.co>
alexsapran added a commit that referenced this pull request May 15, 2024
…Branches (#39551)

* [BK] - Remove specific steps from running for Branches (#39533)

This commit makes some adjustments in the step conditions after
reviewing the Jenkins files and how we perform the step validations in
Jenkinsfile.

If there is a key `when` inside the Jenkinsfile step, it will validate the required
conditions, and if there are no `branches: true`, then it will not include that
step.

Signed-off-by: Alexandros Sapranidis <alexandros@elastic.co>
(cherry picked from commit 176e9b8)

Signed-off-by: Alexandros Sapranidis <alexandros@elastic.co>
Co-authored-by: Alexandros Sapranidis <alexandros@elastic.co>
v1v added a commit to v1v/beats that referenced this pull request May 15, 2024
…-actions

* upstream/main: (313 commits)
  github-action: delete opentelemetry workflow (elastic#39559)
  updatecli: move to the .github folder and support for signed commits (elastic#39472)
  Osquerybeat: Add action responses data stream (elastic#39143)
  [winlogbeat] performance improvment; avoid rendering event message twice (elastic#39544)
  Fix the AWS SDK dependencies issue causing the "not found, ResolveEndpointV2" error (elastic#39454)
  x-pack/filebeat/input/cel: add http metrics collection (elastic#39503)
  build(deps): bump github.com/elastic/elastic-agent-libs from 0.9.4 to 0.9.7 (elastic#39424)
  Remove unused env vars from pipelines (elastic#39534)
  [BK] - Remove osx steps from branch execution (elastic#39552)
  [BK] - Remove certain steps from running for Branches (elastic#39533)
  Allow dependabot report BK status checks (elastic#39540)
  Remove hardcoded module definitions in CI (elastic#39506)
  Explicitly set DOCKER_PULL, RACE_DETECTOR and TEST_COVERAGE for pipelines (elastic#39510)
  Fixed pipelines formatting (elastic#39513)
  Update filebeat pipeline to match Jenkins steps (elastic#39261)
  Add error check to groupToEvents so we don't blindly add error values (elastic#39404)
  Remove fields not needed for session view in add_session_view processor (elastic#39500)
  `aws-s3` input: Split S3 poller and SQS reader into explicit input objects (elastic#39353)
  ci(jenkins): remove post-build notifications (elastic#39483)
  [DOCS] Add the `read_pipeline` cluster privilege for winlogbeat and the `auto_configure` index privilege to beats documentation (elastic#38534)
  ...
dliappis added a commit to dliappis/beats that referenced this pull request May 16, 2024
This PR partially reverts elastic#39533 and restores the execution of macOS CI
with merge commits (`main` + release branches) since there is coverage
via GH actions.

It also removes the GH actions to avoid duplicate checks.
dliappis added a commit that referenced this pull request May 16, 2024
This PR partially reverts #39533 and restores the execution of macOS CI
with merge commits (`main` + release branches) since there is coverage
via GH actions.

It also removes the GH actions to avoid duplicate checks.
mergify bot pushed a commit that referenced this pull request May 16, 2024
This PR partially reverts #39533 and restores the execution of macOS CI
with merge commits (`main` + release branches) since there is coverage
via GH actions.

It also removes the GH actions to avoid duplicate checks.

(cherry picked from commit 2aef900)

# Conflicts:
#	.buildkite/auditbeat/auditbeat-pipeline.yml
#	.buildkite/filebeat/filebeat-pipeline.yml
#	.github/workflows/macos-auditbeat.yml
#	.github/workflows/macos-filebeat.yml
#	.github/workflows/macos-heartbeat.yml
#	.github/workflows/macos-metricbeat.yml
#	.github/workflows/macos-packetbeat.yml
#	.github/workflows/macos-xpack-auditbeat.yml
#	.github/workflows/macos-xpack-filebeat.yml
#	.github/workflows/macos-xpack-functionbeat.yml
#	.github/workflows/macos-xpack-heartbeat.yml
#	.github/workflows/macos-xpack-metricbeat.yml
#	.github/workflows/macos-xpack-osquerybeat.yml
#	.github/workflows/macos-xpack-packetbeat.yml
mergify bot pushed a commit that referenced this pull request May 16, 2024
This PR partially reverts #39533 and restores the execution of macOS CI
with merge commits (`main` + release branches) since there is coverage
via GH actions.

It also removes the GH actions to avoid duplicate checks.

(cherry picked from commit 2aef900)
mergify bot pushed a commit that referenced this pull request May 16, 2024
This PR partially reverts #39533 and restores the execution of macOS CI
with merge commits (`main` + release branches) since there is coverage
via GH actions.

It also removes the GH actions to avoid duplicate checks.

(cherry picked from commit 2aef900)

# Conflicts:
#	.github/workflows/macos-auditbeat.yml
#	.github/workflows/macos-filebeat.yml
#	.github/workflows/macos-heartbeat.yml
#	.github/workflows/macos-metricbeat.yml
#	.github/workflows/macos-packetbeat.yml
#	.github/workflows/macos-xpack-auditbeat.yml
#	.github/workflows/macos-xpack-filebeat.yml
#	.github/workflows/macos-xpack-functionbeat.yml
#	.github/workflows/macos-xpack-heartbeat.yml
#	.github/workflows/macos-xpack-metricbeat.yml
#	.github/workflows/macos-xpack-osquerybeat.yml
#	.github/workflows/macos-xpack-packetbeat.yml
dliappis added a commit to dliappis/beats that referenced this pull request May 16, 2024
This PR partially reverts elastic#39533 and restores the execution of macOS CI
with merge commits (`main` + release branches) since there is coverage
via GH actions.

It also removes the GH actions to avoid duplicate checks.
dliappis added a commit to dliappis/beats that referenced this pull request May 16, 2024
This PR partially reverts elastic#39533 and restores the execution of macOS CI
with merge commits (`main` + release branches) since there is coverage
via GH actions.

It also removes the GH actions to avoid duplicate checks.
dliappis added a commit that referenced this pull request May 16, 2024
This PR partially reverts #39533 and restores the execution of macOS CI
with merge commits (`main` + release branches) since there is coverage
via GH actions.

It also removes the GH actions to avoid duplicate checks.

(cherry picked from commit 2aef900)

Co-authored-by: Dimitrios Liappis <dimitrios.liappis@gmail.com>
dliappis added a commit that referenced this pull request May 17, 2024
…#39599)

This PR partially reverts #39533 and restores the execution of macOS CI
with merge commits (`main` + release branches) since there is coverage
via GH actions.

It also removes the GH actions to avoid duplicate checks.

(cherry picked from commit 2aef900)

---------

Co-authored-by: Dimitrios Liappis <dimitrios.liappis@gmail.com>
dliappis added a commit that referenced this pull request May 17, 2024
…#39603)

This PR partially reverts #39533 and restores the execution of macOS CI
with merge commits (`main` + release branches) since there is coverage
via GH actions.

It also removes the GH actions to avoid duplicate checks.

(cherry picked from commit 2aef900)

Co-authored-by: Dimitrios Liappis <dimitrios.liappis@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-v7.17.0 Automated backport with mergify backport-v8.13.0 Automated backport with mergify backport-v8.14.0 Automated backport with mergify ci Team:Ingest-EngProd
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants