Skip to content

[CI] Refactor script to run integration tests #2768

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

Merged
merged 15 commits into from
Jul 25, 2025
Merged

[CI] Refactor script to run integration tests #2768

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d8219a0
Move upload safe logs to a function
mrodm Jul 23, 2025
abe2903
Separate git clean target
mrodm Jul 23, 2025
dd84b2e
Remove if to check parallel or false positives targets
mrodm Jul 23, 2025
f13dc34
Add default value for UPLOAD_SAFE_LOGS
mrodm Jul 23, 2025
d214271
Define JOB_GCS_BUCKET_INTERNAL always
mrodm Jul 23, 2025
f6cfbb5
Add safeguard for uploading test logs
mrodm Jul 24, 2025
9aa9efb
Add another function to install tools
mrodm Jul 24, 2025
3a8ae6d
Fix function name to install kubernetes/kind
mrodm Jul 24, 2025
c1eed72
Merge upstream/main into refactor-integration-tests
mrodm Jul 24, 2025
c4dd938
Restore group title for uploading safe logs
mrodm Jul 24, 2025
34d59cc
Add target as part of the path to upload logs
mrodm Jul 24, 2025
0c32d2a
Remove common prefix from targets
mrodm Jul 24, 2025
a3af19f
Merge upstream/main into refactor-integration-tests
mrodm Jul 25, 2025
2fc8ba6
Add double quotes - fix lint warnings
mrodm Jul 25, 2025
d39eb61
Define variable as local in function
mrodm Jul 25, 2025
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
Next Next commit
Move upload safe logs to a function
  • Loading branch information
@mrodm
mrodm committed Jul 23, 2025
commit d8219a051672cb6f20237e4a8cb8a0cdb9d91b9f
73 changes: 43 additions & 30 deletions .buildkite/scripts/integration_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,44 @@ if [[ "${TARGET}" == "" ]]; then
exit 1
fi

upload_package_test_logs() {
local retry_count=0
local package_folder=""

retry_count=${BUILDKITE_RETRY_COUNT:-"0"}
package_folder="${PACKAGE}"

if [[ "${ELASTIC_PACKAGE_TEST_ENABLE_INDEPENDENT_AGENT:-""}" == "false" ]]; then
package_folder="${package_folder}-stack_agent"
fi

if [[ "${ELASTIC_PACKAGE_FIELD_VALIDATION_TEST_METHOD:-""}" != "" ]]; then
package_folder="${package_folder}-${ELASTIC_PACKAGE_FIELD_VALIDATION_TEST_METHOD}"
fi

if [[ "${retry_count}" -ne 0 ]]; then
package_folder="${package_folder}_retry_${retry_count}"
fi

upload_safe_logs \
"${JOB_GCS_BUCKET_INTERNAL}" \
"build/elastic-stack-dump/check-${PACKAGE}/logs/elastic-agent-internal/*.*" \
"insecure-logs/${package_folder}/elastic-agent-logs/"

# required for <8.6.0
upload_safe_logs \
"${JOB_GCS_BUCKET_INTERNAL}" \
"build/elastic-stack-dump/check-${PACKAGE}/logs/elastic-agent-internal/default/*" \
"insecure-logs/${package_folder}/elastic-agent-logs/default/"

upload_safe_logs \
"${JOB_GCS_BUCKET_INTERNAL}" \
"build/container-logs/*.log" \
"insecure-logs/${package_folder}/container-logs/"

}


add_bin_path

if [[ "$SERVERLESS" == "false" ]]; then
Expand Down Expand Up @@ -88,9 +126,11 @@ label="${TARGET}"
if [ -n "${PACKAGE}" ]; then
label="${label} - ${PACKAGE}"
fi
echo "--- Install elastic-package"
make install

echo "--- Run integration test ${label}"
if [[ "${TARGET}" == "${PARALLEL_TARGET}" ]] || [[ "${TARGET}" == "${FALSE_POSITIVES_TARGET}" ]]; then
make install

# allow to fail this command, to be able to upload safe logs
set +e
Expand All @@ -101,34 +141,7 @@ if [[ "${TARGET}" == "${PARALLEL_TARGET}" ]] || [[ "${TARGET}" == "${FALSE_POSIT
retry_count=${BUILDKITE_RETRY_COUNT:-"0"}

if [[ "${UPLOAD_SAFE_LOGS}" -eq 1 ]] ; then
package_folder="${PACKAGE}"
if [[ "${ELASTIC_PACKAGE_TEST_ENABLE_INDEPENDENT_AGENT:-""}" == "false" ]]; then
package_folder="${package_folder}-stack_agent"
fi

if [[ "${ELASTIC_PACKAGE_FIELD_VALIDATION_TEST_METHOD:-""}" != "" ]]; then
package_folder="${package_folder}-${ELASTIC_PACKAGE_FIELD_VALIDATION_TEST_METHOD}"
fi

if [[ "${retry_count}" -ne 0 ]]; then
package_folder="${package_folder}_retry_${retry_count}"
fi

upload_safe_logs \
"${JOB_GCS_BUCKET_INTERNAL}" \
"build/elastic-stack-dump/check-${PACKAGE}/logs/elastic-agent-internal/*.*" \
"insecure-logs/${package_folder}/elastic-agent-logs/"

# required for <8.6.0
upload_safe_logs \
"${JOB_GCS_BUCKET_INTERNAL}" \
"build/elastic-stack-dump/check-${PACKAGE}/logs/elastic-agent-internal/default/*" \
"insecure-logs/${package_folder}/elastic-agent-logs/default/"

upload_safe_logs \
"${JOB_GCS_BUCKET_INTERNAL}" \
"build/container-logs/*.log" \
"insecure-logs/${package_folder}/container-logs/"
upload_package_test_logs
fi

if [ $testReturnCode != 0 ]; then
Expand All @@ -140,4 +153,4 @@ if [[ "${TARGET}" == "${PARALLEL_TARGET}" ]] || [[ "${TARGET}" == "${FALSE_POSIT
exit 0
fi

make install "${TARGET}" check-git-clean
make "${TARGET}" check-git-clean