UI: update build infra
- Update the Debian image that builds the UI from buster->bookworm
- Remove source dependency from GitHub (Still used for trigger)
- Copy-paste the YAML inline inside Google Cloud Build rather than
referencing github
- Move the builder_entry_point.sh into the docker container, so it
doesn't depend on whatever contained in GitHub
Change-Id: I98fb7c2e2bb6b14e3b2f5b9ba071c733617b992b
diff --git a/infra/ui.perfetto.dev/README.md b/infra/ui.perfetto.dev/README.md
index 6006a7f..bf42acd 100644
--- a/infra/ui.perfetto.dev/README.md
+++ b/infra/ui.perfetto.dev/README.md
@@ -22,17 +22,15 @@
Cloud Build invokes the equivalent of:
```bash
-docker run gcr.io/perfetto-ui/perfetto-ui-builder \
- ui/release/builder_entrypoint.sh
+docker run gcr.io/perfetto-ui/perfetto-ui-builder /ui_builder_entrypoint.sh
```
-NOTE: the `builder_entrypoint.sh` script is not bundled in the docker container
-and is taken from the HEAD if the checked out repo.
+NOTE: the `ui_builder_entrypoint.sh` script is bundled in the docker container.
+The container needs to be re-built and re-pushed if the script changes.
To update the container:
```bash
-cd infra/ui.perfetto.dev/builder
-docker build -t gcr.io/perfetto-ui/perfetto-ui-builder .
-docker push gcr.io/perfetto-ui/perfetto-ui-builder .
+docker build -t gcr.io/perfetto-ui/perfetto-ui-builder infra/ui.perfetto.dev/builder
+docker push gcr.io/perfetto-ui/perfetto-ui-builder
```
diff --git a/infra/ui.perfetto.dev/builder/Dockerfile b/infra/ui.perfetto.dev/builder/Dockerfile
index 07944c1..8c726ee 100644
--- a/infra/ui.perfetto.dev/builder/Dockerfile
+++ b/infra/ui.perfetto.dev/builder/Dockerfile
@@ -15,16 +15,14 @@
# The image that builds the Perfetto UI and deploys to GCS.
# See go/perfetto-ui-autopush for docs on how this works end-to-end.
-FROM debian:buster-slim
+FROM debian:bookworm-slim
ENV PATH=/builder/google-cloud-sdk/bin/:$PATH
RUN set -ex; \
export DEBIAN_FRONTEND=noninteractive; \
apt-get update; \
apt-get -y install python3 python3-distutils python3-pip git curl tar tini \
- pkg-config zip libc-dev libgcc-8-dev; \
- update-alternatives --install /usr/bin/python python /usr/bin/python3.7 1; \
- pip3 install --quiet protobuf crcmod; \
+ pkg-config zip libc-dev python3-protobuf python3-crcmod; \
mkdir -p /builder && \
curl -s -o - https://dl.google.com/dl/cloudsdk/release/google-cloud-sdk.tar.gz | tar -zx -C /builder; \
/builder/google-cloud-sdk/install.sh \
@@ -35,6 +33,10 @@
git config --system credential.helper gcloud.sh; \
useradd -d /home/perfetto perfetto; \
apt-get -y autoremove; \
- rm -rf /var/lib/apt/lists/* /usr/share/man/* /usr/share/doc/*;
+ rm -rf /var/lib/apt/lists/* /usr/share/man/* /usr/share/doc/*; \
+ rm -rf /builder/google-cloud-sdk/.install/.backup;
+
+ADD ui_builder_entrypoint.sh /ui_builder_entrypoint.sh
+RUN chmod 755 /ui_builder_entrypoint.sh
ENTRYPOINT [ "tini", "-g", "--" ]
diff --git a/ui/release/builder_entrypoint.sh b/infra/ui.perfetto.dev/builder/ui_builder_entrypoint.sh
similarity index 90%
rename from ui/release/builder_entrypoint.sh
rename to infra/ui.perfetto.dev/builder/ui_builder_entrypoint.sh
index 27340ea..c1f70d3 100755
--- a/ui/release/builder_entrypoint.sh
+++ b/infra/ui.perfetto.dev/builder/ui_builder_entrypoint.sh
@@ -17,8 +17,6 @@
set -exu
-CUR_DUR=$(dirname ${BASH_SOURCE[0]})
-
env
pwd
mount
@@ -30,6 +28,7 @@
# support yet triggering from Gerrit.
cd /workspace/
+mkdir /workspace/tmp
ls -A1 | xargs rm -rf
UPSTREAM="https://android.googlesource.com/platform/external/perfetto.git"
@@ -38,7 +37,8 @@
cd upstream/
# infra/ui.perfetto.dev/cloudbuild_release.yaml sets $1 to the branch
-# name.
+# name when triggering from a release branch. Otherwise $1 is "" when triggering
+# from main.
EXTRA_ARGS=""
if [[ ! -z $1 ]]; then
git checkout $1
@@ -46,6 +46,5 @@
fi
git rev-parse HEAD
-mkdir /workspace/tmp
-python3 -u "$CUR_DUR/build_all_channels.py" \
+python3 -u "ui/release/build_all_channels.py" \
--upload --tmp=/workspace/tmp $EXTRA_ARGS
diff --git a/infra/ui.perfetto.dev/cloudbuild.yaml b/infra/ui.perfetto.dev/cloudbuild.yaml
index b8905f6..901389d 100644
--- a/infra/ui.perfetto.dev/cloudbuild.yaml
+++ b/infra/ui.perfetto.dev/cloudbuild.yaml
@@ -1,10 +1,13 @@
# See go/perfetto-ui-autopush for docs on how this works end-to-end.
+# If this file is modified, the inline YAML must be copy-pasted
+# FROM: infra/ui.perfetto.dev/cloudbuild.yaml
+# TO: TWO trigger configs inline YAML in Google Cloud Console > Cloud Build.
steps:
- name: gcr.io/$PROJECT_ID/perfetto-ui-builder
args:
- - 'ui/release/builder_entrypoint.sh'
+ - /ui_builder_entrypoint.sh
- ''
- # The extra arg above is load baring. The builder_entrypoint.sh
+ # The empty arg above is load bearing. The builder_entrypoint.sh
# script can't handle $1 sometimes being defined (as in
# cloudbuild.yaml) and sometimes not.
diff --git a/infra/ui.perfetto.dev/cloudbuild_release.yaml b/infra/ui.perfetto.dev/cloudbuild_release.yaml
index bcf6995..3c36aaa 100644
--- a/infra/ui.perfetto.dev/cloudbuild_release.yaml
+++ b/infra/ui.perfetto.dev/cloudbuild_release.yaml
@@ -1,8 +1,11 @@
# See go/perfetto-ui-autopush for docs on how this works end-to-end.
+# If this file is modified, the inline YAML must be copy-pasted
+# FROM: infra/ui.perfetto.dev/cloudbuild.yaml
+# TO: TWO trigger configs inline YAML in Google Cloud Console > Cloud Build.
steps:
- name: gcr.io/$PROJECT_ID/perfetto-ui-builder
args:
- - 'ui/release/builder_entrypoint.sh'
+ - /ui_builder_entrypoint.sh
- $BRANCH_NAME
# Timeout = 30 min (last measured time in Feb 2021: 12 min)
timeout: 1800s
