ci: Run rustfmt and python jobs on aarch64
The x86_64 shared runners often have long queues. Move the rustfmt, python-artifacts, and yaml-toml-shell-py-test jobs to use the aarch64 runners instead. Signed-off-by: Valentine Burley <valentine.burley@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35000>
This commit is contained in:
committed by
Marge Bot
parent
3029898a15
commit
4ad8c8752d
@@ -830,7 +830,7 @@ debian-ppc64el:
|
||||
python-artifacts:
|
||||
stage: build-for-tests
|
||||
extends:
|
||||
- .use-debian/x86_64_pyutils
|
||||
- .use-debian/arm64_build
|
||||
- .build-common
|
||||
- .meson-build-for-tests
|
||||
variables:
|
||||
@@ -841,3 +841,5 @@ python-artifacts:
|
||||
- .gitlab-ci/prepare-artifacts-python.sh
|
||||
# Nothing uses the gitlab artifacts from this job anymore, stop uploading it
|
||||
artifacts: null
|
||||
tags:
|
||||
- $FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64
|
||||
|
||||
@@ -80,8 +80,11 @@ DEPS=(
|
||||
python3-pycparser
|
||||
python3-requests
|
||||
python3-setuptools
|
||||
python3-venv
|
||||
shellcheck
|
||||
u-boot-tools
|
||||
xz-utils
|
||||
yamllint
|
||||
zlib1g-dev
|
||||
zstd
|
||||
)
|
||||
@@ -93,6 +96,8 @@ apt-get -y install "${DEPS[@]}" "${EPHEMERAL[@]}"
|
||||
# Needed for ci-fairy s3cp
|
||||
pip3 install --break-system-packages "ci-fairy[s3] @ git+https://gitlab.freedesktop.org/freedesktop/ci-templates@$MESA_TEMPLATES_COMMIT"
|
||||
|
||||
pip3 install --break-system-packages -r bin/ci/test/requirements.txt
|
||||
|
||||
arch=armhf
|
||||
. .gitlab-ci/container/cross_build.sh
|
||||
|
||||
|
||||
@@ -48,13 +48,10 @@ DEPS=(
|
||||
"llvm-${LLVM_VERSION}-dev"
|
||||
ocl-icd-opencl-dev
|
||||
python3-pip
|
||||
python3-venv
|
||||
procps
|
||||
spirv-tools
|
||||
shellcheck
|
||||
strace
|
||||
time
|
||||
yamllint
|
||||
zstd
|
||||
)
|
||||
|
||||
@@ -87,8 +84,6 @@ rm -rf $XORGMACROS_VERSION
|
||||
|
||||
. .gitlab-ci/container/build-bindgen.sh
|
||||
|
||||
python3 -m pip install --break-system-packages -r bin/ci/requirements.txt
|
||||
|
||||
############### Uninstall the build software
|
||||
|
||||
apt-get purge -y "${EPHEMERAL[@]}"
|
||||
|
||||
@@ -21,7 +21,7 @@ include:
|
||||
variables:
|
||||
DEBIAN_BASE_TAG: "20250505-crosvm"
|
||||
|
||||
DEBIAN_BUILD_TAG: "20250422-ci-fairy"
|
||||
DEBIAN_BUILD_TAG: "20250515-aarch64"
|
||||
|
||||
DEBIAN_TEST_ANDROID_TAG: "20250511-angle-db"
|
||||
DEBIAN_TEST_GL_TAG: "20250511-angle-db"
|
||||
|
||||
@@ -24,12 +24,14 @@
|
||||
interruptible: true
|
||||
stage: code-validation
|
||||
extends:
|
||||
- .use-debian/x86_64_build
|
||||
- .use-debian/arm64_build
|
||||
variables:
|
||||
GIT_STRATEGY: fetch
|
||||
timeout: 10m
|
||||
script:
|
||||
- git diff --color=always --exit-code # Fails if there are diffs
|
||||
tags:
|
||||
- $FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64
|
||||
|
||||
rustfmt:
|
||||
extends:
|
||||
@@ -78,7 +80,7 @@ shader-db:
|
||||
|
||||
yaml-toml-shell-py-test:
|
||||
extends:
|
||||
- .use-debian/x86_64_pyutils
|
||||
- .use-debian/arm64_build
|
||||
- .no-auto-retry # this job can't be flaky
|
||||
stage: code-validation
|
||||
script:
|
||||
@@ -116,6 +118,8 @@ yaml-toml-shell-py-test:
|
||||
when: on_success
|
||||
- changes: *lint_files
|
||||
when: manual
|
||||
tags:
|
||||
- $FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64
|
||||
|
||||
.test-gl:
|
||||
extends:
|
||||
|
||||
Reference in New Issue
Block a user