mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-20 05:10:11 +01:00
ci: Remove debian/x86_64_pyutils container
Delete the debian/x86_64_pyutils container, since the LAVA jobs no longer use it. Signed-off-by: Valentine Burley <valentine.burley@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34980>
This commit is contained in:
parent
b85b84fde6
commit
080894325a
5 changed files with 0 additions and 93 deletions
|
|
@ -385,7 +385,6 @@ sanity:
|
||||||
ALPINE_X86_64_LAVA_TRIGGER_TAG
|
ALPINE_X86_64_LAVA_TRIGGER_TAG
|
||||||
DEBIAN_BASE_TAG
|
DEBIAN_BASE_TAG
|
||||||
DEBIAN_BUILD_TAG
|
DEBIAN_BUILD_TAG
|
||||||
DEBIAN_PYUTILS_TAG
|
|
||||||
DEBIAN_TEST_ANDROID_TAG
|
DEBIAN_TEST_ANDROID_TAG
|
||||||
DEBIAN_TEST_GL_TAG
|
DEBIAN_TEST_GL_TAG
|
||||||
DEBIAN_TEST_VK_TAG
|
DEBIAN_TEST_VK_TAG
|
||||||
|
|
|
||||||
|
|
@ -1,67 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
# shellcheck disable=SC2086 # we want word splitting
|
|
||||||
|
|
||||||
# When changing this file, you need to bump the following
|
|
||||||
# .gitlab-ci/image-tags.yml tags:
|
|
||||||
# DEBIAN_PYUTILS_TAG
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
. .gitlab-ci/setup-test-env.sh
|
|
||||||
|
|
||||||
set -o xtrace
|
|
||||||
|
|
||||||
export DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
apt-get install -y ca-certificates
|
|
||||||
sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list.d/*
|
|
||||||
echo "deb [trusted=yes] https://gitlab.freedesktop.org/gfx-ci/ci-deb-repo/-/raw/${PKG_REPO_REV}/ ${FDO_DISTRIBUTION_VERSION%-*} main" | tee /etc/apt/sources.list.d/gfx-ci_.list
|
|
||||||
|
|
||||||
# Ephemeral packages (installed for this script and removed again at
|
|
||||||
# the end)
|
|
||||||
EPHEMERAL=(
|
|
||||||
binutils
|
|
||||||
build-essential
|
|
||||||
cpp
|
|
||||||
dpkg-dev
|
|
||||||
g++
|
|
||||||
gcc
|
|
||||||
libc6-dev
|
|
||||||
perl
|
|
||||||
python3-dev
|
|
||||||
)
|
|
||||||
|
|
||||||
DEPS=(
|
|
||||||
apt-utils
|
|
||||||
curl
|
|
||||||
file
|
|
||||||
findutils
|
|
||||||
git
|
|
||||||
python3-pil
|
|
||||||
python3-pip
|
|
||||||
python3-ply
|
|
||||||
python3-setuptools
|
|
||||||
python3-venv
|
|
||||||
python3-yaml
|
|
||||||
shellcheck
|
|
||||||
xz-utils
|
|
||||||
yamllint
|
|
||||||
zstd
|
|
||||||
)
|
|
||||||
|
|
||||||
apt-get update
|
|
||||||
|
|
||||||
apt-get install -y --no-remove --no-install-recommends "${DEPS[@]}" "${EPHEMERAL[@]}" \
|
|
||||||
"${EXTRA_LOCAL_PACKAGES:-}"
|
|
||||||
|
|
||||||
# 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
|
|
||||||
|
|
||||||
############### Uninstall ephemeral packages
|
|
||||||
|
|
||||||
apt-get purge -y "${EPHEMERAL[@]}"
|
|
||||||
apt-get autoremove --purge -y
|
|
||||||
|
|
||||||
. .gitlab-ci/container/container_post_build.sh
|
|
||||||
|
|
@ -528,26 +528,6 @@ debian/x86_64_test-video:
|
||||||
needs:
|
needs:
|
||||||
- debian/x86_64_test-video
|
- debian/x86_64_test-video
|
||||||
|
|
||||||
# Debian-based x86_64 image to run Python utilities
|
|
||||||
debian/x86_64_pyutils:
|
|
||||||
extends:
|
|
||||||
- .debian-container
|
|
||||||
variables:
|
|
||||||
MESA_IMAGE_TAG: &debian-x86_64_pyutils "${DEBIAN_PYUTILS_TAG}"
|
|
||||||
|
|
||||||
.use-debian/x86_64_pyutils:
|
|
||||||
tags:
|
|
||||||
- $FDO_RUNNER_JOB_PRIORITY_TAG_X86_64
|
|
||||||
extends:
|
|
||||||
- .fdo.container-build@debian
|
|
||||||
- .debian-container-version
|
|
||||||
- .set-image
|
|
||||||
variables:
|
|
||||||
MESA_IMAGE_PATH: "debian/x86_64_pyutils"
|
|
||||||
MESA_IMAGE_TAG: *debian-x86_64_pyutils
|
|
||||||
needs:
|
|
||||||
- debian/x86_64_pyutils
|
|
||||||
|
|
||||||
# Debian based ARMv7/armhf test image for GL
|
# Debian based ARMv7/armhf test image for GL
|
||||||
debian/arm32_test-gl:
|
debian/arm32_test-gl:
|
||||||
tags:
|
tags:
|
||||||
|
|
|
||||||
|
|
@ -28,8 +28,6 @@ variables:
|
||||||
DEBIAN_TEST_VIDEO_TAG: "20250503-fluster"
|
DEBIAN_TEST_VIDEO_TAG: "20250503-fluster"
|
||||||
DEBIAN_TEST_VK_TAG: "20250526-piglit-c32"
|
DEBIAN_TEST_VK_TAG: "20250526-piglit-c32"
|
||||||
|
|
||||||
DEBIAN_PYUTILS_TAG: "20250422-ci-fairy"
|
|
||||||
|
|
||||||
ALPINE_X86_64_BUILD_TAG: "20250423-rootfs"
|
ALPINE_X86_64_BUILD_TAG: "20250423-rootfs"
|
||||||
ALPINE_X86_64_LAVA_SSH_TAG: "20250423-rootfs"
|
ALPINE_X86_64_LAVA_SSH_TAG: "20250423-rootfs"
|
||||||
ALPINE_X86_64_LAVA_TRIGGER_TAG: "20250526-byeutils"
|
ALPINE_X86_64_LAVA_TRIGGER_TAG: "20250526-byeutils"
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,3 @@
|
||||||
# If you change these requirements, and you need these packages
|
|
||||||
# to be available in the debian/x86_64_pyutils container
|
|
||||||
# then bump the DEBIAN_PYUTILS_TAG
|
|
||||||
-r requirements-lava.txt
|
-r requirements-lava.txt
|
||||||
PyYAML==6.*
|
PyYAML==6.*
|
||||||
colorama==0.4.*
|
colorama==0.4.*
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue