From f9750d1d2fd8c9318c3b6d37eb0ae83bcc7f9594 Mon Sep 17 00:00:00 2001 From: Artem Shelkovnikov Date: Fri, 6 Sep 2024 14:36:13 +0200 Subject: [PATCH 1/5] Make CI run agent tests too for now --- .buildkite/run_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/run_tests.sh b/.buildkite/run_tests.sh index d444f2cb1..7888219f7 100755 --- a/.buildkite/run_tests.sh +++ b/.buildkite/run_tests.sh @@ -9,4 +9,4 @@ pyenv global $PYTHON_VERSION echo "Python version:" pyenv global -make test +make test test-agent From 6b5722f092413b6efd44d921dc8fc8c78fa8ea42 Mon Sep 17 00:00:00 2001 From: Artem Shelkovnikov Date: Tue, 10 Sep 2024 10:33:47 +0200 Subject: [PATCH 2/5] Move tests together for now --- .coveragerc | 2 +- Makefile | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.coveragerc b/.coveragerc index dc8009b3f..ef34019bf 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,2 +1,2 @@ [report] -omit = connectors/quartz.py,connectors/conftest.py,tests/*,connectors/agent/*,connectors/cli/* +omit = connectors/quartz.py,connectors/conftest.py,tests/* diff --git a/Makefile b/Makefile index 1e7216e6a..99e69ceec 100644 --- a/Makefile +++ b/Makefile @@ -67,10 +67,7 @@ autoformat: .venv/bin/python .venv/bin/ruff .venv/bin/elastic-ingest .venv/bin/ruff format setup.py test: .venv/bin/pytest .venv/bin/elastic-ingest - .venv/bin/pytest --cov-report term-missing --cov-fail-under 92 --cov-report html --cov=connectors --fail-slow=$(SLOW_TEST_THRESHOLD) -sv tests --ignore tests/agent - -test-agent: .venv/bin/pytest .venv/bin/elastic-ingest install-agent - .venv/bin/pytest --cov-report term-missing --cov-fail-under 92 --cov-report html --cov=connectors/agent --fail-slow=$(SLOW_TEST_THRESHOLD) -sv tests/agent + .venv/bin/pytest --cov-report term-missing --cov-fail-under 92 --cov-report html --cov=connectors --fail-slow=$(SLOW_TEST_THRESHOLD) -sv tests release: install .venv/bin/python setup.py sdist From 5206be693feedd7da2734e7eb1958d81bcc758f8 Mon Sep 17 00:00:00 2001 From: Artem Shelkovnikov Date: Tue, 10 Sep 2024 10:37:34 +0200 Subject: [PATCH 3/5] Update run_tests.sh --- .buildkite/run_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/run_tests.sh b/.buildkite/run_tests.sh index 7888219f7..d444f2cb1 100755 --- a/.buildkite/run_tests.sh +++ b/.buildkite/run_tests.sh @@ -9,4 +9,4 @@ pyenv global $PYTHON_VERSION echo "Python version:" pyenv global -make test test-agent +make test From 89e475a8883abaecc217e736701392ca77d0e6f8 Mon Sep 17 00:00:00 2001 From: Artem Shelkovnikov Date: Tue, 10 Sep 2024 14:45:50 +0200 Subject: [PATCH 4/5] Install requirements too --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 99e69ceec..324e8cbcf 100644 --- a/Makefile +++ b/Makefile @@ -24,11 +24,9 @@ config.yml: install: .venv/bin/python .venv/bin/pip-licenses .venv/bin/elastic-ingest .venv/bin/pip-licenses --format=plain-vertical --with-license-file --no-license-path > NOTICE.txt -install-agent: install - .venv/bin/pip install -r requirements/agent.txt - .venv/bin/elastic-ingest: .venv/bin/python .venv/bin/pip install -r requirements/$(ARCH).txt + .venv/bin/pip install -r requirements/agent.txt .venv/bin/python setup.py develop .venv/bin/ruff: .venv/bin/python @@ -38,6 +36,7 @@ install-agent: install .venv/bin/pytest: .venv/bin/python .venv/bin/pip install -r requirements/$(ARCH).txt + .venv/bin/pip install -r requirements/agent.txt .venv/bin/pip install -r requirements/tests.txt .venv/bin/pip install -r requirements/ftest.txt From 7e01c1517b7cb5790157acfdf002fe7f6610eb4a Mon Sep 17 00:00:00 2001 From: Artem Shelkovnikov Date: Wed, 11 Sep 2024 13:42:27 +0200 Subject: [PATCH 5/5] Return make install-agent back for simplicity --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 324e8cbcf..631709c29 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,8 @@ config.yml: install: .venv/bin/python .venv/bin/pip-licenses .venv/bin/elastic-ingest .venv/bin/pip-licenses --format=plain-vertical --with-license-file --no-license-path > NOTICE.txt +install-agent: .venv/bin/elastic-ingest + .venv/bin/elastic-ingest: .venv/bin/python .venv/bin/pip install -r requirements/$(ARCH).txt .venv/bin/pip install -r requirements/agent.txt