Skip to content

Commit 5a6d865

Browse files
remove Dockerfile, cloudbuild deployment steps, and configurations
1 parent ae11bdf commit 5a6d865

3 files changed

Lines changed: 4 additions & 74 deletions

File tree

Dockerfile

Lines changed: 0 additions & 24 deletions
This file was deleted.

cloudbuild.yaml

Lines changed: 4 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -17,37 +17,8 @@ options:
1717

1818
steps:
1919

20-
# --- STEP 1: Build and Push Docker Image ---
21-
- name: 'gcr.io/cloud-builders/docker'
22-
args:
23-
- 'build'
24-
- '-t'
25-
- 'us-central1-docker.pkg.dev/$PROJECT_ID/toolbox-evals/cloud-sql-postgresql:latest'
26-
- '.'
27-
28-
- name: 'gcr.io/cloud-builders/docker'
29-
args:
30-
- 'push'
31-
- 'us-central1-docker.pkg.dev/$PROJECT_ID/toolbox-evals/cloud-sql-postgresql:latest'
32-
33-
# --- STEP 2: Deploy to Cloud Run ---
34-
- name: 'gcr.io/google.com/cloudsdktool/cloud-sdk'
35-
entrypoint: gcloud
36-
args:
37-
- 'run'
38-
- 'deploy'
39-
- 'cloud-sql-postgresql-server'
40-
- '--image=us-central1-docker.pkg.dev/$PROJECT_ID/toolbox-evals/cloud-sql-postgresql:latest'
41-
- '--region=us-central1'
42-
- '--no-allow-unauthenticated'
43-
- '--port=8080'
44-
- '--timeout=300'
45-
- '--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'
46-
- '--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'
48-
49-
# --- STEP 3: Fully Integrated Evaluation to Persist Results ---
50-
- name: 'us-central1-docker.pkg.dev/cloud-db-nl2sql/evalbench/eval_server:latest'
20+
# --- Evaluation Step ---
21+
- name: 'us-central1-docker.pkg.dev/cloud-db-nl2sql/evalbench/eval_server:89aa9fefd4b247610a95ef0896ba55d468563f50'
5122
entrypoint: 'bash'
5223
# Decrypts the secret from Secret Manager into the DB_PASSWORD environment variable
5324
secretEnv: ['DB_PASSWORD']
@@ -61,17 +32,8 @@ steps:
6132
export EVAL_GCP_PROJECT_REGION=us-central1
6233
# Maps the decrypted DB_PASSWORD to the exact variable expected by gemini_cli and extension skills
6334
export CLOUD_SQL_POSTGRES_PASSWORD=$$DB_PASSWORD
64-
65-
echo "Patching client to use insecure credentials..."
66-
67-
sed -i 's/grpc.alts_channel_credentials()/None/g' evalbench/client/eval_client.py
68-
sed -i 's/grpc.aio.secure_channel(address, channel_creds)/grpc.aio.insecure_channel(address)/g' evalbench/client/eval_client.py
69-
70-
echo "Patching server to listen on all IPv4 interfaces (0.0.0.0)..."
71-
sed -i 's/"\[::\]:%s"/"0.0.0.0:%s"/g' /evalbench/evalbench/eval_server.py
72-
echo "Checking bind success in server (writing to stderr)..."
73-
sed -i 's|server.add_insecure_port("0.0.0.0:%s" % PORT)|bound_port = server.add_insecure_port("0.0.0.0:%s" % PORT)\n import sys\n sys.stderr.write(f"BOUND_PORT: {bound_port}\\n")\n if bound_port == 0: raise RuntimeError("Failed to bind to port!")|' /evalbench/evalbench/eval_server.py
74-
35+
export EVALBENCH_INSECURE=True
36+
export EVALBENCH_HOST=0.0.0.0
7537
cd evalbench
7638
export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
7739
export PYTHONPATH=./evalproto:.

evals/model_config.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,3 @@ setup:
2929
CLOUD_SQL_POSTGRES_USER: "postgres"
3030
CLOUD_SQL_POSTGRES_PASSWORD: ${CLOUD_SQL_POSTGRES_PASSWORD}
3131
CLOUD_SQL_POSTGRES_IP_TYPE: "PUBLIC"
32-
33-
# mcp_servers:
34-
# "cloud-sql-postgresql":
35-
# httpUrl: "CLOUD_RUN_URL_PLACEHOLDER"
36-
# authProviderType: google_credentials
37-
# oauth:
38-
# scopes:
39-
# - https://www.googleapis.com/auth/cloud-platform

0 commit comments

Comments
 (0)