Skip to content

[CI] Allow to run each cloud cleanup step independently in DRY_RUN false mode #2581

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 9 commits into from
May 8, 2025
Merged

[CI] Allow to run each cloud cleanup step independently in DRY_RUN false mode #2581

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7054f85
Set the expected COMMAND when DRY_RUN is false
mrodm May 7, 2025
04243b8
Add annotations
mrodm May 7, 2025
7fb14de
Update annotation with step key
mrodm May 7, 2025
e4d3ce1
Update context annotation
mrodm May 7, 2025
464b115
Add exception
mrodm May 7, 2025
479d8c4
Do not show output in grep command
mrodm May 7, 2025
5bd8746
Add header in buildkite output
mrodm May 7, 2025
bb930ec
Restore plan for cloud-reaper
mrodm May 7, 2025
f30e89a
Update annotation
mrodm May 7, 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
Update annotation
  • Loading branch information
@mrodm
mrodm committed May 7, 2025
commit f30e89a04083fea0a5396934256372fe8c519142
4 changes: 3 additions & 1 deletion .buildkite/scripts/cloud-cleanup-oidc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,18 @@ DRY_RUN="$(buildkite-agent meta-data get DRY_RUN --default "${DRY_RUN:-"true"}")
resources_to_delete=0

COMMAND="validate"
redshift_message=""
if [[ "${DRY_RUN}" != "true" ]]; then
# TODO: to be changed to "destroy --confirm" once it can be tested
# that filters work as expected
COMMAND="plan"
redshift_message=" - stale redshift clusters will be deleted"
else
COMMAND="plan"
fi

buildkite-agent annotate \
"[${BUILDKITE_STEP_KEY}] Running DRY_RUN (${DRY_RUN}) using cloud-reaper command \"${COMMAND}\"" \
"[${BUILDKITE_STEP_KEY}] Running DRY_RUN (${DRY_RUN}) using cloud-reaper command \"${COMMAND}\"${redshift_message}" \
--context "ctx-cloud-reaper-info" \
--style "info"

Expand Down
4 changes: 3 additions & 1 deletion .buildkite/scripts/cloud-cleanup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,18 @@ DRY_RUN="$(buildkite-agent meta-data get DRY_RUN_DEPRECATED --default "${DRY_RUN
resources_to_delete=0

COMMAND="validate"
redshift_message=""
if [[ "${DRY_RUN}" != "true" ]]; then
# TODO: to be changed to "destroy --confirm" once it can be tested
# that filters work as expected
COMMAND="plan"
redshift_message=" - stale redshift clusters will be deleted"
else
COMMAND="plan"
fi

buildkite-agent annotate \
"[${BUILDKITE_STEP_KEY}] Running DRY_RUN (${DRY_RUN}) using cloud-reaper command \"${COMMAND}\"" \
"[${BUILDKITE_STEP_KEY}] Running DRY_RUN (${DRY_RUN}) using cloud-reaper command \"${COMMAND}\"${redshift_message}" \
--context "ctx-cloud-reaper-info-deprecated" \
--style "info"

Expand Down