Skip to content

Commit fa69955

Browse files
author
MarcoFalke
committed
ci: Bump centos:stream8 to centos:stream9
This is required for the next commit. Also, drop CI_RETRY_EXE before "dnf install", because it requires getopt, which will only be installed later on via util-linux
1 parent fa6a755 commit fa69955

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

.cirrus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,11 +217,11 @@ task:
217217
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
218218

219219
task:
220-
name: '32-bit + dash [gui] [CentOS 8]'
220+
name: '32-bit + dash [gui] [CentOS 9]'
221221
<< : *GLOBAL_TASK_TEMPLATE
222222
container:
223223
docker_arguments:
224-
CI_IMAGE_NAME_TAG: quay.io/centos/centos:stream8
224+
CI_IMAGE_NAME_TAG: quay.io/centos/centos:stream9
225225
FILE_ENV: "./ci/test/00_setup_env_i686_centos.sh"
226226
# For faster CI feedback, immediately schedule one task that runs all tests
227227
<< : *CREDITS_TEMPLATE

ci/test/00_setup_env_i686_centos.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,10 @@ export LC_ALL=C.UTF-8
88

99
export HOST=i686-pc-linux-gnu
1010
export CONTAINER_NAME=ci_i686_centos
11-
export CI_IMAGE_NAME_TAG="quay.io/centos/centos:stream8"
12-
# Use minimum supported python3.8 and gcc-8, see doc/dependencies.md
13-
export CI_BASE_PACKAGES="gcc-c++ glibc-devel.x86_64 libstdc++-devel.x86_64 glibc-devel.i686 libstdc++-devel.i686 ccache libtool make git python38 python38-pip which patch lbzip2 xz procps-ng dash rsync coreutils bison"
11+
export CI_IMAGE_NAME_TAG="quay.io/centos/centos:stream9"
12+
export CI_BASE_PACKAGES="gcc-c++ glibc-devel.x86_64 libstdc++-devel.x86_64 glibc-devel.i686 libstdc++-devel.i686 ccache libtool make git python3 python3-pip which patch lbzip2 xz procps-ng dash rsync coreutils bison util-linux"
1413
export PIP_PACKAGES="pyzmq"
1514
export GOAL="install"
16-
export NO_WERROR=1 # GCC 8
15+
export NO_WERROR=1 # Suppress error: #warning _FORTIFY_SOURCE > 2 is treated like 2 on this platform [-Werror=cpp]
1716
export BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-reduce-exports"
1817
export CONFIG_SHELL="/bin/dash"
19-
export TEST_RUNNER_ENV="LC_ALL=en_US.UTF-8"

ci/test/01_base_install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ if [ -n "$DPKG_ADD_ARCH" ]; then
1818
fi
1919

2020
if [[ $CI_IMAGE_NAME_TAG == *centos* ]]; then
21-
${CI_RETRY_EXE} bash -c "dnf -y install epel-release"
22-
${CI_RETRY_EXE} bash -c "dnf -y --allowerasing install $CI_BASE_PACKAGES $PACKAGES"
21+
bash -c "dnf -y install epel-release"
22+
bash -c "dnf -y --allowerasing install $CI_BASE_PACKAGES $PACKAGES"
2323
elif [ "$CI_USE_APT_INSTALL" != "no" ]; then
2424
if [[ -n "${APPEND_APT_SOURCES_LIST}" ]]; then
2525
echo "${APPEND_APT_SOURCES_LIST}" >> /etc/apt/sources.list

ci/test/06_script_b.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ fi
5252

5353
if [ -z "$NO_DEPENDS" ]; then
5454
if [[ $CI_IMAGE_NAME_TAG == *centos* ]]; then
55-
SHELL_OPTS="LC_ALL=en_US.UTF-8 CONFIG_SHELL=/bin/dash"
55+
SHELL_OPTS="CONFIG_SHELL=/bin/dash"
5656
else
5757
SHELL_OPTS="CONFIG_SHELL="
5858
fi

0 commit comments

Comments
 (0)