should fix ci

Author: byrnedj

.github/workflows/build-cachelib-docker.yml

@@ -19,7 +19,7 @@ jobs:
       IMG_VER:              devel
     strategy:
       matrix:
-        CONFIG: ["OS=centos OS_VER=8streams PUSH_IMAGE=1"]
+        CONFIG: ["OS=centos OS_VER=9streams PUSH_IMAGE=1"]
     steps:
       - name: "System Information"
         run: |

docker/build.sh

@@ -88,7 +88,7 @@ docker run --privileged=true --name=${CONTAINER_NAME} -i \
 	--env COVERITY_SCAN_TOKEN=${COVERITY_SCAN_TOKEN} \
 	--env COVERITY_SCAN_NOTIFICATION_EMAIL=${COVERITY_SCAN_NOTIFICATION_EMAIL} \
 	--env TEST_TIMEOUT=${TEST_TIMEOUT} \
-	--env TZ='Europe/Warsaw' \
+	--env TZ='America/Los_Angeles' \
 	--shm-size=4G \
 	-v ${HOST_WORKDIR}:${WORKDIR} \
 	-v /etc/localtime:/etc/localtime \

docker/images/centos-8streams.Dockerfile renamed to docker/images/centos-9streams.Dockerfile

@@ -1,4 +1,4 @@
-FROM quay.io/centos/centos:stream8
+FROM quay.io/centos/centos:stream9
 
 RUN dnf install -y \
 cmake \
@@ -8,22 +8,20 @@ tzdata \
 vim \
 gdb \
 clang \
-python36 \
-glibc-devel.i686 \
 xmlto \
 uuid \
 libuuid-devel \
-json-c-devel \
 perf \
 numactl
 
 RUN dnf -y install gcc-toolset-12
 RUN echo "source /opt/rh/gcc-toolset-12/enable" >> /etc/bashrc
+
 SHELL ["/bin/bash", "--login", "-c"]
 
 COPY ./contrib ./contrib
 COPY ./docker ./docker
 COPY ./cachelib/external ./cachelib/external
-
+RUN ls ./cachelib/external/
 RUN ./docker/images/install-cachelib-deps.sh
 RUN ./docker/images/install-dsa-deps.sh

docker/images/install-cachelib-deps.sh

@@ -3,10 +3,11 @@
 # Copyright 2022, Intel Corporation
 
 echo 'Defaults env_keep += "HTTPS_PROXY https_proxy HTTP_PROXY http_proxy NO_PROXY no_proxy"' >> /etc/sudoers
-./contrib/prerequisites-centos8.sh
+./contrib/prerequisites-centos9.sh
 
-for pkg in zstd googleflags googlelog googletest sparsemap fmt folly fizz wangle fbthrift ;
+for pkg in zstd googleflags googlelog googletest sparsemap fmt folly fizz wangle mvfst fbthrift ;
 do
-    sudo ./contrib/build-package.sh -j -I /opt/ "$pkg"
+    echo "Building $pkg"
+    ./contrib/build-package.sh -j -v -I /opt/ "$pkg"
 done
 

docker/run-build.sh

@@ -8,13 +8,17 @@ function sudo_password() {
 	echo ${USERPASS} | sudo -Sk $*
 }
 
-cd ..
-mkdir build
-cd build
-
+#cd ..
+#mkdir build
+#cd build
+#
 source /opt/rh/gcc-toolset-12/enable
-
-cmake ../cachelib -DBUILD_TESTS=ON -DCMAKE_INSTALL_PREFIX=/opt -DCMAKE_BUILD_TYPE=Debug
-sudo_password make install -j$(nproc)
-
+#
+#cmake ../cachelib -DBUILD_TESTS=ON -DCMAKE_INSTALL_PREFIX=/opt -DCMAKE_BUILD_TYPE=Debug
+#sudo_password make install -j$(nproc)
+cd $WORKDIR
+if [ -d "build-cachelib" ]; then
+  rm -rf build-cachelib
+fi
+./contrib/build-package.sh -t -j -v -I /opt/ cachelib
 cd /opt/tests && $WORKDIR/run_tests.sh