revi-archive/llvm-premerge-checks
1
0
Fork 0
Code Activity

Use os in queue name

Browse source 
That is useful for metrics collection as buildkite metrics only reports
per queue metrics
This commit is contained in:
Mikhail Goncharov 2020-06-16 10:30:24 +02:00
parent 397f7f38e9
commit 4c3cd1b6f5
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/playbooks.md
View file

@ -126,7 +126,7 @@ To spawn a new windows agent:
1. Create `c:\credentials` folder with file `buildkite-env.ps1`:
```powershell
$Env:buildkiteAgentToken = "secret-token"
$Env:BUILDKITE_AGENT_TAGS = "queue=premerge,os=windows"
$Env:BUILDKITE_AGENT_TAGS = "queue=windows"
$Env:CONDUIT_TOKEN = "conduit-api-token"
```
1. Run

2
kubernetes/buildkite/deployment.yaml
View file

@ -46,7 +46,7 @@ spec:
name: buildkite-agent-token
key: token
- name: BUILDKITE_AGENT_TAGS
value: "os=linux"
value: "queue=linux"
- name: BUILDKITE_BUILD_PATH
value: "/mnt/disks/ssd0/agent"
- name: CONDUIT_TOKEN

8
scripts/buildkite/build_branch_pipeline.py
View file

@ -18,7 +18,7 @@ import yaml
if __name__ == '__main__':
script_branch = os.getenv("scripts_branch", "master")
queue = os.getenv("BUILDKITE_AGENT_META_DATA_QUEUE", "default")
queue_prefix = os.getenv("BUILDKITE_AGENT_META_DATA_QUEUE_PREFIX", "")
diff_id = os.getenv("ph_buildable_diff", "")
steps = []
linux_buld_step = {
@ -36,7 +36,7 @@ if __name__ == '__main__':
'${SRC}/scripts/premerge_checks.py --check-clang-format --check-clang-tidy',
],
'artifact_paths': ['artifacts/**/*', '*_result.json'],
'agents': {'queue': queue, 'os': 'linux'}
'agents': {'queue': f'{queue_prefix}linux'}
}
windows_buld_step = {
'label': ':windows: build and test windows',
@ -58,7 +58,7 @@ if __name__ == '__main__':
'}',
],
'artifact_paths': ['artifacts/**/*', '*_result.json'],
'agents': {'queue': queue, 'os': 'windows'},
'agents': {'queue': f'{queue_prefix}windows'}
}
steps.append(linux_buld_step)
steps.append(windows_buld_step)
@ -75,7 +75,7 @@ if __name__ == '__main__':
],
'allow_dependency_failure': True,
'artifact_paths': ['artifacts/**/*'],
'agents': {'queue': queue, 'os': 'linux'}
'agents': {'queue': f'{queue_prefix}linux'}
}
steps.append(report_step)
print(yaml.dump({'steps': steps}))

6
scripts/buildkite/build_master_pipeline.py
View file

@ -18,7 +18,7 @@ import yaml
if __name__ == '__main__':
script_branch = os.getenv("scripts_branch", "master")
queue = os.getenv("BUILDKITE_AGENT_META_DATA_QUEUE", "default")
queue_prefix = os.getenv("BUILDKITE_AGENT_META_DATA_QUEUE_PREFIX", "")
diff_id = os.getenv("ph_buildable_diff", "")
steps = []
linux_buld_step = {
@ -32,7 +32,7 @@ if __name__ == '__main__':
'--projects="clang;clang-tools-extra;libc;libcxx;libcxxabi;lld;libunwind;mlir;flang"',
],
'artifact_paths': ['artifacts/**/*', '*_result.json'],
'agents': {'queue': queue, 'os': 'linux'}
'agents': {'queue': f'{queue_prefix}linux'}
}
windows_buld_step = {
'label': ':windows: build and test windows',
@ -54,7 +54,7 @@ if __name__ == '__main__':
'}',
],
'artifact_paths': ['artifacts/**/*', '*_result.json'],
'agents': {'queue': queue, 'os': 'windows'},
'agents': {'queue': f'{queue_prefix}windows'}
}
steps.append(linux_buld_step)
steps.append(windows_buld_step)

4
scripts/buildkite/create_branch_pipeline.py
View file

@ -17,14 +17,14 @@ import os
import yaml
if __name__ == '__main__':
queue = os.getenv("BUILDKITE_AGENT_META_DATA_QUEUE", "default")
queue_prefix = os.getenv("BUILDKITE_AGENT_META_DATA_QUEUE_PREFIX", "")
diff_id = os.getenv("ph_buildable_diff")
steps = []
create_branch_step = {
'label': 'create branch',
'key': 'create-branch',
'commands': ['scripts/buildkite/apply_patch.sh'],
'agents': {'queue': queue, 'os': 'linux'}
'agents': {'queue': f'{queue_prefix}linux'}
}
build_linux_step = {
'trigger': 'premerge-checks',