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

Jump to bottom

[Filebeat] Integration tests in CI for AWS-S3 input #27491

Merged
merged 10 commits into from
Sep 6, 2021
Merged

[Filebeat] Integration tests in CI for AWS-S3 input #27491

Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8cd6025
[Filebeat] Integration tests in CI for AWS-S3 input
Aug 19, 2021
68c009f
fix directory
Aug 19, 2021
289c85f
Bump terraform version
v1v Aug 23, 2021
dab3a44
Fail terraform apply if any errors after retry
v1v Aug 23, 2021
dc13f91
Merge branch 'master' into Filebeat-Integration-tests-in-CI-for-AWS-S…
Aug 23, 2021
fc67dab
Merge branch 'master' into Filebeat-Integration-tests-in-CI-for-AWS-S…
Aug 25, 2021
c1859de
rely on dirs
Aug 25, 2021
f27d69e
Update Jenkinsfile
aspacca Aug 26, 2021
5348c48
Configure aws credentials on a PR basis if 'aws' has been assigned
v1v Sep 2, 2021
a2f2177
use t2.micro
Sep 3, 2021
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
14 changes: 14 additions & 0 deletions x-pack/filebeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,20 @@ stages:
platforms: ## override default labels in this specific stage.
- "windows-7"
stage: extended
cloud:
cloud: "mage build test"
withModule: true ## run the ITs only if the changeset affects a specific module.
dirs: ## run the cloud tests for the given modules.
- "x-pack/filebeat/input/awss3/_meta/terraform" # needed by startCloudTestEnv in order to apply terraform
- "x-pack/filebeat/input/awss3" # the actual dir where tests reside
Copy link
Member

Choose a reason for hiding this comment

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

This looks a bit hacky, I would prefer if we don't need to add both directories.

I see some options:

  • Add a terraformDir config to this cloud step, so we can explicitly configure where is the terraform scenario and where the tests. This would have the advantage of allowing to use the same scenario for tests residing in multiple scenarios.
  • Add a terraform file where the tests reside, so we don't have to add both directories. This terraform file could use _meta/terraform as a module.
  • odify startCloudTestEnv to use ./_meta/terraform if there are no terraform files in the

when: ## Override the top-level when.
parameters:
- "awsCloudTests"
comments:
- "/test x-pack/filebeat/input for aws cloud"
labels:
- "aws"
stage: extended
#windows-7-32: See https://github.com/elastic/beats/issues/22315
# mage: "mage build unitTest"
# platforms: ## override default labels in this specific stage.
Expand Down