fix: normalize legacy runtime checkpoints

Author: Nickfost

scripts/install-worker-controller.sh

@@ -1574,7 +1574,7 @@ restore_systemd_snapshot() {
 }
 
 restore_checkpoint() {
-  local target restored_state actual index expected_owner=0 failed=0 checkpoint_release='' drain_env=$rendered_env drain_release='' restore_images=false new_format=false checkpoint_format='' current_temporary='' validated_current_target='' validated_manager_target=''
+  local target restored_state actual index runtime_target expected_owner=0 failed=0 checkpoint_release='' drain_env=$rendered_env drain_release='' restore_images=false new_format=false checkpoint_format='' current_temporary='' validated_current_target='' validated_manager_target=''
   local restore_controller_tag_after_start=false
   local format_marker=$checkpoint_dir/format-version image_ids=$checkpoint_dir/image-ids.env
   [[ -n "$checkpoint_dir" && -d "$checkpoint_dir" ]] || return 1
@@ -1654,6 +1654,19 @@ PY
       note 'ROLLBACK_FAILED reason=checkpoint release target is invalid'
       return 1
     fi
+    runtime_target=$(canonical_release_target "$checkpoint_release" "$releases_dir" || true)
+    if [[ -z "$runtime_target" ]]; then
+      if [[ "$checkpoint_release" != "$manager_releases/"* || -L "$checkpoint_release" ]]; then
+        note 'ROLLBACK_FAILED reason=checkpoint release target is invalid'
+        return 1
+      fi
+      runtime_target=$releases_dir/$target
+      if ! install_release "$target" "$runtime_target" 0 0; then
+        note 'ROLLBACK_FAILED reason=checkpoint release target normalization failed'
+        return 1
+      fi
+    fi
+    checkpoint_release=$runtime_target
   fi
 
   if [[ -e "$checkpoint_dir/manager-target" || -L "$checkpoint_dir/manager-target" ]]; then

scripts/test-install-worker-controller.sh

@@ -1638,6 +1638,14 @@ expect_success "$installer" --rollback >/dev/null
 [[ $(readlink "$root/opt/ci-fleet/manager/current") == "$root/opt/ci-fleet/manager/releases/$legacy_checkpoint_manager_ref" ]] || fail 'legacy checkpoint manager target was not normalized to canonical authority'
 rm -rf "$legacy_checkpoint_manager"
 printf '%s\n' "$root/opt/ci-fleet/manager/releases/$legacy_checkpoint_manager_ref" >"$authority_checkpoint/manager-target"
+legacy_release_fallback=$root/opt/ci-fleet/manager/releases/prior-runtime-fallback
+cp -a "$root/opt/ci-fleet/manager/releases/$legacy_checkpoint_manager_ref" "$legacy_release_fallback"
+rm -rf "$authority_active_release"
+printf '%s\n' "$legacy_release_fallback" >"$authority_checkpoint/release-target"
+printf '%s' "$root/opt/ci-fleet/releases/missing-legacy-runtime" >"$authority_checkpoint/current-link"
+expect_success "$installer" --rollback >/dev/null
+[[ $(readlink "$root/opt/ci-fleet/current") == "$root/opt/ci-fleet/releases/$legacy_checkpoint_manager_ref" ]] || fail 'legacy checkpoint release fallback was not restaged to canonical runtime authority'
+rm -rf "$legacy_release_fallback"
 printf '%s\n' "$incomplete_current" >"$authority_checkpoint/release-target"
 printf '2\n' >"$authority_checkpoint/format-version"
 rm -f "$authority_checkpoint/current-link" "$authority_checkpoint/current-absent"