Skip to content

Commit 3abee5e

Browse files
committed
Merge bitcoin/bitcoin#29856: ci: Bump s390x to ubuntu:24.04
fadf7e9 ci: Bump s390x to ubuntu:24.04 (MarcoFalke) Pull request description: Now that most other CI tasks are rolled to 24.04, roll this one as well. Also, re-enable feature_init. ACKs for top commit: fanquake: ACK fadf7e9 - finished running after ~5 hours. Tree-SHA512: d69f40227ba982eaaccc1e144ba05d3c8c4a096ac401077df3db5cf3276d1e146a438e4e0237dda876b3644fc7f0accd724a19e3c1cdb94c30c679899137280e
2 parents d29fc3a + fadf7e9 commit 3abee5e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ci/test/00_setup_env_s390x.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ export LC_ALL=C.UTF-8
99
export HOST=s390x-linux-gnu
1010
export PACKAGES="python3-zmq"
1111
export CONTAINER_NAME=ci_s390x
12-
export CI_IMAGE_NAME_TAG="docker.io/s390x/debian:bookworm"
13-
export TEST_RUNNER_EXTRA="--exclude feature_init,rpc_bind,feature_bind_extra" # Excluded for now, see https://github.com/bitcoin/bitcoin/issues/17765#issuecomment-602068547
12+
export CI_IMAGE_NAME_TAG="docker.io/s390x/ubuntu:24.04"
13+
export TEST_RUNNER_EXTRA="--exclude rpc_bind,feature_bind_extra" # Excluded for now, see https://github.com/bitcoin/bitcoin/issues/17765#issuecomment-602068547
1414
export RUN_FUNCTIONAL_TESTS=true
1515
export GOAL="install"
1616
export BITCOIN_CONFIG="--enable-reduce-exports"

0 commit comments

Comments
 (0)