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

Update Logstash/ES versions being used in the tests #687

Merged
merged 26 commits into from
Apr 17, 2024
Merged

Update Logstash/ES versions being used in the tests #687

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
66b0ed1
.
constanca-m Apr 17, 2024
c07bae0
.
constanca-m Apr 17, 2024
3e12c49
.
constanca-m Apr 17, 2024
710fee6
.
constanca-m Apr 17, 2024
8480bc8
.
constanca-m Apr 17, 2024
a15a917
.
constanca-m Apr 17, 2024
e9a21f6
.
constanca-m Apr 17, 2024
b957f37
.
constanca-m Apr 17, 2024
d49b9cf
.
constanca-m Apr 17, 2024
e55eeae
.
constanca-m Apr 17, 2024
6b04a44
.
constanca-m Apr 17, 2024
bbc17d8
.
constanca-m Apr 17, 2024
24b88f9
.
constanca-m Apr 17, 2024
d12f13a
.
constanca-m Apr 17, 2024
2c674b4
.
constanca-m Apr 17, 2024
0115e0c
.
constanca-m Apr 17, 2024
9d3ee39
.
constanca-m Apr 17, 2024
2d1a0b1
.
constanca-m Apr 17, 2024
a943192
.
constanca-m Apr 17, 2024
767c24b
.
constanca-m Apr 17, 2024
e8719c5
.
constanca-m Apr 17, 2024
909b30f
.
constanca-m Apr 17, 2024
b83c882
.
constanca-m Apr 17, 2024
15956a9
.
constanca-m Apr 17, 2024
513489b
.
constanca-m Apr 17, 2024
cae5b15
Revert changes
constanca-m Apr 17, 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
2 changes: 1 addition & 1 deletion tests/scripts/run_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ set -ex
# delete any __pycache__ folders to avoid hard-to-debug caching issues
find . -name __pycache__ -type d -exec rm -r '{}' + || true
PYTEST_ARGS=("${PYTEST_ARGS}")
py.test -vv "${PYTEST_ARGS[*]}" "${PYTEST_JUNIT}" tests
py.test -vv "${PYTEST_ARGS[*]}" "${PYTEST_JUNIT}" tests -s
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I am leaving the -s flag here so we can see the logs when make coverage runs. Otherwise, if the tests get stuck again, we have no way to know what is stopping them.


if [[ "${PYTEST_ADDOPTS}" == *"--cov"* ]]; then
# Transform coverage to xml so Jenkins can parse and report it
Expand Down
2 changes: 1 addition & 1 deletion tests/testcontainers/es.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class ElasticsearchContainer(DockerContainer): # type: ignore
"""

_DEFAULT_IMAGE = "docker.elastic.co/elasticsearch/elasticsearch"
_DEFAULT_VERSION = "7.17.9"
_DEFAULT_VERSION = "7.17.20"
_DEFAULT_PORT = 9200
_DEFAULT_USERNAME = DEFAULT_USERNAME
_DEFAULT_PASSWORD = DEFAULT_PASSWORD
Expand Down
2 changes: 1 addition & 1 deletion tests/testcontainers/logstash.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class LogstashContainer(DockerContainer): # type: ignore
"""

_DEFAULT_IMAGE = "docker.elastic.co/logstash/logstash"
_DEFAULT_VERSION = "7.17.0"
_DEFAULT_VERSION = "7.17.20"
_DEFAULT_PORT = 5044
_DEFAULT_API_PORT = 9600
_DEFAULT_USERNAME = "USERNAME"
Expand Down
Loading