Skip to content

Commit aa6ab94

Browse files
chore: configure service account for Cloud Run step and simplify evaluation server execution script
1 parent d38f261 commit aa6ab94

1 file changed

Lines changed: 3 additions & 9 deletions

File tree

cloudbuild.yaml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ steps:
4444
- '--timeout=300'
4545
- '--set-env-vars=CLOUD_SQL_POSTGRES_PROJECT=$PROJECT_ID,CLOUD_SQL_POSTGRES_INSTANCE=daily-ci-evals-db,CLOUD_SQL_POSTGRES_REGION=us-central1,CLOUD_SQL_POSTGRES_DATABASE=postgres,CLOUD_SQL_POSTGRES_USER=postgres,CLOUD_SQL_POSTGRES_IP_TYPE=PUBLIC'
4646
- '--set-secrets=CLOUD_SQL_POSTGRES_PASSWORD=daily-ci-evals-db-password:latest'
47+
- '--service-account=evals-ci-runner@ext-test-cloud-sql-postgres.iam.gserviceaccount.com'
4748

4849
# --- STEP 3: Fully Integrated Evaluation to Persist Results ---
4950
- name: 'us-central1-docker.pkg.dev/cloud-db-nl2sql/evalbench/eval_server:latest'
@@ -58,11 +59,8 @@ steps:
5859
export EVAL_GCP_PROJECT_ID=$PROJECT_ID
5960
export EVAL_GCP_PROJECT_REGION=us-central1
6061
61-
echo "Compiling protobuf files..."
62-
python3 -m grpc_tools.protoc --proto_path=evalbench/evalproto --python_out=evalbench/evalproto --grpc_python_out=evalbench/evalproto evalbench/evalproto/*.proto
63-
6462
echo "Patching client to use insecure credentials..."
65-
# sed -i 's/"localhost:50051"/"127.0.0.1:50051"/g' evalbench/client/eval_client.py
63+
6664
sed -i 's/grpc.alts_channel_credentials()/None/g' evalbench/client/eval_client.py
6765
sed -i 's/grpc.aio.secure_channel(address, channel_creds)/grpc.aio.insecure_channel(address)/g' evalbench/client/eval_client.py
6866
@@ -77,12 +75,8 @@ steps:
7775
export CLOUD_RUN=True
7876
export PORT=50051
7977
80-
81-
8278
echo "Starting Evaluation Server in background..."
83-
# NEW: Added </dev/null in case it was waiting for input
84-
python3 -u ./eval_server.py --localhost </dev/null &
85-
SERVER_PID=$$!
79+
python3 -u ./eval_server.py --localhost </dev/null 2>&1 | tee server.log &
8680
8781
echo "Waiting for port 50051 to open..."
8882
python3 -c "

0 commit comments

Comments
 (0)