Skip to content

Commit 25ea2e5

Browse files
authored
chore: No longer install cloud-sql-proxy in the test script since it should already be present in the image (#1548)
1 parent b2fbe63 commit 25ea2e5

File tree

2 files changed

+0
-22
lines changed

2 files changed

+0
-22
lines changed

.kokoro/system_tests.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,5 @@ source $KOKORO_GFILE_DIR/secrets.sh
1616
# Move into the repo
1717
cd github/ruby-docs-samples/
1818

19-
# Install tools
20-
gem install --no-document toys
21-
2219
# Run the CI script
2320
toys kokoro-ci -v

.toys/kokoro-ci.rb

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,6 @@ def start_app_engine_services
213213
#
214214
def start_cloud_sql_services
215215
if @products.include? "cloud-sql/mysql"
216-
install_cloud_sql_proxy
217216
puts "Starting Cloud SQL Proxy for MySQL", :bold
218217
connection_name = assert_env "MYSQL_INSTANCE_CONNECTION_NAME"
219218
process = exec ["/bin/cloud_sql_proxy",
@@ -224,7 +223,6 @@ def start_cloud_sql_services
224223
@kill_on_cleanup << process
225224
end
226225
if @products.include? "cloud-sql/postgres"
227-
install_cloud_sql_proxy
228226
puts "Starting Cloud SQL Proxy for Postgres", :bold
229227
connection_name = assert_env "POSTGRES_INSTANCE_CONNECTION_NAME"
230228
process = exec ["/bin/cloud_sql_proxy",
@@ -235,7 +233,6 @@ def start_cloud_sql_services
235233
@kill_on_cleanup << process
236234
end
237235
if @products.include? "cloud-sql/postgres"
238-
install_cloud_sql_proxy
239236
puts "Starting Cloud SQL Proxy for SQL Server", :bold
240237
connection_name = assert_env "SQLSERVER_INSTANCE_CONNECTION_NAME"
241238
process = exec ["/bin/cloud_sql_proxy",
@@ -256,22 +253,6 @@ def start_memcached
256253
exec ["service", "memcached", "start"]
257254
end
258255

259-
##
260-
# Download and install cloud_sql_proxy
261-
#
262-
def install_cloud_sql_proxy
263-
return if defined? @cloud_sql_proxy_installed
264-
puts "Installing Cloud SQL Proxy", :bold
265-
Dir.chdir "/tmp" do
266-
exec ["wget", "-q", "https://dl.google.com/cloudsql/cloud_sql_proxy.linux.amd64"]
267-
mv "cloud_sql_proxy.linux.amd64", "/bin/cloud_sql_proxy"
268-
end
269-
chmod "+x", "/bin/cloud_sql_proxy"
270-
mkdir "/cloudsql"
271-
chmod 0777, "/cloudsql"
272-
@cloud_sql_proxy_installed = true
273-
end
274-
275256
##
276257
# Installs the gcloud tool
277258
# gcloud installed from system packages https://github.com/googleapis/testing-infra-docker/pull/446

0 commit comments

Comments
 (0)