[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen master] CI: Refresh Ubuntu Bionic container as 18.04-x86_64
commit 51e5081c6eac6176efdb72df4a878722bf56d834 Author: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> AuthorDate: Thu Jul 11 16:08:39 2024 +0100 Commit: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> CommitDate: Fri Jul 12 18:58:45 2024 +0100 CI: Refresh Ubuntu Bionic container as 18.04-x86_64 As with 16.04 (Xenial), except that ninja-build package is available so QEMU can be built. This halves the size of the container: registry.gitlab.com/xen-project/xen/ubuntu 18.04-x86_64 857MB registry.gitlab.com/xen-project/xen/ubuntu bionic 1.44GB Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> Reviewed-by: Anthony PERARD <anthony.perard@xxxxxxxxxx> Release-Acked-By: Oleksii Kurochko <oleksii.kurochko@xxxxxxxxx> --- automation/build/ubuntu/18.04-x86_64.dockerfile | 71 +++++++++++++++++++++++++ automation/build/ubuntu/bionic.dockerfile | 48 ----------------- automation/gitlab-ci/build.yaml | 16 +++--- automation/scripts/containerize | 2 +- 4 files changed, 80 insertions(+), 57 deletions(-) diff --git a/automation/build/ubuntu/18.04-x86_64.dockerfile b/automation/build/ubuntu/18.04-x86_64.dockerfile new file mode 100644 index 0000000000..336697ad95 --- /dev/null +++ b/automation/build/ubuntu/18.04-x86_64.dockerfile @@ -0,0 +1,71 @@ +# syntax=docker/dockerfile:1 +FROM --platform=linux/amd64 ubuntu:18.04 +LABEL maintainer.name="The Xen Project" +LABEL maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx" + +ENV DEBIAN_FRONTEND=noninteractive + +RUN <<EOF +#!/bin/bash + set -e + + useradd --create-home user + + apt-get -y update + + DEPS=( + # Xen + bison + build-essential + checkpolicy + clang + flex + python3-minimal + + # Tools (general) + ca-certificates + git-core + gzip + patch + perl + pkg-config + wget + # libxenguest dombuilder + libbz2-dev + libzstd-dev + liblzo2-dev + liblzma-dev + zlib1g-dev + # libacpi + acpica-tools + # libxl + uuid-dev + libyajl-dev + # RomBIOS + bcc + bin86 + # xentop + libncurses5-dev + # Python bindings + python3-dev + # Ocaml bindings/oxenstored + ocaml-nox + ocaml-findlib + + # Stubdom download/extract + bzip2 + + # Qemu build + libglib2.0-dev + libpixman-1-dev + meson + ninja-build + python3-packaging + ) + + apt-get -y --no-install-recommends install "${DEPS[@]}" + rm -rf /var/lib/apt/lists/* +EOF + +USER user +WORKDIR /build diff --git a/automation/build/ubuntu/bionic.dockerfile b/automation/build/ubuntu/bionic.dockerfile deleted file mode 100644 index c1effc725e..0000000000 --- a/automation/build/ubuntu/bionic.dockerfile +++ /dev/null @@ -1,48 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM --platform=linux/amd64 ubuntu:18.04 -LABEL maintainer.name="The Xen Project " \ - maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx" - -ENV DEBIAN_FRONTEND=noninteractive -ENV USER root - -RUN mkdir /build -WORKDIR /build - -# build depends -RUN apt-get update && \ - apt-get --quiet --yes install \ - build-essential \ - zlib1g-dev \ - libncurses5-dev \ - python-dev \ - python3-dev \ - uuid-dev \ - libyajl-dev \ - libaio-dev \ - libglib2.0-dev \ - clang \ - libpixman-1-dev \ - pkg-config \ - flex \ - bison \ - acpica-tools \ - bin86 \ - bcc \ - liblzma-dev \ - libnl-3-dev \ - ocaml-nox \ - libfindlib-ocaml-dev \ - markdown \ - transfig \ - pandoc \ - checkpolicy \ - wget \ - git \ - nasm \ - # QEMU - ninja-build \ - && \ - apt-get autoremove -y && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 7607e19cd5..fb896986b7 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -605,25 +605,25 @@ ubuntu-16.04-x86_64-gcc-debug: variables: CONTAINER: ubuntu:16.04-x86_64 -ubuntu-bionic-clang: +ubuntu-18.04-x86_64-clang: extends: .clang-x86-64-build variables: - CONTAINER: ubuntu:bionic + CONTAINER: ubuntu:18.04-x86_64 -ubuntu-bionic-clang-debug: +ubuntu-18.04-x86_64-clang-debug: extends: .clang-x86-64-build-debug variables: - CONTAINER: ubuntu:bionic + CONTAINER: ubuntu:18.04-x86_64 -ubuntu-bionic-gcc: +ubuntu-18.04-x86_64-gcc: extends: .gcc-x86-64-build variables: - CONTAINER: ubuntu:bionic + CONTAINER: ubuntu:18.04-x86_64 -ubuntu-bionic-gcc-debug: +ubuntu-18.04-x86_64-gcc-debug: extends: .gcc-x86-64-build-debug variables: - CONTAINER: ubuntu:bionic + CONTAINER: ubuntu:18.04-x86_64 ubuntu-focal-gcc: extends: .gcc-x86-64-build diff --git a/automation/scripts/containerize b/automation/scripts/containerize index 456146793a..9a64af21cf 100755 --- a/automation/scripts/containerize +++ b/automation/scripts/containerize @@ -40,10 +40,10 @@ case "_${CONTAINER}" in _bookworm-arm64v8-arm32-gcc) CONTAINER="${BASE}/debian:bookworm-arm64v8-arm32-gcc" ;; _bookworm-arm64v8) CONTAINER="${BASE}/debian:bookworm-arm64v8" ;; _bookworm-cppcheck) CONTAINER="${BASE}/debian:bookworm-cppcheck" ;; - _bionic) CONTAINER="${BASE}/ubuntu:bionic" ;; _opensuse-leap|_leap) CONTAINER="${BASE}/opensuse:leap-15.6-x86_64" ;; _opensuse-tumbleweed|_tumbleweed) CONTAINER="${BASE}/opensuse:tumbleweed-x86_64" ;; _xenial) CONTAINER="${BASE}/ubuntu:16.04-x86_64" ;; + _bionic) CONTAINER="${BASE}/ubuntu:18.04-x86_64" ;; esac # Use this variable to control whether root should be used -- generated by git-patchbot for /home/xen/git/xen.git#master
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |