Skip to content

[7.17](backport #39533) [BK] - Remove certain steps from running for Branches#39551

Merged
alexsapran merged 2 commits into7.17from
mergify/bp/7.17/pr-39533
May 15, 2024
Merged

[7.17](backport #39533) [BK] - Remove certain steps from running for Branches#39551
alexsapran merged 2 commits into7.17from
mergify/bp/7.17/pr-39533

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented May 14, 2024

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 is an automatic backport of pull request #39533 done by Mergify.

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
@mergify mergify bot requested a review from a team as a code owner May 14, 2024 10:28
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels May 14, 2024
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented May 14, 2024

Cherry-pick of 176e9b8 has failed:

On branch mergify/bp/7.17/pr-39533
Your branch is up to date with 'origin/7.17'.

You are currently cherry-picking commit 176e9b8c6d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .buildkite/auditbeat/auditbeat-pipeline.yml
	modified:   .buildkite/filebeat/filebeat-pipeline.yml
	modified:   .buildkite/metricbeat/pipeline.yml
	modified:   .buildkite/x-pack/pipeline.xpack.auditbeat.yml
	modified:   .buildkite/x-pack/pipeline.xpack.filebeat.yml
	modified:   .buildkite/x-pack/pipeline.xpack.heartbeat.yml
	modified:   .buildkite/x-pack/pipeline.xpack.metricbeat.yml
	modified:   .buildkite/x-pack/pipeline.xpack.packetbeat.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .buildkite/packetbeat/pipeline.packetbeat.yml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 14, 2024
@botelastic
Copy link
Copy Markdown

botelastic bot commented May 14, 2024

This pull request doesn't have a Team:<team> label.

Signed-off-by: Alexandros Sapranidis <alexandros@elastic.co>
Copy link
Copy Markdown
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 enabled auto-merge (squash) May 15, 2024 12:06
@alexsapran alexsapran merged commit 9f5bd5a into 7.17 May 15, 2024
@alexsapran alexsapran deleted the mergify/bp/7.17/pr-39533 branch May 15, 2024 12:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants