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.

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

ci: run e2e-testing at the end #1169

Merged
merged 1 commit into from
Sep 13, 2022
Merged

ci: run e2e-testing at the end #1169

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 22 additions & 23 deletions .ci/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,29 +286,6 @@ pipeline {
}
}
}
stage('e2e tests') {
when {
// Always when running builds on branches/tags
// Enable if e2e related changes.
beforeAgent true
anyOf {
not { changeRequest() }
// package artifacts are not generated if ONLY_DOCS, therefore e2e should not run if ONLY_DOCS
expression { return isE2eEnabled() && env.ONLY_DOCS == "false"}
}
}
steps {
// TODO: what's the testMatrixFile to be used if any
runE2E(testMatrixFile: '.ci/.e2e-tests-for-elastic-agent.yaml',
beatVersion: "${env.BEAT_VERSION}-SNAPSHOT",
elasticAgentVersion: "${env.BEAT_VERSION}-SNAPSHOT",
gitHubCheckName: "e2e-tests",
gitHubCheckRepo: env.REPO,
gitHubCheckSha1: env.GIT_BASE_COMMIT,
propagate: true,
wait: true)
}
}
stage('extended windows') {
when {
// Always when running builds on branches/tags
Expand Down Expand Up @@ -418,6 +395,28 @@ pipeline {
}
}
}
stage('e2e tests') {
when {
// Always when running builds on branches/tags
// Enable if e2e related changes.
beforeAgent true
anyOf {
not { changeRequest() }
// package artifacts are not generated if ONLY_DOCS, therefore e2e should not run if ONLY_DOCS
expression { return isE2eEnabled() && env.ONLY_DOCS == "false"}
}
}
steps {
runE2E(testMatrixFile: '.ci/.e2e-tests-for-elastic-agent.yaml',
beatVersion: "${env.BEAT_VERSION}-SNAPSHOT",
elasticAgentVersion: "${env.BEAT_VERSION}-SNAPSHOT",
gitHubCheckName: "e2e-tests",
gitHubCheckRepo: env.REPO,
gitHubCheckSha1: env.GIT_BASE_COMMIT,
propagate: true,
wait: true)
}
}
}
post {
cleanup {
Expand Down