Skip to content

[CI] Support skip-ci label #21377

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.

Sign up for GitHub

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

Merged
merged 10 commits into from
Oct 14, 2020
Merged

[CI] Support skip-ci label #21377

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a62db30
[CI] Support skip-build-ci label
v1v Sep 29, 2020
84d1c08
[CI] Support disabled
v1v Sep 29, 2020
2bf8051
Support labels
v1v Sep 30, 2020
cb2bd71
Merge remote-tracking branch 'upstream/master' into feature/2.0-skip-…
v1v Sep 30, 2020
e4cd0be
For testing purposes
v1v Sep 30, 2020
7c218ea
Merge remote-tracking branch 'upstream/master' into feature/2.0-skip-…
v1v Oct 2, 2020
2a3d98f
use one label and error
v1v Oct 2, 2020
956e92f
Update Jenkinsfile
v1v Oct 2, 2020
36ed51a
Merge remote-tracking branch 'upstream/master' into feature/2.0-skip-…
v1v Oct 8, 2020
92a2dc5
Merge branch 'feature/2.0-skip-ci-build-label-support' of github.com:…
v1v Oct 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,18 @@ pipeline {
script {
def mapParallelTasks = [:]
def content = readYaml(file: 'Jenkinsfile.yml')
content['projects'].each { projectName ->
generateStages(project: projectName, changeset: content['changeset']).each { k,v ->
mapParallelTasks["${k}"] = v
println content
if (content?.disabled?.when?.labels && beatsWhen(project: 'top-level', content: content?.disabled?.when)) {
error 'Pull Request has been configured to be disabled when there is a skip-ci label match'
} else {
content['projects'].each { projectName ->
generateStages(project: projectName, changeset: content['changeset']).each { k,v ->
mapParallelTasks["${k}"] = v
}
}
notifyBuildReason()
parallel(mapParallelTasks)
}
notifyBuildReason()
parallel(mapParallelTasks)
}
}
}
Expand Down
9 changes: 4 additions & 5 deletions Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,9 @@ changeset:
- "^testing/.*"
- "^x-pack/libbeat/.*"

## Proposal
## TBC: This will allow to configure what to do based on the PR configuration
disabled:
when:
labels: ## Skip the GitHub Pull Request builds if there is a GitHub label match
- "skip-ci"
draft: true ## Skip the GitHub Pull Request builds with Draft PRs.
labels: ## Skip the GitHub Pull Request builds if any of the given GitHub labels match with the assigned labels in the PR.
- skip-ci
## TODO: This will allow to configure what to do based on the PR configuration
draft: true ## Skip the GitHub Pull Request builds with Draft PRs.