Skip to content

[7.x](backport #28481) CI: disable e2e for elastic-agent on tags/branches #28489

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
v1v merged 2 commits into from
Oct 19, 2021
Merged

[7.x](backport #28481) CI: disable e2e for elastic-agent on tags/branches #28489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdff58c
CI: disable e2e for elastic-agent on tags/branches (#28481)
v1v Oct 18, 2021
c995d4f
Merge remote-tracking branch 'upstream/7.x' into mergify/bp/7.x/pr-28481
v1v Oct 18, 2021
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
5 changes: 5 additions & 0 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,11 @@ def getBeatsName(baseDir) {
*/
def e2e(Map args = [:]) {
if (!args.e2e?.get('enabled', false)) { return }
// Skip running the tests on branches or tags if configured.
if (!isPR() && args.e2e?.get('when', false)) {
if (isBranch() && !args.e2e.when.get('branches', true)) { return }
if (isTag() && !args.e2e.when.get('tags', true)) { return }
}
if (args.e2e.get('entrypoint', '')?.trim()) {
e2e_with_entrypoint(args)
} else {
Expand Down
3 changes: 3 additions & 0 deletions x-pack/elastic-agent/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,9 @@ stages:
enabled: true
job: 'e2e-tests/e2e-testing-mbp'
testMatrixFile: '.ci/.e2e-tests-for-elastic-agent.yaml'
when: ## Customise when to run this subtask in the packaging stage.
branches: false ## Only on a PR basis for the time being
tags: false ## e2e on branches/tags is already in place with the downstream build.
stage: packaging
packaging-arm:
packaging-arm: "mage package"
Expand Down