From 251315dbaf221e87ba25534fc2dfb7dea85c18a6 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Tue, 25 Jun 2019 20:20:11 +0200 Subject: [PATCH 1/2] Remove some jobs from Buildbot MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * `arm64`: “no good reason to continue to maintain”: https://github.com/servo/servo/pull/23414#issuecomment-505045672 * `mac-rel-intermittent`: disabled since https://github.com/servo/saltfs/pull/965 * `linux-nigthly`: only perf data collection and upload now. Closes https://github.com/servo/servo/issues/23302, where this jobs has been know to be broken for 8 weeks but nobody cared enough to fix it --- etc/ci/buildbot_steps.yml | 58 ++------------------------------------- 1 file changed, 3 insertions(+), 55 deletions(-) diff --git a/etc/ci/buildbot_steps.yml b/etc/ci/buildbot_steps.yml index fca41eb046a..94f4453bb9c 100644 --- a/etc/ci/buildbot_steps.yml +++ b/etc/ci/buildbot_steps.yml @@ -30,16 +30,6 @@ linux-rel-nogate: - env RUSTFLAGS= bash ./etc/ci/mutation_test.sh - ./etc/ci/clean_build_artifacts.sh -mac-rel-intermittent: - env: - CC: /usr/local/opt/llvm/bin/clang - CXX: /usr/local/opt/llvm/bin/clang++ - commands: - - ./mach clean-nightlies --keep 3 --force - - ./mach clean-cargo-cache --keep 3 --force - - env PKG_CONFIG_PATH=/usr/local/opt/zlib/lib/pkgconfig ./mach build --release - - ./etc/ci/check_intermittents.sh --log-raw intermittents.log - linux-rel-wpt: env: CCACHE: sccache @@ -77,51 +67,6 @@ linux-rel-css: - bash ./etc/ci/lockfile_changed.sh - ./etc/ci/clean_build_artifacts.sh -linux-nightly: - env: - CC: clang-4.0 - CXX: clang++-4.0 - commands: - - ./mach clean-nightlies --keep 3 --force - - ./mach clean-cargo-cache --keep 3 --force - - ./etc/ci/clean_build_artifacts.sh - - ./mach build --release -p servo - - ./mach test-perf - - python3 ./etc/ci/performance/download_buildbot_timings.py --verbose - - aws s3 sync --size-only --acl public-read ./etc/ci/performance/output s3://servo-perf - - rm -rf ./python/_virtualenv - - ./etc/ci/clean_build_artifacts.sh - -arm64: - env: - AR: /usr/bin/aarch64-linux-gnu-ar - AS: /usr/bin/aarch64-linux-gnu-gcc - CC: /usr/bin/clang-4.0 - CFLAGS: --target=aarch64-unknown-linux-gnu -I/usr/aarch64-linux-gnu/include/ -fuse-ld=/home/servo/buildbot/slave/arm64/build/support/arm64/fake-ld.sh -Wno-error=unused-command-line-argument - CPP: /usr/bin/clang-4.0 -E - CPPFLAGS: -I/usr/aarch64-linux-gnu/include - CXX: /usr/bin/clang++-4.0 - CXXFLAGS: --target=aarch64-unknown-linux-gnu -I/usr/aarch64-linux-gnu/include/ -I/usr/aarch64-linux-gnu/include/c++/4.8.4/aarch64-linux-gnu -fuse-ld=/home/servo/buildbot/slave/arm64/build/support/arm64/fake-ld.sh -Wno-error=unused-command-line-argument - EXPAT_LIB_DIR: /usr/lib/aarch64-linux-gnu - HOST_CC: clang-4.0 - # test-tidy doesn't like empty strings - HOST_CFLAGS: --target=x86_64-unknown-linux-gnu - HOST_CXX: clang++-4.0 - # test-tidy doesn't like empty strings - HOST_CXXFLAGS: --target=x86_64-unknown-linux-gnu - LD: /usr/bin/aarch64-linux-gnu-ld - OBJCOPY: /usr/bin/aarch64-linux-gnu-objcopy - OBJDUMP: /usr/bin/aarch64-linux-gnu-objdump - RANLIB: /usr/bin/aarch64-linux-gnu-ranlib - STRIP: /usr/bin/aarch64-linux-gnu-strip - commands: - - ./mach clean-nightlies --keep 3 --force - - ./mach clean-cargo-cache --keep 3 --force - - ./etc/ci/clean_build_artifacts.sh - - env --unset CC_aarch64-unknown-linux-gnu --unset CXX_aarch64-unknown-linux-gnu ./mach build --rel --target=aarch64-unknown-linux-gnu - - bash ./etc/ci/lockfile_changed.sh - - ./etc/ci/clean_build_artifacts.sh - # Moved to Taskcluster linux-dev: [] mac-dev-unit: [] @@ -140,6 +85,9 @@ windows-msvc-nightly: [] mac-nightly: [] magicleap-nightly: [] magicleap: [] +linux-nightly: [] # No longer maintained arm32: [] +arm64: [] +mac-rel-intermittent: [] From 91da718253af3b483d3bac85668e492733035d2d Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Tue, 25 Jun 2019 21:37:30 +0200 Subject: [PATCH 2/2] Also remove linux-rel-intermittent Judged unnecessary: https://github.com/servo/servo/pull/23633#issuecomment-505576450 --- etc/ci/buildbot_steps.yml | 13 +------------ etc/ci/check_intermittents.sh | 22 ---------------------- etc/ci/former_intermittents_css.txt | 4 ---- etc/ci/former_intermittents_wpt.txt | 2 -- 4 files changed, 1 insertion(+), 40 deletions(-) delete mode 100755 etc/ci/check_intermittents.sh delete mode 100644 etc/ci/former_intermittents_css.txt delete mode 100644 etc/ci/former_intermittents_wpt.txt diff --git a/etc/ci/buildbot_steps.yml b/etc/ci/buildbot_steps.yml index 94f4453bb9c..92739095684 100644 --- a/etc/ci/buildbot_steps.yml +++ b/etc/ci/buildbot_steps.yml @@ -5,18 +5,6 @@ env: SCCACHE_IDLE_TIMEOUT: "1200" GST_DEBUG: '3' -linux-rel-intermittent: - env: - CC: clang-4.0 - CXX: clang++-4.0 - commands: - - ./mach clean-nightlies --keep 3 --force - - ./mach clean-cargo-cache --keep 3 --force - - ./etc/ci/clean_build_artifacts.sh - - ./mach build --release -p servo - - ./etc/ci/check_intermittents.sh --log-raw intermittents.log - - ./etc/ci/clean_build_artifacts.sh - linux-rel-nogate: env: CC: clang-4.0 @@ -91,3 +79,4 @@ linux-nightly: [] arm32: [] arm64: [] mac-rel-intermittent: [] +linux-rel-intermittent: [] diff --git a/etc/ci/check_intermittents.sh b/etc/ci/check_intermittents.sh deleted file mode 100755 index 486584e4cfe..00000000000 --- a/etc/ci/check_intermittents.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash - -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at https://mozilla.org/MPL/2.0/. - -set -o errexit -set -o nounset -set -o pipefail -REPEAT_COUNT=100 - -while read test_name; do - echo " - Checking ${test_name}" - ./mach test-wpt \ - --release \ - --log-raw - \ - --repeat "${REPEAT_COUNT}" \ - "${test_name}" \ - > intermittents.log \ - < /dev/null -done < "etc/ci/former_intermittents_wpt.txt" - diff --git a/etc/ci/former_intermittents_css.txt b/etc/ci/former_intermittents_css.txt deleted file mode 100644 index e380032bfa4..00000000000 --- a/etc/ci/former_intermittents_css.txt +++ /dev/null @@ -1,4 +0,0 @@ -/css-flexbox-1_dev/html/flexbox-basic-iframe-vert-001.htm -/css-transforms-1_dev/html/transform-table-007.htm -/css-transforms-1_dev/html/transform-abspos-002.htm -/css-transforms-1_dev/html/transform-abspos-007.htm diff --git a/etc/ci/former_intermittents_wpt.txt b/etc/ci/former_intermittents_wpt.txt deleted file mode 100644 index 4533d226d41..00000000000 --- a/etc/ci/former_intermittents_wpt.txt +++ /dev/null @@ -1,2 +0,0 @@ -/_mozilla/css/canvas_over_area.html -/_mozilla/css/iframe/hide_layers2.html