From e08efbcf2aaa1bbd73e3cb82ea680c4de57c9b0e Mon Sep 17 00:00:00 2001 From: Mikhail Goncharov Date: Thu, 4 Jun 2020 12:36:46 +0200 Subject: [PATCH] Script updates: - option not to shut down sccache after 10 minutes - zero sccache stats before running the build - decrease number of jenkins agents --- containers/agent-windows-buildkite/start_agent.ps1 | 1 + kubernetes/jenkins.yaml | 2 +- scripts/buildkite/build_branch_pipeline.py | 2 +- scripts/buildkite/build_master_pipeline.py | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/containers/agent-windows-buildkite/start_agent.ps1 b/containers/agent-windows-buildkite/start_agent.ps1 index eec4e53..5b95b0c 100644 --- a/containers/agent-windows-buildkite/start_agent.ps1 +++ b/containers/agent-windows-buildkite/start_agent.ps1 @@ -3,6 +3,7 @@ c:\credentials\buildkite-env.ps1 iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/buildkite/agent/master/install.ps1')) $env:SCCACHE_DIR="C:\ws\sccache" +$env:SCCACHE_IDLE_TIMEOUT="0" Remove-Item -Recurse -Force -ErrorAction Ignore $env:SCCACHE_DIR sccache --start-server diff --git a/kubernetes/jenkins.yaml b/kubernetes/jenkins.yaml index 467de52..4e54676 100644 --- a/kubernetes/jenkins.yaml +++ b/kubernetes/jenkins.yaml @@ -154,7 +154,7 @@ metadata: name: agent-debian-testing-ssd namespace: jenkins spec: - replicas: 4 + replicas: 2 template: metadata: labels: diff --git a/scripts/buildkite/build_branch_pipeline.py b/scripts/buildkite/build_branch_pipeline.py index 9669019..07d5c5c 100755 --- a/scripts/buildkite/build_branch_pipeline.py +++ b/scripts/buildkite/build_branch_pipeline.py @@ -42,7 +42,7 @@ if __name__ == '__main__': 'label': ':windows: build and test windows', 'key': 'windows', 'commands': [ - 'sccache --show-stats', + 'sccache --zero-stats', 'set SRC=%BUILDKITE_BUILD_PATH%/llvm-premerge-checks', 'rm -rf %SRC%', 'git clone --depth 1 --branch %scripts_branch% https://github.com/google/llvm-premerge-checks.git %SRC%', diff --git a/scripts/buildkite/build_master_pipeline.py b/scripts/buildkite/build_master_pipeline.py index a28d910..3573ec3 100755 --- a/scripts/buildkite/build_master_pipeline.py +++ b/scripts/buildkite/build_master_pipeline.py @@ -37,7 +37,7 @@ if __name__ == '__main__': 'label': ':windows: build and test windows', 'key': 'windows', 'commands': [ - 'sccache --show-stats', + 'sccache --zero-stats', 'set SRC=%BUILDKITE_BUILD_PATH%/llvm-premerge-checks', 'rm -rf %SRC%', 'git clone --depth 1 --branch %scripts_branch% https://github.com/google/llvm-premerge-checks.git %SRC%',