Skip to content
This repository was archived by the owner on Sep 17, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
41 changes: 41 additions & 0 deletions .ci/.e2e-tests-for-elastic-agent.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
---
SUITES:
- suite: "fleet"
platforms:
- labels: "arm64"
- labels: "ubuntu-18.04"
provider: "elastic-package"
scenarios:
- name: "Fleet"
pullRequestFilter: " && ~debian"
tags: "fleet_mode_agent"
platforms:
- labels: "ubuntu-18.04"
provider: "elastic-package"
- name: "Integrations"
pullRequestFilter: " && ~debian"
tags: "integrations"
- name: "APM Integration"
pullRequestFilter: " && ~debian"
tags: "apm_server"
- name: "Linux Integration"
pullRequestFilter: " && ~debian"
tags: "linux_integration"
- name: "System Integration"
platforms:
- labels: "ubuntu-18.04"
provider: "elastic-package"
pullRequestFilter: " && ~debian"
tags: "system_integration"
- name: "Stand-alone"
platforms:
- labels: "ubuntu-18.04"
provider: "elastic-package"
pullRequestFilter: " && ~ubi8"
tags: "stand_alone_agent"
- name: "Backend Processes"
pullRequestFilter: " && ~debian"
tags: "backend_processes"
- name: "Beats Background Processes"
pullRequestFilter: " && ~debian"
tags: "running_on_beats"
4 changes: 3 additions & 1 deletion .ci/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ pipeline {
JOB_GIT_CREDENTIALS = "2a9602aa-ab9f-4e52-baf3-b71ca88469c7-UserAndToken"
DOCKER_ELASTIC_SECRET = 'secret/observability-team/ci/docker-registry/prod'
DOCKER_REGISTRY = 'docker.elastic.co'
TEST_MATRIX_FILE = "${params.testMatrixFile}"
}
options {
timeout(time: 1, unit: 'HOURS')
Expand All @@ -36,6 +37,7 @@ pipeline {
booleanParam(name: "SKIP_SCENARIOS", defaultValue: true, description: "If it's needed to skip those scenarios marked as @skip. Default true")
booleanParam(name: "NIGHTLY_SCENARIOS", defaultValue: false, description: "If it's needed to include the scenarios marked as @nightly in the test execution. Default false")
string(name: 'runTestsSuites', defaultValue: '', description: 'A comma-separated list of test suites to run (default: empty to run all test suites)')
string(name: 'testMatrixFile', defaultValue: '.ci/.e2e-tests.yaml', description: 'The file with the test suite and scenarios to be tested.')
booleanParam(name: "forceSkipGitChecks", defaultValue: false, description: "If it's needed to check for Git changes to filter by modified sources")
booleanParam(name: "forceSkipPresubmit", defaultValue: false, description: "If it's needed to execute the pre-submit tests: unit and precommit.")
booleanParam(name: "notifyOnGreenBuilds", defaultValue: false, description: "If it's needed to notify to Slack with green builds.")
Expand Down Expand Up @@ -191,7 +193,7 @@ pipeline {
dir("${BASE_DIR}") {
script {
def suitesParam = params.runTestsSuites
def existingSuites = readYaml(file: '.ci/.e2e-tests.yaml')
def existingSuites = readYaml(file: "${TEST_MATRIX_FILE}")
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Super smart!!

This will allow the simplification of the way we select the test suite to run: instead of the runTestSuites param, we could simply create "profiles" as you created here, and select the entire profile instead of evaluating the previous param.

def parallelTasks = [:]

if (suitesParam == "") {
Expand Down