Auto merge of #110846 - jdno:reduce-builder-sizes, r=pietroalbini

Optimize builder sizes

The infra-team is continuously monitoring the efficiency of the CI system in an effort to improve overall build times and resource usage. Some builders have used much less than their allocated resources, so we are testing smaller builder sizes for them.

r? `@pietroalbini`
This commit is contained in:
bors 2023-05-03 07:06:42 +00:00
commit 82cd953c7c
2 changed files with 18 additions and 14 deletions

View File

@ -260,13 +260,13 @@ jobs:
os: ubuntu-20.04-8core-32gb os: ubuntu-20.04-8core-32gb
env: {} env: {}
- name: i686-gnu - name: i686-gnu
os: ubuntu-20.04-16core-64gb os: ubuntu-20.04-8core-32gb
env: {} env: {}
- name: i686-gnu-nopt - name: i686-gnu-nopt
os: ubuntu-20.04-16core-64gb os: ubuntu-20.04-8core-32gb
env: {} env: {}
- name: mingw-check - name: mingw-check
os: ubuntu-20.04-8core-32gb os: ubuntu-20.04-4core-16gb
env: {} env: {}
- name: test-various - name: test-various
os: ubuntu-20.04-8core-32gb os: ubuntu-20.04-8core-32gb
@ -275,16 +275,16 @@ jobs:
os: ubuntu-20.04-8core-32gb os: ubuntu-20.04-8core-32gb
env: {} env: {}
- name: x86_64-gnu - name: x86_64-gnu
os: ubuntu-20.04-8core-32gb os: ubuntu-20.04-4core-16gb
env: {} env: {}
- name: x86_64-gnu-stable - name: x86_64-gnu-stable
env: env:
IMAGE: x86_64-gnu IMAGE: x86_64-gnu
RUST_CI_OVERRIDE_RELEASE_CHANNEL: stable RUST_CI_OVERRIDE_RELEASE_CHANNEL: stable
CI_ONLY_WHEN_CHANNEL: nightly CI_ONLY_WHEN_CHANNEL: nightly
os: ubuntu-20.04-8core-32gb os: ubuntu-20.04-4core-16gb
- name: x86_64-gnu-aux - name: x86_64-gnu-aux
os: ubuntu-20.04-8core-32gb os: ubuntu-20.04-4core-16gb
env: {} env: {}
- name: x86_64-gnu-debug - name: x86_64-gnu-debug
os: ubuntu-20.04-8core-32gb os: ubuntu-20.04-8core-32gb
@ -309,7 +309,7 @@ jobs:
RUST_BACKTRACE: 1 RUST_BACKTRACE: 1
os: ubuntu-20.04-8core-32gb os: ubuntu-20.04-8core-32gb
- name: x86_64-gnu-nopt - name: x86_64-gnu-nopt
os: ubuntu-20.04-8core-32gb os: ubuntu-20.04-4core-16gb
env: {} env: {}
- name: x86_64-gnu-tools - name: x86_64-gnu-tools
env: env:

View File

@ -73,6 +73,10 @@ x--expand-yaml-anchors--remove:
- &base-job - &base-job
env: {} env: {}
- &job-linux-4c
os: ubuntu-20.04-4core-16gb
<<: *base-job
- &job-linux-8c - &job-linux-8c
os: ubuntu-20.04-8core-32gb os: ubuntu-20.04-8core-32gb
<<: *base-job <<: *base-job
@ -416,13 +420,13 @@ jobs:
<<: *job-linux-8c <<: *job-linux-8c
- name: i686-gnu - name: i686-gnu
<<: *job-linux-16c <<: *job-linux-8c
- name: i686-gnu-nopt - name: i686-gnu-nopt
<<: *job-linux-16c <<: *job-linux-8c
- name: mingw-check - name: mingw-check
<<: *job-linux-8c <<: *job-linux-4c
- name: test-various - name: test-various
<<: *job-linux-8c <<: *job-linux-8c
@ -431,7 +435,7 @@ jobs:
<<: *job-linux-8c <<: *job-linux-8c
- name: x86_64-gnu - name: x86_64-gnu
<<: *job-linux-8c <<: *job-linux-4c
# This job ensures commits landing on nightly still pass the full # This job ensures commits landing on nightly still pass the full
# test suite on the stable channel. There are some UI tests that # test suite on the stable channel. There are some UI tests that
@ -446,10 +450,10 @@ jobs:
# could cause failures when `dev: 1` in `stage0.txt`, and running # could cause failures when `dev: 1` in `stage0.txt`, and running
# this on stable is useless. # this on stable is useless.
CI_ONLY_WHEN_CHANNEL: nightly CI_ONLY_WHEN_CHANNEL: nightly
<<: *job-linux-8c <<: *job-linux-4c
- name: x86_64-gnu-aux - name: x86_64-gnu-aux
<<: *job-linux-8c <<: *job-linux-4c
- name: x86_64-gnu-debug - name: x86_64-gnu-debug
<<: *job-linux-8c <<: *job-linux-8c
@ -478,7 +482,7 @@ jobs:
<<: *job-linux-8c <<: *job-linux-8c
- name: x86_64-gnu-nopt - name: x86_64-gnu-nopt
<<: *job-linux-8c <<: *job-linux-4c
- name: x86_64-gnu-tools - name: x86_64-gnu-tools
env: env: