diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2022-01-31 11:19:23 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-02-14 16:54:36 +0000 |
| commit | b5d12edb0842919ad5213e65db48d8cf8f0e676e (patch) | |
| tree | de9f783ea5272bfa9b77792807076d00fbf22b22 | |
| parent | 685ac6ad2e48093d69cccd1d242ed36a326cf90b (diff) | |
ci: Bump CentOS 8 image
Github-Pull: #24212
Rebased-From: fa5457e64adfc6060382bd36c45e95be6ea693ef
| -rw-r--r-- | .cirrus.yml | 2 | ||||
| -rwxr-xr-x | ci/test/00_setup_env_i686_centos.sh | 6 | ||||
| -rwxr-xr-x | ci/test/04_install.sh | 2 | ||||
| -rwxr-xr-x | ci/test/05_before_script.sh | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 16fd0cefc3..04365430b9 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -105,7 +105,7 @@ task: name: '32-bit + dash [gui] [CentOS 8]' << : *GLOBAL_TASK_TEMPLATE container: - image: centos:8 + image: quay.io/centos/centos:stream8 env: << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV PACKAGE_MANAGER_INSTALL: "yum install -y" diff --git a/ci/test/00_setup_env_i686_centos.sh b/ci/test/00_setup_env_i686_centos.sh index 2ddb932907..4d0c7f123b 100755 --- a/ci/test/00_setup_env_i686_centos.sh +++ b/ci/test/00_setup_env_i686_centos.sh @@ -7,9 +7,9 @@ export LC_ALL=C.UTF-8 export HOST=i686-pc-linux-gnu -export CONTAINER_NAME=ci_i686_centos_8 -export DOCKER_NAME_TAG=centos:8 -export DOCKER_PACKAGES="gcc-c++ glibc-devel.x86_64 libstdc++-devel.x86_64 glibc-devel.i686 libstdc++-devel.i686 ccache libtool make git python3 python3-zmq which patch lbzip2 dash rsync coreutils bison" +export CONTAINER_NAME=ci_i686_centos +export DOCKER_NAME_TAG=quay.io/centos/centos:stream8 +export DOCKER_PACKAGES="gcc-c++ glibc-devel.x86_64 libstdc++-devel.x86_64 glibc-devel.i686 libstdc++-devel.i686 ccache libtool make git python3 python3-zmq which patch lbzip2 xz procps-ng dash rsync coreutils bison" export GOAL="install" export BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-reduce-exports" export CONFIG_SHELL="/bin/dash" diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh index 2079d2ed2b..b6c1ec38fe 100755 --- a/ci/test/04_install.sh +++ b/ci/test/04_install.sh @@ -62,7 +62,7 @@ if [ -n "$DPKG_ADD_ARCH" ]; then DOCKER_EXEC dpkg --add-architecture "$DPKG_ADD_ARCH" fi -if [[ $DOCKER_NAME_TAG == centos* ]]; then +if [[ $DOCKER_NAME_TAG == *centos* ]]; then ${CI_RETRY_EXE} DOCKER_EXEC dnf -y install epel-release ${CI_RETRY_EXE} DOCKER_EXEC dnf -y --allowerasing install $DOCKER_PACKAGES $PACKAGES elif [ "$CI_USE_APT_INSTALL" != "no" ]; then diff --git a/ci/test/05_before_script.sh b/ci/test/05_before_script.sh index 8dd489d7f8..b5301dbf03 100755 --- a/ci/test/05_before_script.sh +++ b/ci/test/05_before_script.sh @@ -45,7 +45,7 @@ if [[ $HOST = *-mingw32 ]]; then DOCKER_EXEC update-alternatives --set $HOST-g++ \$\(which $HOST-g++-posix\) fi if [ -z "$NO_DEPENDS" ]; then - if [[ $DOCKER_NAME_TAG == centos* ]]; then + if [[ $DOCKER_NAME_TAG == *centos* ]]; then # CentOS has problems building the depends if the config shell is not explicitly set # (i.e. for libevent a Makefile with an empty SHELL variable is generated, leading to # an error as the first command is executed) |