From 85087a8bb3e4aa438aacfad64074bc211bb5c6d9 Mon Sep 17 00:00:00 2001 From: Igor Sarkisov Date: Wed, 1 May 2024 17:14:27 -0700 Subject: [PATCH 1/5] Remove SCCACHE_SERVICE_ACCOUNT variable --- docker/linux/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/linux/Dockerfile b/docker/linux/Dockerfile index 5a7270edbb2cea..e46fcd31000283 100644 --- a/docker/linux/Dockerfile +++ b/docker/linux/Dockerfile @@ -15,5 +15,5 @@ ADD files/sccache /usr/local/bin ENV SCCACHE_GCS_BUCKET=githubactions-chrome-sccache ENV SCCACHE_GCS_RW_MODE=READ_WRITE ENV SCCACHE_GCS_KEY_PATH=/root/key.json -ENV SCCACHE_GCS_SERVICE_ACCOUNT=github-actions-bucket-access@cobalt-demo-330821.iam.gserviceaccount.com +# ENV SCCACHE_GCS_SERVICE_ACCOUNT=github-actions-bucket-access@cobalt-demo-330821.iam.gserviceaccount.com From fb64dc776f8bd83ddca90d169a89e59eb9d3e505 Mon Sep 17 00:00:00 2001 From: Igor Sarkisov Date: Thu, 2 May 2024 14:45:58 -0700 Subject: [PATCH 2/5] Use self-hosted runners --- .github/workflows/docker-build.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 1cfa226ca41d7c..5d23db0050c42c 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -34,16 +34,18 @@ jobs: build: needs: [docker-build-image] - runs-on: - labels: linux-test-hosted - group: cobalt + runs-on: [self-hosted, chrobalt-linux-runner] container: ${{ needs.docker-build-image.outputs.docker_tag }} env: DEPOT_TOOLS_UPDATE: 0 DEPOT_TOOLS_REPORT_BUILD: 0 DEPOT_TOOLS_COLLECT_METRICS: 0 DEPOT_TOOLS_METRICS: 0 - SCCACHE_GCS_KEY: ${{ secrets.SCCACHE_GCS_KEY }} + SCCACHE: 1 + SCCACHE_GCS_BUCKET: cobalt-actions-sccache-linux + SCCACHE_GCS_OAUTH_URL: http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/default/token + SCCACHE_GCS_RW_MODE: READ_WRITE + SCCACHE_IDLE_TIMEOUT: 0 # prevent sccache server from shutting down after long idle. steps: - name: Checkout @@ -64,10 +66,6 @@ jobs: run: df -h - name: Du run: du -ht 500M - - name: Place sccache key - run: echo "$SCCACHE_GCS_KEY" | base64 -d > /root/key.json - - name: Cat the key - run: cat /root/key.json - name: sccache check run: sccache -s - name: gn gen From 0df275a464323c564ac5fbdd9b5ddf260f265641 Mon Sep 17 00:00:00 2001 From: Igor Sarkisov Date: Thu, 2 May 2024 15:02:02 -0700 Subject: [PATCH 3/5] Update docker-build.yml --- .github/workflows/docker-build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 5d23db0050c42c..529dcecbc952a4 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -59,7 +59,11 @@ jobs: - name: Add directory to PATH run: echo "$GITHUB_WORKSPACE/depot_tools" >> $GITHUB_PATH - name: Generate gclient file - run: gclient config --name=src https://github.com/${{ github.repository }} + run: | + whoami + gclient config --help + gclient sync --help + gclient config --name=src https://github.com/${{ github.repository }} - name: Gclient sync run: gclient sync -v --shallow --no-history -r ${{ github.sha }} - name: DF From 3b34418581062c485efbce9d17a78eaa0ad9470d Mon Sep 17 00:00:00 2001 From: Igor Sarkisov Date: Thu, 2 May 2024 15:18:47 -0700 Subject: [PATCH 4/5] Change docker user --- docker/linux/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/linux/Dockerfile b/docker/linux/Dockerfile index e46fcd31000283..e5a48859eb806b 100644 --- a/docker/linux/Dockerfile +++ b/docker/linux/Dockerfile @@ -17,3 +17,5 @@ ENV SCCACHE_GCS_RW_MODE=READ_WRITE ENV SCCACHE_GCS_KEY_PATH=/root/key.json # ENV SCCACHE_GCS_SERVICE_ACCOUNT=github-actions-bucket-access@cobalt-demo-330821.iam.gserviceaccount.com +USER chrobalt +ENV HOME /home/chrobalt From d5fa27e8b72bb9a3b908d474fd02a08e99e3180b Mon Sep 17 00:00:00 2001 From: Igor Sarkisov Date: Thu, 2 May 2024 15:35:23 -0700 Subject: [PATCH 5/5] User default runner account --- .github/workflows/docker-build.yml | 8 ++------ docker/linux/Dockerfile | 5 +---- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 529dcecbc952a4..9d2c39bd1595e4 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -43,7 +43,7 @@ jobs: DEPOT_TOOLS_METRICS: 0 SCCACHE: 1 SCCACHE_GCS_BUCKET: cobalt-actions-sccache-linux - SCCACHE_GCS_OAUTH_URL: http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/default/token + SCCACHE_GCS_SERVICE_ACCOUNT: runner@cobalt-actions-devel.iam.gserviceaccount.com SCCACHE_GCS_RW_MODE: READ_WRITE SCCACHE_IDLE_TIMEOUT: 0 # prevent sccache server from shutting down after long idle. @@ -59,11 +59,7 @@ jobs: - name: Add directory to PATH run: echo "$GITHUB_WORKSPACE/depot_tools" >> $GITHUB_PATH - name: Generate gclient file - run: | - whoami - gclient config --help - gclient sync --help - gclient config --name=src https://github.com/${{ github.repository }} + run: gclient config --name=src https://github.com/${{ github.repository }} - name: Gclient sync run: gclient sync -v --shallow --no-history -r ${{ github.sha }} - name: DF diff --git a/docker/linux/Dockerfile b/docker/linux/Dockerfile index e5a48859eb806b..f7bed0e8ac3cb3 100644 --- a/docker/linux/Dockerfile +++ b/docker/linux/Dockerfile @@ -15,7 +15,4 @@ ADD files/sccache /usr/local/bin ENV SCCACHE_GCS_BUCKET=githubactions-chrome-sccache ENV SCCACHE_GCS_RW_MODE=READ_WRITE ENV SCCACHE_GCS_KEY_PATH=/root/key.json -# ENV SCCACHE_GCS_SERVICE_ACCOUNT=github-actions-bucket-access@cobalt-demo-330821.iam.gserviceaccount.com - -USER chrobalt -ENV HOME /home/chrobalt +ENV SCCACHE_GCS_SERVICE_ACCOUNT=github-actions-bucket-access@cobalt-demo-330821.iam.gserviceaccount.com