From: Anshuman Date: Sun, 9 Nov 2025 11:14:32 +0000 (+0530) Subject: run-make: Added flag for Dashboard and WError X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fheads%2Fppc64-ci;p=ceph-ci.git run-make: Added flag for Dashboard and WError Added flags to make Dashboard and WError optional. This should not impact existing pipelines as these options are disabled only when the flags are present. Signed-off-by: Anshuman --- diff --git a/Dockerfile.build b/Dockerfile.build index 0586cdd37a4..24bc813441c 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -36,6 +36,8 @@ RUN DISTRO=$DISTRO \ FOR_MAKE_CHECK=${FOR_MAKE_CHECK} \ bash -x ${CEPH_CTR_SRC}/buildcontainer-setup.sh RUN \ + if [ $(uname -m) != ppc64le ]; then \ SCCACHE_URL="${SCCACHE_REPO}/releases/download/${SCCACHE_VERSION}/sccache-${SCCACHE_VERSION}-$(uname -m)-unknown-linux-musl.tar.gz"; \ echo "${SCCACHE_URL}"; \ - curl -sS -L $SCCACHE_URL | tar --no-anchored --strip-components=1 -C /usr/local/bin/ -xzf - sccache + curl -sS -L $SCCACHE_URL | tar --no-anchored --strip-components=1 -C /usr/local/bin/ -xzf - sccache; \ + fi diff --git a/src/script/run-make.sh b/src/script/run-make.sh index b2ef3422476..e94fe9355b2 100755 --- a/src/script/run-make.sh +++ b/src/script/run-make.sh @@ -77,6 +77,9 @@ function prepare() { if test -f ./install-deps.sh ; then ci_debug "Running install-deps.sh" INSTALL_EXTRA_PACKAGES="ccache git $which_pkg lvm2" + if [ "$(uname -m)" == "ppc64le" ]; then + INSTALL_EXTRA_PACKAGES="$INSTALL_EXTRA_PACKAGES openblas-devel gfortran cargo" + fi $DRY_RUN source ./install-deps.sh || return 1 trap clean_up_after_myself EXIT fi @@ -120,7 +123,6 @@ EOM local c_compiler="${discovered_c_compiler}" local cmake_opts cmake_opts+=" -DCMAKE_CXX_COMPILER=$cxx_compiler -DCMAKE_C_COMPILER=$c_compiler" - cmake_opts+=" -DCMAKE_CXX_FLAGS_DEBUG=-Werror" cmake_opts+=" -DENABLE_GIT_VERSION=OFF" cmake_opts+=" -DWITH_GTEST_PARALLEL=ON" cmake_opts+=" -DWITH_FIO=ON" @@ -128,6 +130,12 @@ EOM cmake_opts+=" -DWITH_GRAFANA=ON" cmake_opts+=" -DWITH_SPDK=ON" cmake_opts+=" -DWITH_RBD_MIRROR=ON" + if [ -z $WITHOUT_WERROR ]; then + cmake_opts+=" -DCMAKE_CXX_FLAGS_DEBUG=-Werror" + fi + if [ $WITHOUT_DASHBOARD ]; then + cmake_opts+=" -DWITH_MGR_DASHBOARD_FRONTEND=OFF" + fi if [ $WITH_CRIMSON ]; then cmake_opts+=" -DWITH_CRIMSON=ON" fi