Build and deploy skysim from the repository, world included

Dockerfile.ecr

@@ -0,0 +1,14 @@
+# skysim as it is deployed: the binary plus the world it flies in.
+#
+# The plain Dockerfile deliberately ships no tiles — worlds are cooked separately so a
+# new city does not mean a new image, and locally they are mounted. The deployed ECS
+# services have no volume mounts, though, so the world has to travel with the image:
+# without it skysim starts flat, every route sweep answers "no building data", and the
+# overwatch coordinator refuses to launch anything at all.
+#
+# The buildspec fetches the cooked world into world-tiles/ before this runs. It creates
+# the directory either way, so a build with no world still produces a working simulator
+# rather than failing on a missing COPY.
+FROM skyhub-skysim:build
+
+COPY world-tiles/ /opt/skysim/tiles/

buildspec.yml

@@ -0,0 +1,45 @@
+# Build skysim and deploy it to the ECS service for this environment.
+#
+# Two things differ from the other services in this account, both deliberate:
+#
+#   * x86_64, not ARM. The skysim task definitions are X86_64 on both dev and prod, and
+#     an image built for the wrong architecture fails at task start rather than at build.
+#   * The world is fetched from S3 and baked in. See Dockerfile.ecr.
+#
+# WORLD_S3_URI and IMAGE_NAME come from the CodeBuild project's environment, so the same
+# buildspec serves dev and prod.
+version: 0.2
+
+phases:
+  install:
+    commands:
+      - nohup /usr/local/bin/dockerd --host=unix:///var/run/docker.sock --host=tcp://127.0.0.1:2375 &
+      - timeout 15 sh -c "until docker info; do echo .; sleep 1; done"
+      - echo Logging in to Amazon ECR...
+      - export ECR_URI="$AWS_ACCOUNT_ID.dkr.ecr.$AWS_DEFAULT_REGION.amazonaws.com"
+      - aws ecr get-login-password --region $AWS_DEFAULT_REGION | docker login --username AWS --password-stdin $ECR_URI
+  pre_build:
+    commands:
+      # Always present, possibly empty: a missing directory would fail the COPY, and a
+      # simulator with no buildings is still a working simulator.
+      - mkdir -p world-tiles
+      - |
+        if [ -n "$WORLD_S3_URI" ]; then
+          echo "Fetching cooked world from $WORLD_S3_URI"
+          aws s3 cp "$WORLD_S3_URI" /tmp/world.tgz
+          tar -xzf /tmp/world.tgz -C world-tiles
+          echo "world: $(ls world-tiles | wc -l) file(s)"
+        else
+          echo "WORLD_S3_URI is unset — building with no buildings"
+        fi
+  build:
+    commands:
+      - echo "Building skysim"
+      - docker build --cache-from $IMAGE_NAME:latest -t skyhub-skysim:build .
+      - docker build -f Dockerfile.ecr -t $IMAGE_NAME:latest .
+      - docker tag $IMAGE_NAME:latest $IMAGE_NAME:$CODEBUILD_RESOLVED_SOURCE_VERSION
+  post_build:
+    commands:
+      # Both tags, so a deployment can be traced back to the commit that produced it.
+      - docker push -a $IMAGE_NAME
+      - aws ecs update-service --service $ECS_SERVICE --force-new-deployment --cluster $ECS_CLUSTER --region $AWS_DEFAULT_REGION

tests/test_api.cpp

@@ -47,10 +47,13 @@ int main() {
     std::atomic<bool> saw_launch_process{false};
     std::atomic<int> last_instance{-2};
     std::atomic<size_t> path_checks{0};
+    std::atomic<size_t> battery_resets{0};
+    std::atomic<uint32_t> last_battery_id{0};
     std::atomic<size_t> last_waypoint_count{0};
     std::atomic<double> last_clearance{-1.0};
 
-    // Fake tick thread: drain + answer. Spawn -> fixed result; despawn -> ok iff id == 1.
+    // Fake tick thread: drain + answer. Spawn -> fixed result; despawn and battery reset
+    // -> ok iff id == 1.
     // Path checks return a hit, a clear result, or unavailable geometry based on the first
     // waypoint's north coordinate so the HTTP response cases stay deterministic.
     std::thread consumer([&] {
@@ -62,6 +65,10 @@ int main() {
                     s->done.set_value(skysim::vehicle::SpawnResult{1, 30, 9302, 6060});
                 } else if (auto *d = std::get_if<DespawnCommand>(&cmd)) {
                     d->done.set_value(d->id == 1);
+                } else if (auto *b = std::get_if<BatteryResetCommand>(&cmd)) {
+                    ++battery_resets;
+                    last_battery_id = b->id;
+                    b->done.set_value(b->id == 1);
                 } else if (auto *p = std::get_if<PathCheckCommand>(&cmd)) {
                     ++path_checks;
                     last_waypoint_count = p->waypoints_ned.size();
@@ -165,6 +172,22 @@ int main() {
         CHECK(mission_unavailable && mission_unavailable->body.find("\"clear\":false") != std::string::npos);
         CHECK(path_checks.load() == 3);
 
+        // Fitting a fresh pack. The gateway calls this after every landing, because
+        // resetting only the autopilot's counter leaves skysim discharging the old pack
+        // and the vehicle is retired after one sortie.
+        auto battery = client.Post("/vehicles/1/battery/reset", "", "application/json");
+        CHECK(battery && battery->status == 200);
+        CHECK(battery && battery->body.find("\"ok\":true") != std::string::npos);
+        CHECK(battery_resets.load() == 1);
+        CHECK(last_battery_id.load() == 1);
+
+        // A vehicle that is not there says so, rather than reporting a pack it did not fit.
+        auto battery404 = client.Post("/vehicles/99/battery/reset", "", "application/json");
+        CHECK(battery404 && battery404->status == 404);
+        CHECK(battery404 && battery404->body.find("no such vehicle") != std::string::npos);
+        CHECK(battery_resets.load() == 2);
+        CHECK(last_battery_id.load() == 99);
+
         auto del = client.Delete("/vehicles/1");
         CHECK(del && del->status == 200 && del->body.find("\"ok\":true") != std::string::npos);
         auto del404 = client.Delete("/vehicles/99");