Skip to content

Commit df5af11

Browse files
committed
Merge bitcoin/bitcoin#28353: ci: Remove /ro_base bind mount, Remove LC_ALL=C from s390x task
fa70cbd ci: Remove unused TEST_RUNNER_ENV="LC_ALL=C" from s390x task (MarcoFalke) fa33354 ci: Remove /ro_base bind mount (MarcoFalke) fa0df9d doc: Remove sudo from command that is already run as root (MarcoFalke) Pull request description: Remove some CI stuff no longer needed. ACKs for top commit: fanquake: ACK fa70cbd - did not test the s390x job. Tree-SHA512: 3a6ed0cfc855a92c2f834e59494c0a19a5647510247aece5e40a1aa78074894fe7454e684a1ea1f8f0662c50ac1caf2e390398b0fcfbf81544e6488fa9b8915e
2 parents 505ea30 + fa70cbd commit df5af11

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

.cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ env: # Global defaults
3131
# swap:
3232
#
3333
# ```
34-
# fallocate -l 16G /swapfile_ci && chmod 600 /swapfile_ci && mkswap /swapfile_ci && swapon /swapfile_ci && ( echo '/swapfile_ci none swap sw 0 0' | sudo tee -a /etc/fstab )
34+
# fallocate -l 16G /swapfile_ci && chmod 600 /swapfile_ci && mkswap /swapfile_ci && swapon /swapfile_ci && ( echo '/swapfile_ci none swap sw 0 0' | tee -a /etc/fstab )
3535
# ```
3636
#
3737
# - To register the persistent worker, open a `screen` session and run:

ci/test/00_setup_env_s390x.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
#
3-
# Copyright (c) 2019-2022 The Bitcoin Core developers
3+
# Copyright (c) 2019-present The Bitcoin Core developers
44
# Distributed under the MIT software license, see the accompanying
55
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
66

@@ -10,7 +10,6 @@ export HOST=s390x-linux-gnu
1010
export PACKAGES="python3-zmq"
1111
export CONTAINER_NAME=ci_s390x
1212
export CI_IMAGE_NAME_TAG="docker.io/s390x/debian:bookworm"
13-
export TEST_RUNNER_ENV="LC_ALL=C"
1413
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
1514
export RUN_FUNCTIONAL_TESTS=true
1615
export GOAL="install"

ci/test/04_install.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
#
3-
# Copyright (c) 2018-2022 The Bitcoin Core developers
3+
# Copyright (c) 2018-present The Bitcoin Core developers
44
# Distributed under the MIT software license, see the accompanying
55
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
66

@@ -32,13 +32,13 @@ if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
3232

3333
# shellcheck disable=SC2086
3434
CI_CONTAINER_ID=$(docker run $CI_CONTAINER_CAP --rm --interactive --detach --tty \
35-
--mount type=bind,src=$BASE_READ_ONLY_DIR,dst=/ro_base,readonly \
35+
--mount "type=bind,src=$BASE_READ_ONLY_DIR,dst=$BASE_READ_ONLY_DIR,readonly" \
3636
--mount "type=volume,src=${CONTAINER_NAME}_ccache,dst=$CCACHE_DIR" \
3737
--mount "type=volume,src=${CONTAINER_NAME}_depends,dst=$DEPENDS_DIR" \
3838
--mount "type=volume,src=${CONTAINER_NAME}_previous_releases,dst=$PREVIOUS_RELEASES_DIR" \
3939
--env-file /tmp/env \
40-
--name $CONTAINER_NAME \
41-
$CONTAINER_NAME)
40+
--name "$CONTAINER_NAME" \
41+
"$CONTAINER_NAME")
4242
export CI_CONTAINER_ID
4343
export CI_EXEC_CMD_PREFIX="docker exec ${CI_CONTAINER_ID}"
4444
else
@@ -56,7 +56,7 @@ export -f CI_EXEC
5656
# Normalize all folders to BASE_ROOT_DIR
5757
CI_EXEC rsync --archive --stats --human-readable "${BASE_READ_ONLY_DIR}/" "${BASE_ROOT_DIR}" || echo "Nothing to copy from ${BASE_READ_ONLY_DIR}/"
5858
CI_EXEC "${BASE_ROOT_DIR}/ci/test/01_base_install.sh"
59-
CI_EXEC rsync --archive --stats --human-readable /ro_base/ "${BASE_ROOT_DIR}" || echo "Nothing to copy from ro_base"
59+
6060
# Fixes permission issues when there is a container UID/GID mismatch with the owner
6161
# of the git source code directory.
6262
CI_EXEC git config --global --add safe.directory \"*\"

0 commit comments

Comments
 (0)