[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 4/6] CI: Add Ubuntu 26.04



Swap yajl for json-c, given the deprecation of the former.

Add 26.04 GCC/Clang debug/non-debug jobs.  Drop the 24.04 debug jobs to keep
the overall job count down.

Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
CC: Anthony PERARD <anthony.perard@xxxxxxxxxx>
CC: Stefano Stabellini <sstabellini@xxxxxxxxxx>
CC: Michal Orzel <michal.orzel@xxxxxxx>
CC: Doug Goldstein <cardoe@xxxxxxxxxx>
CC: Roger Pau Monné <roger.pau@xxxxxxxxxx>
CC: Juergen Gross <jgross@xxxxxxxx>
CC: Oleksii Kurochko <oleksii.kurochko@xxxxxxxxx>
---
 .../build/ubuntu/26.04-x86_64.dockerfile      | 74 +++++++++++++++++++
 automation/gitlab-ci/build.yaml               | 22 ++++--
 2 files changed, 90 insertions(+), 6 deletions(-)
 create mode 100644 automation/build/ubuntu/26.04-x86_64.dockerfile

diff --git a/automation/build/ubuntu/26.04-x86_64.dockerfile 
b/automation/build/ubuntu/26.04-x86_64.dockerfile
new file mode 100644
index 000000000000..64729c00f2a6
--- /dev/null
+++ b/automation/build/ubuntu/26.04-x86_64.dockerfile
@@ -0,0 +1,74 @@
+# syntax=docker/dockerfile:1
+FROM --platform=linux/amd64 ubuntu:26.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 update
+
+    DEPS=(
+        # Xen
+        bison
+        build-essential
+        checkpolicy
+        clang
+        flex
+        python3-minimal
+
+        # Tools (general)
+        ca-certificates
+        cpio
+        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
+        libjson-c-dev
+        # RomBIOS
+        bcc
+        bin86
+        # xentop
+        libncurses5-dev
+        # Python bindings
+        python3-dev
+        python3-setuptools
+        # Ocaml bindings/oxenstored
+        ocaml
+        ocaml-findlib
+
+        # Stubdom download/extract
+        bzip2
+
+        # Qemu build
+        libglib2.0-dev
+        libpixman-1-dev
+        meson
+        ninja-build
+        python3-packaging
+        python3-venv
+    )
+
+    apt-get -y --no-install-recommends install "${DEPS[@]}"
+    rm -rf /var/lib/apt/lists/*
+EOF
+
+USER user
+WORKDIR /build
diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml
index 5a933e42f1ab..6d27cc8eb613 100644
--- a/automation/gitlab-ci/build.yaml
+++ b/automation/gitlab-ci/build.yaml
@@ -652,20 +652,30 @@ ubuntu-24.04-x86_64-clang:
   variables:
     CONTAINER: ubuntu:24.04-x86_64
 
-ubuntu-24.04-x86_64-clang-debug:
-  extends: .clang-x86-64-build-debug
+ubuntu-24.04-x86_64-gcc:
+  extends: .gcc-x86-64-build
   variables:
     CONTAINER: ubuntu:24.04-x86_64
 
-ubuntu-24.04-x86_64-gcc:
+ubuntu-26.04-x86_64-clang:
+  extends: .clang-x86-64-build
+  variables:
+    CONTAINER: ubuntu:26.04-x86_64
+
+ubuntu-26.04-x86_64-clang-debug:
+  extends: .clang-x86-64-build-debug
+  variables:
+    CONTAINER: ubuntu:26.04-x86_64
+
+ubuntu-26.04-x86_64-gcc:
   extends: .gcc-x86-64-build
   variables:
-    CONTAINER: ubuntu:24.04-x86_64
+    CONTAINER: ubuntu:26.04-x86_64
 
-ubuntu-24.04-x86_64-gcc-debug:
+ubuntu-26.04-x86_64-gcc-debug:
   extends: .gcc-x86-64-build-debug
   variables:
-    CONTAINER: ubuntu:24.04-x86_64
+    CONTAINER: ubuntu:26.04-x86_64
 
 opensuse-leap-15.6-clang:
   extends: .clang-x86-64-build
-- 
2.39.5




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.