Add smoketest for bpt secrets and gracefully shutdown devboxes when test fails

Author: alb-rl

tests/smoketests/test_blueprints.py

@@ -45,21 +45,58 @@ def test_create_blueprint_and_await_build(client: Runloop) -> None:
 @pytest.mark.timeout(30)
 def test_start_devbox_from_base_blueprint_by_id(client: Runloop) -> None:
     assert _blueprint_id
-    devbox = client.devboxes.create_and_await_running(
+    devbox = None
+    try: 
+        devbox = client.devboxes.create_and_await_running(
         blueprint_id=_blueprint_id,
         polling_config=PollingConfig(max_attempts=120, interval_seconds=5.0, timeout_seconds=20 * 60),
     )
-    assert devbox.blueprint_id == _blueprint_id
-    assert devbox.status == "running"
-    client.devboxes.shutdown(devbox.id)
+        assert devbox.blueprint_id == _blueprint_id
+        assert devbox.status == "running"
+    finally:
+        if devbox:
+            client.devboxes.shutdown(devbox.id)
 
 
 @pytest.mark.timeout(30)
 def test_start_devbox_from_base_blueprint_by_name(client: Runloop) -> None:
-    devbox = client.devboxes.create_and_await_running(
-        blueprint_name=_blueprint_name,
-        polling_config=PollingConfig(max_attempts=120, interval_seconds=5.0, timeout_seconds=20 * 60),
-    )
-    assert devbox.blueprint_id
-    assert devbox.status == "running"
-    client.devboxes.shutdown(devbox.id)
+    devbox = None
+    try: 
+        devbox = client.devboxes.create_and_await_running(
+            blueprint_name=_blueprint_name,
+            polling_config=PollingConfig(max_attempts=120, interval_seconds=5.0, timeout_seconds=20 * 60),
+        )
+        assert devbox.blueprint_id
+        assert devbox.status == "running"
+    finally:
+        if devbox:
+            client.devboxes.shutdown(devbox.id)
+
+
+@pytest.mark.timeout(60)
+def test_create_blueprint_with_secret_and_await_build(client: Runloop) -> None:
+    bpt = None
+    try: 
+        bpt = client.blueprints.create(
+            name=unique_name("bp-secrets"),
+            dockerfile=(
+                "FROM runloop:runloop/starter-arm64\n"
+                "ARG GITHUB_TOKEN\n"
+                "RUN git config --global credential.helper '!f() { echo \"username=x-access-token\"; echo \"password=$GITHUB_TOKEN\"; }; f' "
+                "&& git clone https://github.com/runloopai/runloop-fe.git /workspace/runloop-fe "
+                "&& git config --global --unset credential.helper\n"
+                "WORKDIR /workspace/runloop-fe"
+            ),
+            secrets={"GITHUB_TOKEN": "GITHUB_TOKEN_FOR_SMOKETESTS"},
+        )
+        # Wait for build to complete
+        completed = client.blueprints.await_build_complete(
+            bpt.id,
+            polling_config=PollingConfig(max_attempts=180, interval_seconds=5.0, timeout_seconds=30 * 60),
+        )
+        assert completed.status == "build_complete"
+        assert completed.parameters.secrets is not None
+        assert completed.parameters.secrets.get("GITHUB_TOKEN") == "GITHUB_TOKEN_FOR_SMOKETESTS"
+    finally: 
+        if bpt:
+            client.blueprints.delete(bpt.id)

tests/smoketests/test_snapshots.py

@@ -48,9 +48,13 @@ def test_snapshot_devbox(client: Runloop) -> None:
 @pytest.mark.timeout(30)
 def test_launch_devbox_from_snapshot(client: Runloop) -> None:
     assert _snapshot_id
-    launched = client.devboxes.create_and_await_running(
-        snapshot_id=_snapshot_id,
-        polling_config=PollingConfig(max_attempts=120, interval_seconds=5.0, timeout_seconds=20 * 60),
-    )
-    assert launched.snapshot_id == _snapshot_id
-    client.devboxes.shutdown(launched.id)
+    launched = None
+    try: 
+        launched = client.devboxes.create_and_await_running(
+            snapshot_id=_snapshot_id,
+            polling_config=PollingConfig(max_attempts=120, interval_seconds=5.0, timeout_seconds=20 * 60),
+        )
+        assert launched.snapshot_id == _snapshot_id
+    finally:
+        if launched:
+            client.devboxes.shutdown(launched.id)