Skip to content

Commit

Permalink
chore: decouple unit and integration tests on CI (#27069) (#27149)
Browse files Browse the repository at this point in the history
(cherry picked from commit 777daee)

Co-authored-by: Manuel de la Peña <[email protected]>
  • Loading branch information
mergify[bot] and mdelapenya authored Jul 30, 2021
1 parent 43313eb commit 980a3b1
Show file tree
Hide file tree
Showing 13 changed files with 72 additions and 30 deletions.
4 changes: 2 additions & 2 deletions auditbeat/Jenkinsfile.yml
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
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
macos:
mage: "mage build unitTest"
Expand Down
12 changes: 10 additions & 2 deletions heartbeat/Jenkinsfile.yml
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
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
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
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
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
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
macos:
mage: "mage build unitTest"
Expand Down Expand Up @@ -104,4 +109,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
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
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"
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
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
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
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

0 comments on commit 980a3b1

Please sign in to comment.