Skip to content

deploy: fix rollback release-root path contamination #131

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
benvinegar merged 1 commit into from
Feb 22, 2026
Merged

deploy: fix rollback release-root path contamination #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion bin/rollback-release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ while [ "$#" -gt 0 ]; do
case "$1" in
--release-root)
[ "$#" -ge 2 ] || die "--release-root requires a value"
bb_refresh_release_paths "$2" 1
BAUDBOT_RELEASE_ROOT="$2"
shift 2
;;
--skip-restart)
Expand All @@ -63,6 +63,10 @@ while [ "$#" -gt 0 ]; do
esac
done

# Normalize release paths after env + CLI parsing so BAUDBOT_RELEASE_ROOT always
# wins over any inherited BAUDBOT_CURRENT/PREVIOUS/RELEASES path variables.
bb_refresh_release_paths "${BAUDBOT_RELEASE_ROOT:-/opt/baudbot}" 1

bb_require_root "rollback (or BAUDBOT_ROLLBACK_ALLOW_NON_ROOT=1 for tests)" "$BAUDBOT_ROLLBACK_ALLOW_NON_ROOT"

[ -d "$BAUDBOT_RELEASES_DIR" ] || die "release directory missing: $BAUDBOT_RELEASES_DIR"
Expand Down
52 changes: 52 additions & 0 deletions bin/rollback-release.test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,23 @@ run_rollback() {
"$ROLLBACK_SCRIPT" "$target"
}

run_rollback_with_stale_release_paths() {
local release_root="$1"
local stale_root="$2"

BAUDBOT_ROLLBACK_ALLOW_NON_ROOT=1 \
BAUDBOT_RELEASE_ROOT="$release_root" \
BAUDBOT_RELEASES_DIR="$stale_root/releases" \
BAUDBOT_CURRENT_LINK="$stale_root/current" \
BAUDBOT_PREVIOUS_LINK="$stale_root/previous" \
BAUDBOT_ROLLBACK_DEPLOY_CMD="true" \
BAUDBOT_ROLLBACK_RESTART_CMD="true" \
BAUDBOT_ROLLBACK_HEALTH_CMD="true" \
BAUDBOT_ROLLBACK_SKIP_VERSION_CHECK=1 \
BAUDBOT_ROLLBACK_SKIP_CLI_LINK=1 \
"$ROLLBACK_SCRIPT" previous
}

test_rollback_previous_switches_current() {
(
set -euo pipefail
Expand Down Expand Up @@ -164,12 +181,47 @@ test_rollback_deploy_failure_keeps_current() {
)
}

test_rollback_release_root_overrides_stale_release_path_env() {
(
set -euo pipefail
local tmp repo release_root stale_root sha1 sha2 current previous

tmp="$(mktemp -d /tmp/baudbot-rollback-test.XXXXXX)"
trap 'rm -rf "$tmp"' EXIT

repo="$tmp/repo"
release_root="$tmp/opt/baudbot"
stale_root="$tmp/stale"

mkdir -p "$stale_root/releases/fake-current" "$stale_root/releases/fake-previous"
ln -s "$stale_root/releases/fake-current" "$stale_root/current"
ln -s "$stale_root/releases/fake-previous" "$stale_root/previous"

make_repo "$repo"
run_update "$repo" "$release_root"
sha1="$(git -C "$repo" rev-parse HEAD)"

new_commit "$repo" "second"
run_update "$repo" "$release_root"
sha2="$(git -C "$repo" rev-parse HEAD)"

run_rollback_with_stale_release_paths "$release_root" "$stale_root"

current="$(readlink -f "$release_root/current")"
previous="$(readlink -f "$release_root/previous")"

[ "$current" = "$release_root/releases/$sha1" ]
[ "$previous" = "$release_root/releases/$sha2" ]
)
}

echo "=== rollback-release tests ==="
echo ""

run_test "rollback previous switches current" test_rollback_previous_switches_current
run_test "rollback missing release keeps current" test_rollback_missing_release_fails_without_mutation
run_test "rollback deploy failure keeps current" test_rollback_deploy_failure_keeps_current
run_test "rollback release-root overrides stale env" test_rollback_release_root_overrides_stale_release_path_env

echo ""
echo "=== $PASSED/$TOTAL passed, $FAILED failed ==="
Expand Down