diff --git a/.cirrus.yml b/.cirrus.yml index b3ac31881e..9be0694369 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -140,7 +140,7 @@ task: FILE_ENV: "./ci/test/00_setup_env_win64.sh" task: - name: 'CentOS, dash, gui' + name: 'CentOS, depends, gui' << : *GLOBAL_TASK_TEMPLATE persistent_worker: labels: diff --git a/ci/test/00_setup_env_native_centos.sh b/ci/test/00_setup_env_native_centos.sh index 878778506f..ff4b9bc570 100755 --- a/ci/test/00_setup_env_native_centos.sh +++ b/ci/test/00_setup_env_native_centos.sh @@ -7,9 +7,8 @@ export LC_ALL=C.UTF-8 export CONTAINER_NAME=ci_native_centos -export CI_IMAGE_NAME_TAG="quay.io/centos/centos:stream9" -export STREAM_GCC_V="12" -export CI_BASE_PACKAGES="gcc-toolset-${STREAM_GCC_V}-gcc-c++ glibc-devel gcc-toolset-${STREAM_GCC_V}-libstdc++-devel ccache make git python3 python3-pip which patch xz procps-ng dash rsync coreutils bison e2fsprogs cmake" +export CI_IMAGE_NAME_TAG="quay.io/centos/centos:stream10" +export CI_BASE_PACKAGES="gcc-c++ glibc-devel libstdc++-devel ccache make git python3 python3-pip which patch xz procps-ng ksh rsync coreutils bison e2fsprogs cmake" export PIP_PACKAGES="pyzmq" export GOAL="install" export BITCOIN_CONFIG="-DWITH_ZMQ=ON -DBUILD_GUI=ON -DREDUCE_EXPORTS=ON" diff --git a/ci/test/03_test_script.sh b/ci/test/03_test_script.sh index 6e77a8927c..bd5c86bfbe 100755 --- a/ci/test/03_test_script.sh +++ b/ci/test/03_test_script.sh @@ -92,9 +92,7 @@ fi if [ -z "$NO_DEPENDS" ]; then if [[ $CI_IMAGE_NAME_TAG == *centos* ]]; then - SHELL_OPTS="CONFIG_SHELL=/bin/dash" - # shellcheck disable=SC1090 - source "/opt/rh/gcc-toolset-${STREAM_GCC_V}/enable" + SHELL_OPTS="CONFIG_SHELL=/bin/ksh" # Temporarily use ksh instead of dash, until https://bugzilla.redhat.com/show_bug.cgi?id=2335416 is fixed. else SHELL_OPTS="CONFIG_SHELL=" fi