Skip to content

[CI] Review output in CI builds #2639

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 30 commits into from
Jul 24, 2025
Merged

[CI] Review output in CI builds #2639

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
38e398b
Add more collapsed sections in CI output
mrodm Jun 5, 2025
3c71322
Update collapsed section titles
mrodm Jun 5, 2025
5f91789
Avoid running stack dump and down if stack is not started
mrodm Jun 6, 2025
c774108
Test failure
mrodm Jun 6, 2025
18e885f
Ensure failed group is opened - Buildkite output
mrodm Jun 6, 2025
2c8c36f
Run stack down command in any case to shutdown all containers
mrodm Jun 6, 2025
269a449
Run dump and ensure it does not exit build to continue cleanup process
mrodm Jun 6, 2025
75831b4
Rephrase group title
mrodm Jun 6, 2025
a5ca34a
Remove set x flag in build zip scripts
mrodm Jun 10, 2025
7bf29af
Change to uppercase
mrodm Jul 22, 2025
df812de
yq is not required in Serverless builds
mrodm Jul 22, 2025
93e4ff1
Add comment
mrodm Jul 22, 2025
a314998
Install elastic-package just once in Serverless
mrodm Jul 22, 2025
569ca1c
Show just one message to upload safe logs
mrodm Jul 23, 2025
5ba8b0f
Fix lint error
mrodm Jul 23, 2025
dce92ea
Ensure all steps in pre-exit are executed
mrodm Jul 23, 2025
2bfa9d8
Move definition of SERVERLESS variable to pipeline
mrodm Jul 23, 2025
823cc6f
Fix condition pre-exit hook
mrodm Jul 23, 2025
2a241b5
Run dump and stack down commands if stack has been created
mrodm Jul 23, 2025
c5d81fa
Remove debug in pre-exit
mrodm Jul 23, 2025
85a83ca
Add check about serverless and targets
mrodm Jul 23, 2025
9a048e1
Revert refactor upload safe logs
mrodm Jul 23, 2025
192ba69
Test with set -x flag
mrodm Jul 24, 2025
91303e9
Test adding a subshell for testtype func
mrodm Jul 24, 2025
7174187
Use subshell and add more collapsed groups in build-install scripts
mrodm Jul 24, 2025
9b035ed
Ignore errors dumping logs in cleanup
mrodm Jul 24, 2025
de15917
Add set +x in a subshell to get stack arguments
mrodm Jul 24, 2025
c990503
Add collapsed groups
mrodm Jul 24, 2025
6e33bd7
Move set flags
mrodm Jul 24, 2025
80b23a6
Apply missing set +x to get test type
mrodm Jul 24, 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
Prev Previous commit
Next Next commit
Remove set x flag in build zip scripts
  • Loading branch information
@mrodm
mrodm committed Jul 22, 2025
commit a5ca34afd75e1d47feacb98211bf69967b46fc71
2 changes: 1 addition & 1 deletion scripts/test-build-install-zip-file.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

set -euxo pipefail
set -euo pipefail
Copy link
Contributor Author

@mrodm mrodm Jul 23, 2025

Choose a reason for hiding this comment

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

Removed set -x from scripts/test-build*.sh shell scripts.
It looks to me that it is not needed at least in these targets.

I'm not totally sure if this flag should be kept in the other scripts (e.g. scripts/test-check-packages.sh).

WDYT ? Should we remove set -x in all these scripts ?

Copy link
Member

@jsoriano jsoriano Jul 23, 2025

Choose a reason for hiding this comment

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

Umm, I find these useful when debugging, there would be some way to optionally add them?

Copy link
Contributor Author

@mrodm mrodm Jul 24, 2025

Choose a reason for hiding this comment

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

The issue in these scripts is that there are some commands that are inside nested loops or nested ifs. That causes that set -x adds three dashes to show the command executed and Buildkite interprets that as a Collapsed group.

I've applied a workaround where it was affected via running the commands in a sub-shell and disabling that flag set +x. After that command, it continues with the previous value (set -x`).


cleanup() {
local r=$?
Expand Down
8 changes: 4 additions & 4 deletions scripts/test-build-install-zip.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

set -euxo pipefail
set -euo pipefail

cleanup() {
local r=$?
Expand Down Expand Up @@ -42,7 +42,7 @@ go run ./scripts/gpgkey

for d in test/packages/*/*/; do
# Packages in false_positives can have issues.
if [ "$(testype $d)" == "false_positives" ]; then
if [ "$(testype "$d")" == "false_positives" ]; then
continue
fi
echo "--- Building package: ${d}"
Expand All @@ -61,13 +61,13 @@ eval "$(elastic-package stack shellinit)"
# Install packages from working copy
for d in test/packages/*/*/; do
# Packages in false_positives can have issues.
if [ "$(testype $d)" == "false_positives" ]; then
if [ "$(testype "$d")" == "false_positives" ]; then
continue
fi
package_name=$(yq -r '.name' "${d}/manifest.yml")
package_version=$(yq -r '.version' "${d}/manifest.yml")

echo "--- Installing package: ${PACKAGE_NAME_VERSION}"
echo "--- Installing package: ${package_name} (${package_version})"
elastic-package install -C "$d" -v

# check that the package is installed
Expand Down
5 changes: 2 additions & 3 deletions scripts/test-build-zip.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/bin/bash

set -euxo pipefail
set -euo pipefail

cleanup() {
local r=$?
Expand Down Expand Up @@ -36,7 +35,7 @@ go run ./scripts/gpgkey

for d in test/packages/*/*/; do
# Packages in false_positives can have issues.
if [ "$(testype $d)" == "false_positives" ]; then
if [ "$(testype "$d")" == "false_positives" ]; then
continue
fi
echo "--- Building zip package: ${d}"
Expand Down