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

chore: decouple unit and integration tests on CI #27069

Merged
merged 1 commit into from
Jul 30, 2021
Merged

chore: decouple unit and integration tests on CI #27069

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions auditbeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ stages:
branches: true ## for all the branches
tags: true ## for all the tags
stage: extended
build:
mage: "mage build test"
unitTest:
mage: "mage build unitTest"
stage: mandatory
crosscompile:
make: "make -C auditbeat crosscompile"
Expand Down
11 changes: 8 additions & 3 deletions filebeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,14 @@ stages:
branches: true ## for all the branches
tags: true ## for all the tags
stage: extended
build:
mage: "mage build test"
withModule: true ## run the ITs only if the changeset affects a specific module.
unitTest:
mage: "mage build unitTest"
stage: mandatory
goIntegTest:
mage: "mage goIntegTest"
stage: mandatory
pythonIntegTest:
mage: "mage pythonIntegTest" ## run the ITs only if the changeset affects a specific module.
stage: mandatory
module-compat-7.11:
mage: >- ## Run module integration tests under ES 7.11 to ensure ingest pipeline compatibility.
Expand Down
12 changes: 10 additions & 2 deletions heartbeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,16 @@ stages:
branches: true ## for all the branches
tags: true ## for all the tags
stage: extended
build:
mage: "mage build test"
unitTest:
mage: "mage build unitTest"
stage: mandatory
goIntegTest:
mage: "mage goIntegTest"
withModule: true
stage: mandatory
pythonIntegTest:
mage: "mage pythonIntegTest"
withModule: true
stage: mandatory
macos:
mage: "mage build unitTest"
Expand Down
7 changes: 5 additions & 2 deletions libbeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,11 @@ stages:
- "arm"
parameters:
- "armTest"
build:
mage: "mage build test"
unitTest:
mage: "mage build unitTest"
stage: mandatory
goIntegTest:
mage: "mage goIntegTest"
stage: mandatory
crosscompile:
make: "make -C libbeat crosscompile"
Expand Down
4 changes: 2 additions & 2 deletions packetbeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ stages:
branches: true ## for all the branches
tags: true ## for all the tags
stage: extended
build:
mage: "mage build test"
unitTest:
mage: "mage build unitTest"
stage: mandatory
macos:
mage: "mage build unitTest"
Expand Down
7 changes: 5 additions & 2 deletions x-pack/dockerlogbeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,11 @@ stages:
make -C x-pack/dockerlogbeat update;
make check-no-changes;
stage: lint
build:
mage: "mage build test"
unitTest:
mage: "mage build unitTest"
stage: mandatory
goIntegTest:
mage: "mage goIntegTest"
withModule: true ## run the ITs only if the changeset affects a specific module.
stage: mandatory
packaging-linux:
Expand Down
7 changes: 5 additions & 2 deletions x-pack/elastic-agent/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,11 @@ stages:
branches: true ## for all the branches
tags: true ## for all the tags
stage: extended
build:
mage: "mage build test"
unitTest:
mage: "mage build unitTest"
stage: mandatory
goIntegTest:
mage: "mage goIntegTest"
stage: mandatory
macos:
mage: "mage build unitTest"
Expand Down
13 changes: 9 additions & 4 deletions x-pack/filebeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,14 @@ stages:
branches: true ## for all the branches
tags: true ## for all the tags
stage: extended
build:
mage: "mage build test"
withModule: true ## run the ITs only if the changeset affects a specific module.
unitTest:
mage: "mage build unitTest"
stage: mandatory
goIntegTest:
mage: "mage goIntegTest"
stage: mandatory
pythonIntegTest:
mage: "mage pythonIntegTest" ## run the ITs only if the changeset affects a specific module.
stage: mandatory
module-compat-7.11:
mage: >- ## Run module integration tests under ES 7.11 to ensure ingest pipeline compatibility.
Expand Down Expand Up @@ -112,4 +117,4 @@ stages:
enabled: false
platforms: ## override default label in this specific stage.
- "arm"
stage: packaging
stage: packaging
7 changes: 5 additions & 2 deletions x-pack/functionbeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,11 @@ stages:
- "arm"
parameters:
- "armTest"
build:
mage: "mage build test && GO_VERSION=1.13.1 mage testGCPFunctions"
unitTest:
mage: "mage build unitTest && GO_VERSION=1.13.1 mage testGCPFunctions"
stage: mandatory
goIntegTest:
mage: "mage goIntegTest"
stage: mandatory
macos:
mage: "mage build unitTest"
Expand Down
9 changes: 6 additions & 3 deletions x-pack/heartbeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,14 @@ stages:
make -C heartbeat update;
make check-no-changes;
stage: lint
build:
mage: "mage build test"
unitTest:
mage: "mage build unitTest"
stage: mandatory
goIntegTest:
mage: "mage goIntegTest"
stage: mandatory
macos:
mage: "mage build test"
mage: "mage build unitTest"
v1v marked this conversation as resolved.
Show resolved Hide resolved
platforms: ## override default label in this specific stage.
- "macosx&&x86_64"
when: ## Override the top-level when.
Expand Down
10 changes: 8 additions & 2 deletions x-pack/libbeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ stages:
branches: true ## for all the branches
tags: true ## for all the tags
stage: extended
build:
mage: "mage build test"
unitTest:
mage: "mage build unitTest"
stage: mandatory
goIntegTest:
mage: "mage goIntegTest"
stage: mandatory
pythonIntegTest:
mage: "mage pythonIntegTest"
stage: mandatory
7 changes: 5 additions & 2 deletions x-pack/osquerybeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,11 @@ stages:
make -C x-pack/osquerybeat update;
make check-no-changes;
stage: lint
build:
mage: "mage build test"
unitTest:
mage: "mage build unitTest"
stage: mandatory
goIntegTest:
mage: "mage goIntegTest"
stage: mandatory
macos:
mage: "mage build unitTest"
Expand Down
4 changes: 2 additions & 2 deletions x-pack/packetbeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ stages:
branches: true ## for all the branches
tags: true ## for all the tags
stage: extended
build:
mage: "mage build test"
unitTest:
mage: "mage build unitTest"
stage: mandatory
macos:
mage: "mage build unitTest"
Expand Down