From e2d61a6131257dd0aa90a7bf050f2775f74764df Mon Sep 17 00:00:00 2001
From: yuneng-jiang <yuneng.jiang@gmail.com>
Date: Fri, 9 Jan 2026 22:43:01 -0800
Subject: [PATCH] final

---
 .circleci/config.yml | 63 ++++++++++++++++++++------------------------
 1 file changed, 28 insertions(+), 35 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f09cf017f0..4eda7d5702 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3549,7 +3549,7 @@ jobs:
       - run:
           name: Create Neon branch
           command: |
-            export EXPIRES_AT=$(date -u -d "+6 hours" +"%Y-%m-%dT%H:%M:%SZ")
+            export EXPIRES_AT=$(date -u -d "+3 hours" +"%Y-%m-%dT%H:%M:%SZ")
             echo "Expires at: $EXPIRES_AT"
             neon branches create \
               --project-id $NEON_PROJECT_ID \
@@ -3579,36 +3579,11 @@ jobs:
       - setup_google_dns
       - attach_workspace:
           at: ~/project
-      - run:
-          name: Install Neon CLI
-          command: |
-            npm install -g @neondatabase/cli
-
       - run:
           name: Load Docker Database Image
           command: |
             gunzip -c litellm-docker-database.tar.gz | docker load
             docker images | grep litellm-docker-database
-      - run:
-          name: Create Neon branch
-          command: |
-            export NEON_BRANCH_NAME="preview/commit-${CIRCLE_SHA1:0:7}"
-
-            neon branches create \
-              --project-id $NEON_PROJECT_ID \
-              --name $NEON_BRANCH_NAME \
-              --api-key $NEON_API_KEY || true
-      - run:
-          name: Load DB URL
-          command: |
-            DB_URL=$(neon connection-string \
-              --project-id $NEON_PROJECT_ID \
-              --api-key $NEON_API_KEY \
-              --branch $NEON_BRANCH_NAME \
-              --database yuneng-trial-db \
-              --role neondb_owner)
-
-            echo "export E2E_UI_TEST_DATABASE_URL=$DB_URL" >> $BASH_ENV
       - run:
           name: Install Dependencies
           command: |
@@ -3617,9 +3592,36 @@ jobs:
           name: Install Playwright Browsers
           command: |
             npx playwright install
+      - run:
+          name: Install Neon CLI
+          command: |
+            npm i -g neonctl
+      - run:
+          name: Create Neon branch
+          command: |
+            export EXPIRES_AT=$(date -u -d "+3 hours" +"%Y-%m-%dT%H:%M:%SZ")
+            echo "Expires at: $EXPIRES_AT"
+            neon branches create \
+              --project-id $NEON_PROJECT_ID \
+              --name preview/commit-${CIRCLE_SHA1:0:7} \
+              --expires-at $EXPIRES_AT \
+              --parent br-fancy-paper-ad1olsb3 \
+              --api-key $NEON_API_KEY || true
+      - run:
+          name: Load DB URL
+          command: |
+            DB_URL=$(neon connection-string \
+              --project-id $NEON_PROJECT_ID \
+              --api-key $NEON_API_KEY \
+              --branch preview/commit-${CIRCLE_SHA1:0:7} \
+              --database-name yuneng-trial-db \
+              --role neondb_owner)
+
+            echo "export E2E_UI_TEST_DATABASE_URL=$DB_URL" >> $BASH_ENV
       - run:
           name: Run Docker container
           command: |
+            echo "E2E_UI_TEST_DATABASE_URL: $E2E_UI_TEST_DATABASE_URL"
             docker run -d \
               -p 4000:4000 \
               -e DATABASE_URL=$E2E_UI_TEST_DATABASE_URL \
@@ -3664,15 +3666,6 @@ jobs:
       - store_artifacts:
           path: playwright-report
           destination: playwright-report
-      - run:
-          name: Delete Neon branch
-          command: |
-            neon branches delete \
-              --project-id $NEON_PROJECT_ID \
-              --name $NEON_BRANCH_NAME \
-              --api-key $NEON_API_KEY \
-              --yes || true
-          when: always
 
   test_nonroot_image:
     machine: