From 5936f1b2355e9fed973fb587fff57671d4befa2d Mon Sep 17 00:00:00 2001
From: jonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com>
Date: Tue, 25 Apr 2023 12:20:11 -0400
Subject: [PATCH] [cifuzz] Install gsutil using pip. (#10159)

Install is much smaller than web instructions and
doesn't include anthos bloat.
This cuts pull time in half (about 30 seconds).
---
 infra/cifuzz/cifuzz-base/Dockerfile | 9 +--------
 infra/cifuzz/requirements.txt       | 1 +
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/infra/cifuzz/cifuzz-base/Dockerfile b/infra/cifuzz/cifuzz-base/Dockerfile
index 2a2241ac9..85a5db4b0 100644
--- a/infra/cifuzz/cifuzz-base/Dockerfile
+++ b/infra/cifuzz/cifuzz-base/Dockerfile
@@ -20,14 +20,7 @@ RUN apt-get update && \
     apt-get install -y systemd && \
     wget https://download.docker.com/linux/ubuntu/dists/focal/pool/stable/amd64/docker-ce-cli_20.10.8~3-0~ubuntu-focal_amd64.deb -O /tmp/docker-ce.deb && \
     dpkg -i /tmp/docker-ce.deb && \
-    rm /tmp/docker-ce.deb && \
-    mkdir -p /opt/gcloud && \
-    wget -qO- https://dl.google.com/dl/cloudsdk/release/google-cloud-sdk.tar.gz | tar zxv -C /opt/gcloud && \
-    /opt/gcloud/google-cloud-sdk/install.sh --usage-reporting=false --bash-completion=false --disable-installation-options && \
-    apt-get -y install gcc python3-dev && \
-    pip3 install -U crcmod && \
-    apt-get autoremove -y gcc python3-dev
-
+    rm /tmp/docker-ce.deb
 
 ENV PATH=/opt/gcloud/google-cloud-sdk/bin/:$PATH
 ENV OSS_FUZZ_ROOT=/opt/oss-fuzz
diff --git a/infra/cifuzz/requirements.txt b/infra/cifuzz/requirements.txt
index cf61a3f4c..d09da56ad 100644
--- a/infra/cifuzz/requirements.txt
+++ b/infra/cifuzz/requirements.txt
@@ -1,3 +1,4 @@
 clusterfuzz==2.5.9
 requests==2.28.0
 protobuf==3.20.2
+gsutil==5.20