Mesa (staging/20.3): ci: Drop x86_build_old image
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Dec 7 17:23:53 UTC 2020
Module: Mesa
Branch: staging/20.3
Commit: 0cde14200a49b15c4f17ab1637cb6c4caaa2296b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0cde14200a49b15c4f17ab1637cb6c4caaa2296b
Author: Michel Dänzer <mdaenzer at redhat.com>
Date: Thu Dec 3 18:11:00 2020 +0100
ci: Drop x86_build_old image
Currently not used for anything.
v2:
* Drop build script as well (Eric Anholt)
Fixes: a3543adc2628 "clover: set LLVM min version to 8.0.1"
Reviewed-by: Eric Anholt <eric at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7902>
(cherry picked from commit 42bc6db7e71c348594277af58975467c54eb2b19)
---
.gitlab-ci.yml | 15 --------
.gitlab-ci/container/x86_build_old.sh | 69 -----------------------------------
.pick_status.json | 2 +-
3 files changed, 1 insertion(+), 85 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bdb85845668..a308a36228b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -360,21 +360,6 @@ x86_test-vk:
variables:
FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-11-05-deqp-runner"
-# Debian 9 based x86 build image (old LLVM)
-x86_build_old:
- extends: x86_build-base
- variables:
- FDO_DISTRIBUTION_TAG: &x86_build_old "2020-11-05-kmod"
- FDO_DISTRIBUTION_VERSION: stretch-slim
-
-.use-x86_build_old:
- variables:
- TAG: *x86_build_old
- image: "$CI_REGISTRY_IMAGE/debian/x86_build_old:$TAG"
- needs:
- - x86_build_old
- - check mr
-
# Debian 10 based ARM build image
arm_build:
extends:
diff --git a/.gitlab-ci/container/x86_build_old.sh b/.gitlab-ci/container/x86_build_old.sh
deleted file mode 100644
index 3343fbb2449..00000000000
--- a/.gitlab-ci/container/x86_build_old.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-
-set -e
-set -o xtrace
-
-export DEBIAN_FRONTEND=noninteractive
-
-apt-get install -y \
- apt-transport-https \
- ca-certificates
-
-sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
-echo 'deb https://deb.debian.org/debian stretch-backports main' >/etc/apt/sources.list.d/backports.list
-
-apt-get update
-
-# Use newer packages from backports by default
-cat >/etc/apt/preferences <<EOF
-Package: *
-Pin: release a=stretch-backports
-Pin-Priority: 500
-EOF
-
-apt-get dist-upgrade -y
-
-apt-get install -y --no-remove \
- bison \
- bzip2 \
- ccache \
- flex \
- g++ \
- gcc \
- git \
- libclang-3.9-dev \
- libclang-4.0-dev \
- libclang-5.0-dev \
- libclang-6.0-dev \
- libclang-7-dev \
- libclc-dev \
- libdrm-dev \
- libelf-dev \
- libepoxy-dev \
- libexpat1-dev \
- libpng-dev \
- libunwind-dev \
- llvm-3.9-dev \
- llvm-4.0-dev \
- llvm-5.0-dev \
- llvm-6.0-dev \
- llvm-7-dev \
- ninja-build \
- pkg-config \
- python-mako \
- python3-mako \
- python3-pip \
- python3-setuptools \
- python3-wheel \
- scons \
- xz-utils \
- zlib1g-dev
-
-# We need at least 0.52.0, which is not in stretch
-python3 -m pip install meson>=0.52
-
-. .gitlab-ci/container/container_pre_build.sh
-
-############### Uninstall unused packages
-
-. .gitlab-ci/container/container_post_build.sh
diff --git a/.pick_status.json b/.pick_status.json
index 0aab452d13c..d4c14fb53b0 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -265,7 +265,7 @@
"description": "ci: Drop x86_build_old image",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": "a3543adc2628461818cfa691a7f547af7bc6f0fb"
},
More information about the mesa-commit
mailing list