Message ID | 20250320155908.43885-1-andrew.cooper3@citrix.com (mailing list archive) |
---|---|
Headers | show |
Series | Xen: CI changes for new toolchain baseline | expand |
Test, to try and figure out what inumbo is choking on. ~Andrew On 20/03/2025 3:59 pm, Andrew Cooper wrote: > Drop CentOS 7 entirely. It's way to old now. > > Ubuntu 22.04 is the oldest Ubuntu with a suitable version of Clang, so swap > the 16.04 clang builds for 22.04. > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> > --- > CC: Anthony PERARD <anthony.perard@vates.tech> > CC: Michal Orzel <michal.orzel@amd.com> > CC: Jan Beulich <jbeulich@suse.com> > CC: Julien Grall <julien@xen.org> > CC: Roger Pau Monné <roger.pau@citrix.com> > CC: Stefano Stabellini <sstabellini@kernel.org> > CC: Oleksii Kurochko <oleksii.kurochko@gmail.com> > --- > automation/build/centos/7.dockerfile | 72 ---------------------------- > automation/gitlab-ci/build.yaml | 30 ++++-------- > 2 files changed, 10 insertions(+), 92 deletions(-) > delete mode 100644 automation/build/centos/7.dockerfile > > diff --git a/automation/build/centos/7.dockerfile b/automation/build/centos/7.dockerfile > deleted file mode 100644 > index f41dda732084..000000000000 > --- a/automation/build/centos/7.dockerfile > +++ /dev/null > @@ -1,72 +0,0 @@ > -# syntax=docker/dockerfile:1 > -FROM --platform=linux/amd64 centos:7 > -LABEL maintainer.name="The Xen Project" \ > - maintainer.email="xen-devel@lists.xenproject.org" > - > -RUN mkdir /build > -WORKDIR /build > - > -RUN <<EOF > - set -e > - > - # Fix up Yum config now that mirror.centos.org doesn't exist > - sed -e 's/mirror.centos.org/vault.centos.org/g' \ > - -e 's/^#.*baseurl=https\?/baseurl=https/g' \ > - -e 's/^mirrorlist=https\?/#mirrorlist=https/g' \ > - -i /etc/yum.repos.d/*.repo > - > - # Add the EPEL repo to get dev86 > - yum -y install epel-release > - > - # Update everything (Base container is out of date) > - yum -y update > - > - DEPS=( > - # Xen > - binutils > - gcc > - make > - python > - # Kconfig > - bison > - flex > - # Flask > - checkpolicy > - > - # Tools (general) > - git > - gzip > - patch > - perl > - pkgconfig > - wget > - # libxenguest dombuilder > - bzip2-devel > - lz4-devel > - lzo-devel > - xz-devel > - zlib-devel > - zstd-devel > - # libacpi > - acpica-tools > - # libxl > - libuuid-devel > - yajl-devel > - # RomBIOS > - dev86 > - # Header Check > - gcc-c++ > - # xentop > - ncurses-devel > - # Python bindings > - python-devel > - > - # Stubdom download/extract > - bzip2 > - ) > - > - yum -y install "${DEPS[@]}" > - > - yum clean all > - rm -rf /var/cache/yum > -EOF > diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml > index f633068c312b..2513908b059b 100644 > --- a/automation/gitlab-ci/build.yaml > +++ b/automation/gitlab-ci/build.yaml > @@ -545,16 +545,6 @@ archlinux-gcc-debug: > CONTAINER: archlinux:current > allow_failure: true > > -centos-7-gcc: > - extends: .gcc-x86-64-build > - variables: > - CONTAINER: centos:7 > - > -centos-7-gcc-debug: > - extends: .gcc-x86-64-build-debug > - variables: > - CONTAINER: centos:7 > - > debian-12-x86_64-gcc-ibt: > extends: .gcc-x86-64-build > variables: > @@ -607,16 +597,6 @@ fedora-41-x86_64-gcc-debug: > variables: > CONTAINER: fedora:41-x86_64 > > -ubuntu-16.04-x86_64-clang: > - extends: .clang-x86-64-build > - variables: > - CONTAINER: ubuntu:16.04-x86_64 > - > -ubuntu-16.04-x86_64-clang-debug: > - extends: .clang-x86-64-build-debug > - variables: > - CONTAINER: ubuntu:16.04-x86_64 > - > ubuntu-16.04-x86_64-gcc: > extends: .gcc-x86-64-build > variables: > @@ -637,6 +617,16 @@ ubuntu-20.04-x86_64-gcc: > variables: > CONTAINER: ubuntu:20.04-x86_64 > > +ubuntu-22.04-x86_64-clang: > + extends: .clang-x86-64-build > + variables: > + CONTAINER: ubuntu:22.04-x86_64 > + > +ubuntu-22.04-x86_64-clang-debug: > + extends: .clang-x86-64-build-debug > + variables: > + CONTAINER: ubuntu:22.04-x86_64 > + > ubuntu-22.04-x86_64-gcc: > extends: .gcc-x86-64-build > variables:
On Thu, Mar 20, 2025 at 04:01:36PM +0000, Andrew Cooper wrote: > On 20/03/2025 3:59 pm, Andrew Cooper wrote: > > Drop CentOS 7 entirely. It's way to old now. > > > > Ubuntu 22.04 is the oldest Ubuntu with a suitable version of Clang, so swap > > the 16.04 clang builds for 22.04. > > > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Reviewed-by: Anthony PERARD <anthony.perard@vates.tech> Thanks,