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.

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

[7.17](backport #40238) Go-based changeset definition for MODULE #40945

Merged
merged 26 commits into from
Oct 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
54f3296
Go-based changeset definition for MODULE (#40238)
oakrizan Sep 23, 2024
39f9d74
fixed conflicts in x-pack/auditbeat
oakrizan Sep 23, 2024
3fad3f6
updated imports in x-pack/auditbeat/magefile.go
oakrizan Sep 23, 2024
b335ca4
resolved conflicts && updated magefile in x-pack/winlogbeat
oakrizan Sep 23, 2024
3867502
resolved conflicts && updated magefile in x-pack/metricbeat
oakrizan Sep 23, 2024
305ec66
resolved conflicts in x-pack/dockerlogbeat
oakrizan Sep 23, 2024
f20afa4
resolved conflicts in heartbeat
oakrizan Sep 23, 2024
e166500
added changeset definition to auditbeat
oakrizan Sep 23, 2024
a190619
added changeset definition to fileabeat
oakrizan Sep 23, 2024
20c179a
added changeset to x-pack/filebeat
oakrizan Sep 23, 2024
99e392f
updated x-pack/winlogbeat
oakrizan Sep 23, 2024
6c38108
added os imports
oakrizan Sep 23, 2024
ee8f633
pr fixes
oakrizan Sep 23, 2024
5431e54
updated x-pack/filebeat magefile imports
oakrizan Sep 23, 2024
29c8c1f
updated imports in x-pack/auditbeat
oakrizan Sep 23, 2024
ede596a
updated imports in auditbaet
oakrizan Sep 23, 2024
2979f95
added neat_path to filebeat
oakrizan Sep 23, 2024
c5497ec
added beat_path to x-pack/filebeat
oakrizan Sep 23, 2024
b793c8e
updated imports for x-pack/winlogbeat
oakrizan Sep 23, 2024
3c8e86e
fixed typo
oakrizan Sep 23, 2024
618771b
added beat_path to auditbeat
oakrizan Sep 23, 2024
63d1b7d
debug x-pack/winlogbeat
oakrizan Sep 24, 2024
de75929
added beat path to x-pack/winlogbeat
oakrizan Sep 24, 2024
03465b7
removed magefile_verbose
oakrizan Sep 24, 2024
c992a08
Merge remote-tracking branch 'origin/7.17' into mergify/bp/7.17/pr-40238
oakrizan Sep 25, 2024
6baf893
removed module definition for x-pack/winlogbeat
oakrizan Oct 14, 2024
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
7 changes: 3 additions & 4 deletions .buildkite/auditbeat/auditbeat-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ env:
RACE_DETECTOR: "true"
TEST_COVERAGE: "true"

# Module Tests
BEAT_PATH: "auditbeat"

steps:
- group: "Check/Update"
key: "auditbeat-check-update"
Expand Down Expand Up @@ -101,10 +104,6 @@ steps:
env:
STACK_ENVIRONMENT: "next-major"
command: |
set -euo pipefail
source .buildkite/scripts/changesets.sh
defineModuleFromTheChangeSet auditbeat
echo "~~~ Running tests"
cd auditbeat
mage pythonIntegTest
retry:
Expand Down
11 changes: 3 additions & 8 deletions .buildkite/filebeat/filebeat-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ env:
RACE_DETECTOR: "true"
TEST_COVERAGE: "true"

# Module Tests
BEAT_PATH: "filebeat"

steps:
- group: "Check/Update"
key: "filebeat-check-update"
Expand Down Expand Up @@ -134,10 +137,6 @@ steps:
TESTING_FILEBEAT_SKIP_DIFF: 1
PYTEST_ADDOPTS: "-k test_modules"
command: |
set -euo pipefail
source .buildkite/scripts/changesets.sh
defineModuleFromTheChangeSet filebeat
echo "~~~ Running tests"
cd filebeat
mage pythonIntegTest
retry:
Expand All @@ -160,10 +159,6 @@ steps:
STACK_ENVIRONMENT: "next-major"
TESTING_FILEBEAT_SKIP_DIFF: 1
command: |
set -euo pipefail
source .buildkite/scripts/changesets.sh
defineModuleFromTheChangeSet filebeat
echo "~~~ Running tests"
cd filebeat
mage pythonIntegTest
retry:
Expand Down
21 changes: 4 additions & 17 deletions .buildkite/heartbeat/heartbeat-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,17 +113,9 @@ steps:
- github_commit_status:
context: "heartbeat: Win 2019 Unit Tests"

- label: ":ubuntu: Heartbeat: Go (Module) Integration Tests"
# Heartbeat has no modules yet
- label: ":ubuntu: Heartbeat: Go Integration Tests"
command: |
set -euo pipefail
echo "~~~ Installing @elastic/synthetics"
npm install -g @elastic/synthetics

# defines the MODULE env var based on what's changed in a PR
source .buildkite/scripts/changesets.sh
defineModuleFromTheChangeSet heartbeat

echo "~~~ Running tests"
cd heartbeat
mage -v goIntegTest
retry:
Expand All @@ -140,14 +132,9 @@ steps:
- github_commit_status:
context: "heartbeat: Go Integration Tests"

- label: ":ubuntu: Heartbeat: Python (Module) Integration Tests"
# Heartbeat has no modules yet
- label: ":ubuntu: Heartbeat: Python Integration Tests"
command: |
set -euo pipefail
# defines the MODULE env var based on what's changed in a PR
source .buildkite/scripts/changesets.sh
defineModuleFromTheChangeSet heartbeat

echo "~~~ Running tests"
cd heartbeat
mage pythonIntegTest
retry:
Expand Down
8 changes: 2 additions & 6 deletions .buildkite/libbeat/pipeline.libbeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,11 @@ steps:
- github_commit_status:
context: "libbeat: Python Integration Tests"

- label: ":ubuntu: Libbeat: Module compat tests: next major"
- label: ":ubuntu: Libbeat: next major"
# Run module integration tests under next major of Elastic stack.
env:
STACK_ENVIRONMENT: "next-major"
command: |
set -euo pipefail
source .buildkite/scripts/changesets.sh
defineModuleFromTheChangeSet libbeat
echo "~~~ Running tests"
cd libbeat
mage pythonIntegTest
retry:
Expand All @@ -131,7 +127,7 @@ steps:
- "libbeat/build/*.json"
notify:
- github_commit_status:
context: "libbeat: Module compat tests: next major"
context: "libbeat: next major"

- label: ":ubuntu: Libbeat: Crosscompile"
key: "mandatory-cross-compile"
Expand Down
17 changes: 6 additions & 11 deletions .buildkite/metricbeat/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ env:
K8S_VERSION: "v1.21.1"
ASDF_KIND_VERSION: "0.20.0"

# Module Tests
BEAT_PATH: "metricbeat"

# Other deps
ASDF_MAGE_VERSION: 1.15.0

Expand Down Expand Up @@ -79,14 +82,10 @@ steps:
- github_commit_status:
context: "metricbeat: Ubuntu x86_64 Unit Tests"

- label: ":ubuntu: Metricbeat: Go Integration Tests"
- label: ":ubuntu: Metricbeat: Go Integration Tests (Module)"
key: "mandatory-int-test"
command: |
set -euo pipefail
# defines the MODULE env var based on what's changed in a PR
source .buildkite/scripts/changesets.sh
defineModuleFromTheChangeSet metricbeat

echo "~~~ Running tests"
export KUBECONFIG="$$PWD/kubecfg"
cd metricbeat
Expand All @@ -103,16 +102,12 @@ steps:
- "metricbeat/build/*.json"
notify:
- github_commit_status:
context: "metricbeat: Go Integration Tests"
context: "metricbeat: Go Integration Tests (Module)"

- label: ":ubuntu: Metricbeat: Python Integration Tests"
- label: ":ubuntu: Metricbeat: Python Integration Tests (Module)"
key: "mandatory-python-int-test"
command: |
set -euo pipefail
# defines the MODULE env var based on what's changed in a PR
source .buildkite/scripts/changesets.sh
defineModuleFromTheChangeSet metricbeat

echo "~~~ Running tests"
export KUBECONFIG="$$PWD/kubecfg"
cd metricbeat
Expand Down
64 changes: 0 additions & 64 deletions .buildkite/scripts/changesets.psm1

This file was deleted.

66 changes: 0 additions & 66 deletions .buildkite/scripts/changesets.sh

This file was deleted.

12 changes: 5 additions & 7 deletions .buildkite/x-pack/pipeline.xpack.auditbeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ env:
RACE_DETECTOR: "true"
TEST_COVERAGE: "true"

# Module tests
BEAT_PATH: "x-pack/auditbeat"

steps:
- group: "Check/Update"
key: "x-pack-auditbeat-check-update"
Expand Down Expand Up @@ -76,14 +79,9 @@ steps:
- github_commit_status:
context: "x-pack/auditbeat: Ubuntu arm64 Unit Tests"

- label: ":ubuntu: x-pack/auditbeat: Build (MODULE) Tests"
- label: ":ubuntu: x-pack/auditbeat: Build Tests (Module)"
key: "mandatory-build-test"
command: |
set -euo pipefail
# defines the MODULE env var based on what's changed in a PR
source .buildkite/scripts/changesets.sh
defineModuleFromTheChangeSet x-pack/auditbeat
echo "~~~ Running tests"
cd x-pack/auditbeat
mage update build test
retry:
Expand All @@ -98,7 +96,7 @@ steps:
- "x-pack/auditbeat/build/*.json"
notify:
- github_commit_status:
context: "x-pack/auditbeat: Build (MODULE) Tests"
context: "x-pack/auditbeat: Build Tests (Module)"

- label: ":windows: x-pack/auditbeat: Win 2019 Unit Tests"
command: |
Expand Down
8 changes: 2 additions & 6 deletions .buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,10 @@ steps:
- github_commit_status:
context: "x-pack/dockerlogbeat: Ubuntu Unit Tests"

- label: ":ubuntu: x-pack/dockerlogbeat: Go (Module) Integration Tests"
# x-pack/dockerlogbeat has no modules yet
- label: ":ubuntu: x-pack/dockerlogbeat: Go Integration Tests"
key: "mandatory-int-test"
command: |
set -euo pipefail
# defines the MODULE env var based on what's changed in a PR
source .buildkite/scripts/changesets.sh
defineModuleFromTheChangeSet x-pack/dockerlogbeat
echo "~~~ Running tests"
cd x-pack/dockerlogbeat
mage -v goIntegTest
retry:
Expand Down
8 changes: 3 additions & 5 deletions .buildkite/x-pack/pipeline.xpack.filebeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ env:
RACE_DETECTOR: "true"
TEST_COVERAGE: "true"

# Module Tests
BEAT_PATH: "x-pack/filebeat"

steps:
- group: "Check/Update"
key: "x-pack-filebeat-check-update"
Expand Down Expand Up @@ -137,10 +140,6 @@ steps:
TESTING_FILEBEAT_SKIP_DIFF: 1
PYTEST_ADDOPTS: "-k test_xpack_modules"
command: |
set -euo pipefail
source .buildkite/scripts/changesets.sh
defineModuleFromTheChangeSet x-pack/filebeat
echo "~~~ Running tests"
cd x-pack/filebeat
mage pythonIntegTest
retry:
Expand Down Expand Up @@ -264,7 +263,6 @@ steps:
ASDF_TERRAFORM_VERSION: 1.0.2
MODULE_DIR: "x-pack/filebeat/input/awss3/_meta/terraform"
MODULE: "aws"
# TEST_TAGS should be reviewed and updated: https://github.com/elastic/ingest-dev/issues/3476
TEST_TAGS: "aws"
agents:
provider: "aws"
Expand Down
Loading
Loading