From 809815f6a748e5a85cebe90aadaa8892db231c8e Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 9 Feb 2018 16:42:01 -0500 Subject: [PATCH] Add scripts to clean up all known build directories on build machines. --- osx/files/remove-build-directories | 19 +++++++++++++++++++ osx/init.sls | 7 +++++++ ubuntu/files/remove-build-directories | 19 +++++++++++++++++++ ubuntu/init.sls | 7 +++++++ 4 files changed, 52 insertions(+) create mode 100644 osx/files/remove-build-directories create mode 100644 ubuntu/files/remove-build-directories diff --git a/osx/files/remove-build-directories b/osx/files/remove-build-directories new file mode 100644 index 00000000..4b963d5c --- /dev/null +++ b/osx/files/remove-build-directories @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +set -o errexit +set -o nounset +set -o pipefail + +declare -a builders=("mac-dev-unit" "mac-nightly" "mac-rel-css" "mac-rel-css1" + "mac-rel-css2" "mac-rel-intermittent" "mac-rel-wpt1" + "mac-rel-wpt2" "mac-rel-wpt3" "mac-rel-wpt4") + +declare -a targets=("doc" "release" "geckolib" "debug") + +for builder in "${builders[@]}" +do + for target in "${targets[@]}" + do + rm -rf "/Users/servo/buildbot/slave/${builder}/build/target/${target}" + done +done \ No newline at end of file diff --git a/osx/init.sls b/osx/init.sls index 7a2d6ccb..0bceeecb 100644 --- a/osx/init.sls +++ b/osx/init.sls @@ -12,6 +12,13 @@ - mode: 644 - source: salt://{{ tpldir }}/files/profile +/var/root/remove-build-directories: + file.managed: + - user: root + - group: wheel + - mode: 654 + - source: salt://{{ tpldir }}/files/remove-build-directories + disable-homebrew-analytics: homebrew_analytics.managed: - name: disabled diff --git a/ubuntu/files/remove-build-directories b/ubuntu/files/remove-build-directories new file mode 100644 index 00000000..07f89a34 --- /dev/null +++ b/ubuntu/files/remove-build-directories @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +set -o errexit +set -o nounset +set -o pipefail + +declare -a builders=("android" "linux-dev" "linux-nightly" "linux-rel-css" + "linux-rel-intermittent" "linux-rel-nogate" + "linux-rel-wpt" "android-nightly" "arm32" "arm64") + +declare -a targets=("doc" "release" "geckolib" "debug") + +for builder in "${builders[@]}" +do + for target in "${targets[@]}" + do + rm -rf "/home/servo/buildbot/slave/${builder}/build/target/${target}" + done +done \ No newline at end of file diff --git a/ubuntu/init.sls b/ubuntu/init.sls index 097eb82d..785f4bd0 100644 --- a/ubuntu/init.sls +++ b/ubuntu/init.sls @@ -32,6 +32,13 @@ - template: jinja - source: salt://{{ tpldir }}/files/sources.list +/root/remove-build-directories: + file.managed: + - user: root + - group: root + - mode: 654 + - source: salt://{{ tpldir }}/files/remove-build-directories + refresh_pkg_db: module.run: - name: pkg.refresh_db