Add Ubuntu22

Signed-off-by: Alexey Rivkin <[email protected]>

Author: Alexey-Rivkin

.ci/jenkins/lib/build-matrix.yaml

@@ -45,13 +45,13 @@ runs_on_dockers:
       tag: "02112025",
       build_args: "--target nixl-base --build-arg ARCH=$arch"
     }
-  # - {
-  #     file: "contrib/Dockerfile",
-  #     name: "ubuntu22.04-nixl-deps",
-  #     uri: "$arch/$name",
-  #     tag: "02112025",
-  #     build_args: "--target nixl-base --build-arg BASE_IMAGE_TAG=24.10-cuda12.6-devel-ubuntu22.04"
-  #   }
+  - {
+      file: "contrib/Dockerfile",
+      name: "ubuntu22.04-nixl-deps",
+      uri: "$arch/$name",
+      tag: "02112025",
+      build_args: "--target nixl-base --build-arg ARCH=$arch --build-arg BASE_IMAGE_TAG=24.10-cuda12.6-devel-ubuntu22.04"
+    }
   # - { name: "podman-v5.0.2", url: "quay.io/podman/stable:v5.0.2", category: 'tool', privileged: true }
 
 matrix:

.gitlab/build.sh

@@ -109,17 +109,6 @@ $SUDO apt-get -qq install -y python3-dev \
                              libhwloc-dev \
                              libcurl4-openssl-dev zlib1g-dev # aws-sdk-cpp dependencies
 
-# Ubuntu 22.04 specific setup
-if grep -q "Ubuntu 22.04" /etc/os-release 2>/dev/null; then
-    # Upgrade pip for '--break-system-packages' support
-    $SUDO pip3 install --upgrade pip
-
-    # Upgrade meson (distro version 0.61.2 is too old, project requires >= 0.64.0)
-    $SUDO pip3 install --upgrade meson
-    # Ensure pip3's meson takes precedence over apt's version
-    export PATH="$HOME/.local/bin:/usr/local/bin:$PATH"
-fi
-
 # Add DOCA repository and install packages
 ARCH_SUFFIX=$(if [ "${ARCH}" = "aarch64" ]; then echo "arm64"; else echo "amd64"; fi)
 MELLANOX_OS="$(. /etc/lsb-release; echo ${DISTRIB_ID}${DISTRIB_RELEASE} | tr A-Z a-z | tr -d .)"
@@ -223,6 +212,16 @@ rm "libfabric-${LIBFABRIC_VERSION#v}.tar.bz2"
 
 fi # end NIXL_BASE_IMAGE_ENV check
 
+# Ubuntu 22.04 specific setup
+if grep -q "Ubuntu 22.04" /etc/os-release 2>/dev/null; then
+    # Upgrade pip for '--break-system-packages' support
+    $SUDO pip3 install --upgrade pip
+    # Upgrade meson (distro version 0.61.2 is too old, project requires >= 0.64.0)
+    $SUDO pip3 install --upgrade meson
+    # Ensure pip3's meson takes precedence over apt's version
+    export PATH="$HOME/.local/bin:/usr/local/bin:$PATH"
+fi
+
 export LD_LIBRARY_PATH="${INSTALL_DIR}/lib:${INSTALL_DIR}/lib/$ARCH-linux-gnu:${INSTALL_DIR}/lib64:$LD_LIBRARY_PATH:${LIBFABRIC_INSTALL_DIR}/lib"
 export CPATH="${INSTALL_DIR}/include:${LIBFABRIC_INSTALL_DIR}/include:$CPATH"
 export PATH="${INSTALL_DIR}/bin:$PATH"

contrib/Dockerfile

@@ -58,7 +58,6 @@ RUN apt-get update -y && \
     flex \
     libgtest-dev \
     build-essential \
-    python3.12-dev \
     clang \
     hwloc \
     libhwloc-dev \
@@ -146,8 +145,11 @@ RUN wget --tries=3 --waitretry=5 \
     rm rustup-init* && \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME
 
-RUN rm -rf /usr/lib/ucx
-RUN rm -rf /opt/hpcx/ucx
+# Clean up old UCX installations to avoid conflicts
+RUN rm -rf /usr/lib/ucx /opt/hpcx/ucx /usr/local/ucx && \
+    ARCH=$(uname -m) && \
+    rm -f /usr/lib/${ARCH}-linux-gnu/libucs* /usr/lib/${ARCH}-linux-gnu/libucp* \
+          /usr/lib/${ARCH}-linux-gnu/libuct* /usr/lib/${ARCH}-linux-gnu/libucm* 2>/dev/null || true
 
 RUN cd /usr/local/src && \
      git clone https://github.com/openucx/ucx.git && \