From 094c366af1fcf8c0288c7b0c3aef5e08da6f34a8 Mon Sep 17 00:00:00 2001 From: Andrea Culot Date: Fri, 21 Jun 2024 16:54:30 +0100 Subject: [PATCH] Fix centos and ubuntu integ tests --- test/integration/codebuild/buildspec.os.centos.yml | 2 -- test/integration/docker/Dockerfile.echo.centos | 2 +- test/integration/docker/Dockerfile.echo.ubuntu | 3 ++- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/test/integration/codebuild/buildspec.os.centos.yml b/test/integration/codebuild/buildspec.os.centos.yml index 3355a43..f3be37e 100644 --- a/test/integration/codebuild/buildspec.os.centos.yml +++ b/test/integration/codebuild/buildspec.os.centos.yml @@ -14,10 +14,8 @@ batch: env: variables: DISTRO_VERSION: - - "stream8" - "stream9" RUNTIME_VERSION: - - "16" - "18" - "20" phases: diff --git a/test/integration/docker/Dockerfile.echo.centos b/test/integration/docker/Dockerfile.echo.centos index 744be55..778b556 100644 --- a/test/integration/docker/Dockerfile.echo.centos +++ b/test/integration/docker/Dockerfile.echo.centos @@ -9,7 +9,7 @@ FROM quay.io/centos/centos:${DISTRO_VERSION} AS node-centos # Include global arg in this stage of the build ARG RUNTIME_VERSION # Install NodeJS -RUN curl -sL https://rpm.nodesource.com/setup_${RUNTIME_VERSION}.x | bash - && \ +RUN yum module enable -y nodejs:${RUNTIME_VERSION} && \ yum install -y nodejs diff --git a/test/integration/docker/Dockerfile.echo.ubuntu b/test/integration/docker/Dockerfile.echo.ubuntu index 890710a..567768b 100644 --- a/test/integration/docker/Dockerfile.echo.ubuntu +++ b/test/integration/docker/Dockerfile.echo.ubuntu @@ -34,7 +34,8 @@ RUN apt-get update && \ automake \ libtool \ wget \ - libcurl4-openssl-dev + libcurl4-openssl-dev \ + python3 # Install a modern CMake RUN wget --quiet -O cmake-install https://github.com/Kitware/CMake/releases/download/v3.20.0/cmake-3.20.0-linux-${ARCHITECTURE}.sh && \ sh cmake-install --skip-license --prefix=/usr --exclude-subdirectory;