From 3c3d093fb66d82d3098d3fb9a078275b49642b6e Mon Sep 17 00:00:00 2001 From: Mikhail Goncharov Date: Mon, 30 Oct 2023 11:00:38 +0100 Subject: [PATCH] host info for buildbots --- containers/buildbot-linux/entrypoint.sh | 10 +++++++++- containers/buildbot-windows/entrypoint.sh | 9 +++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/containers/buildbot-linux/entrypoint.sh b/containers/buildbot-linux/entrypoint.sh index cecdfbe..bf0fc4d 100755 --- a/containers/buildbot-linux/entrypoint.sh +++ b/containers/buildbot-linux/entrypoint.sh @@ -40,7 +40,15 @@ if [[ -z "${BUILDBOT_ADDRESS+x}" ]]; then else buildbot-worker create-worker /build/buildbot $BUILDBOT_ADDRESS $BUILDBOT_NAME $BUILDBOT_PASSWORD echo "llvm-premerge-buildbots " > /build/buildbot/info/admin - echo "Setup analogous to linux agent for to Pull Request checks" > /build/buildbot/info/host + echo "Setup analogous to linux agent for Pull Request checks" >> /build/buildbot/info/host + echo "Ubuntu 20, cmake-3.23.3, LLVM 16" >> /c/ws/buildbot/info/host + echo "https://github.com/google/llvm-premerge-checks/blob/main/containers/buildbot-linux/Dockerfile" >> /c/ws/buildbot/info/host + echo "lsb_release -a" >> /build/buildbot/info/host + lsb_release -a >> /build/buildbot/info/host + echo "lscpu" >> /build/buildbot/info/host + lscpu >> /build/buildbot/info/host + echo "dpkg -l" >> /build/buildbot/info/host + dpkg -l >> /build/buildbot/info/host chown -R ${USER}:${USER} /build/buildbot gosu "$USER" bash -c 'CC=clang CXX=clang++ LD=LLD buildbot-worker start /build/buildbot' fi diff --git a/containers/buildbot-windows/entrypoint.sh b/containers/buildbot-windows/entrypoint.sh index 7ce0198..cc62f84 100644 --- a/containers/buildbot-windows/entrypoint.sh +++ b/containers/buildbot-windows/entrypoint.sh @@ -15,6 +15,11 @@ mkdir -p /c/ws/buildbbot buildbot-worker create-worker /c/ws/buildbot $BUILDBOT_ADDRESS $BUILDBOT_NAME $BUILDBOT_PASSWORD echo "llvm-premerge-buildbots " > /c/ws/buildbot/info/admin -echo "Setup analogous to windows agent for to Pull Request checks" > /c/ws/buildbot/info/host - +echo "Setup analogous to windows agent for Pull Request checks" > /c/ws/buildbot/info/host +echo "Windows ltsc2019, vs-2019, LLVM-16+" >> /c/ws/buildbot/info/host +echo "https://github.com/google/llvm-premerge-checks/blob/main/containers/buildbot-windows/Dockerfile" >> /c/ws/buildbot/info/host +echo "Get-WmiObject -Class Win32_Processor" >> /c/ws/buildbot/info/host +powershell.exe -c "Get-WmiObject -Class Win32_Processor" >> /c/ws/buildbot/info/host +echo "Get-WmiObject -Class Win32_Product" >> /c/ws/buildbot/info/host +powershell.exe -c "Get-WmiObject -Class Win32_Product" >> /c/ws/buildbot/info/host $@ \ No newline at end of file