From 48dc6f0adda72d7f4742afe1b8380370debfe4f4 Mon Sep 17 00:00:00 2001 From: zhongtao Date: Wed, 15 Nov 2023 03:10:15 +0000 Subject: [PATCH 17/64] !2251 open ENABLE_GRPC_REMOTE_CONNECT in CI * open ENABLE_GRPC_REMOTE_CONNECT in CI --- CI/make-and-install.sh | 4 ++-- CI/only_build_isulad.sh | 2 +- CI/pr-gateway.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CI/make-and-install.sh b/CI/make-and-install.sh index cdd0e432..c1d26ff1 100755 --- a/CI/make-and-install.sh +++ b/CI/make-and-install.sh @@ -103,9 +103,9 @@ rm -rf build mkdir build cd build if [[ ${enable_gcov} -ne 0 ]]; then - cmake -DLIB_INSTALL_DIR=${builddir}/lib -DCMAKE_INSTALL_PREFIX=${builddir} -DCMAKE_INSTALL_SYSCONFDIR=${builddir}/etc -DCMAKE_BUILD_TYPE=Debug -DGCOV=ON -DENABLE_EMBEDDED=ON -DENABLE_COVERAGE=ON -DENABLE_CRI_API_V1=ON -DENABLE_UT=ON -DENABLE_METRICS=ON -DENABLE_REMOTE_LAYER_STORE=ON .. + cmake -DLIB_INSTALL_DIR=${builddir}/lib -DCMAKE_INSTALL_PREFIX=${builddir} -DCMAKE_INSTALL_SYSCONFDIR=${builddir}/etc -DCMAKE_BUILD_TYPE=Debug -DGCOV=ON -DENABLE_EMBEDDED=ON -DENABLE_COVERAGE=ON -DENABLE_CRI_API_V1=ON -DENABLE_UT=ON -DENABLE_METRICS=ON -DENABLE_REMOTE_LAYER_STORE=ON -DENABLE_GRPC_REMOTE_CONNECT=ON .. else - cmake -DLIB_INSTALL_DIR=${builddir}/lib -DCMAKE_INSTALL_PREFIX=${builddir} -DCMAKE_INSTALL_SYSCONFDIR=${builddir}/etc -DENABLE_EMBEDDED=ON -DENABLE_METRICS=ON -DENABLE_REMOTE_LAYER_STORE=ON -DENABLE_CRI_API_V1=ON .. + cmake -DLIB_INSTALL_DIR=${builddir}/lib -DCMAKE_INSTALL_PREFIX=${builddir} -DCMAKE_INSTALL_SYSCONFDIR=${builddir}/etc -DENABLE_EMBEDDED=ON -DENABLE_METRICS=ON -DENABLE_REMOTE_LAYER_STORE=ON -DENABLE_CRI_API_V1=ON -DENABLE_GRPC_REMOTE_CONNECT=ON .. fi make -j $(nproc) make install diff --git a/CI/only_build_isulad.sh b/CI/only_build_isulad.sh index d2d3417d..c3dc39d6 100755 --- a/CI/only_build_isulad.sh +++ b/CI/only_build_isulad.sh @@ -67,7 +67,7 @@ popd git clone https://gitee.com/openeuler/iSulad.git pushd iSulad mkdir build && pushd build -cmake -DENABLE_UT=ON ../ +cmake -DENABLE_UT=ON -DENABLE_GRPC_REMOTE_CONNECT=ON ../ make -j2 && make install ctest -V popd diff --git a/CI/pr-gateway.sh b/CI/pr-gateway.sh index 291fc4ae..08bcfc4f 100755 --- a/CI/pr-gateway.sh +++ b/CI/pr-gateway.sh @@ -99,7 +99,7 @@ pushd iSulad rm -rf build mkdir build pushd build -cmake -DDEBUG=ON -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_UT=ON -DENABLE_CRI_API_V1=ON -DENABLE_REMOTE_LAYER_STORE=ON -DENABLE_SHIM_V2=OFF ../ || exit 1 +cmake -DDEBUG=ON -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_UT=ON -DENABLE_CRI_API_V1=ON -DENABLE_REMOTE_LAYER_STORE=ON -DENABLE_SHIM_V2=OFF -DENABLE_GRPC_REMOTE_CONNECT=ON ../ || exit 1 make -j $(nproc) || exit 1 ctest -V popd -- 2.42.0