Skip to content

Commit

Permalink
Merge #27739: ci: Add missing set -e to 01_base_install.sh
Browse files Browse the repository at this point in the history
fa12558 ci: Avoid leaking HOME var into CI pod (MarcoFalke)
aaaa432 ci: Remove "default" test env (MarcoFalke)
fa7a87b ci: Add missing set -e to 01_base_install.sh (MarcoFalke)

Pull request description:

  Otherwise errors are silently ignored

ACKs for top commit:
  TheCharlatan:
    ACK [fa12558](fa12558)
  hebasto:
    ACK fa12558

Tree-SHA512: dbf3f16302c83973b78f3a5e7793090bc9ac44fdf20d51a26b30a99a97369971661e9aed1cd810d80d49d60009651ca0a8aeb2bdc24198a143bf4fff0ec89901
  • Loading branch information
fanquake committed May 29, 2023
2 parents 7d33ae7 + fa12558 commit b5ed656
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 9 deletions.
6 changes: 0 additions & 6 deletions ci/README.md
Expand Up @@ -20,12 +20,6 @@ requires `bash`, `docker`, and `python3` to be installed. To install all require
sudo apt install bash docker.io python3
```

To run the default test stage,

```
./ci/test_run_all.sh
```

To run the test stage with a specific configuration,

```
Expand Down
4 changes: 2 additions & 2 deletions ci/test/00_setup_env.sh
Expand Up @@ -6,6 +6,8 @@

export LC_ALL=C.UTF-8

set -ex

# The root dir.
# The ci system copies this folder.
BASE_ROOT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../../ >/dev/null 2>&1 && pwd )
Expand Down Expand Up @@ -44,8 +46,6 @@ export TEST_RUNNER_TIMEOUT_FACTOR=${TEST_RUNNER_TIMEOUT_FACTOR:-40}
export TEST_RUNNER_ENV=${TEST_RUNNER_ENV:-}
export RUN_FUZZ_TESTS=${RUN_FUZZ_TESTS:-false}

export CONTAINER_NAME=${CONTAINER_NAME:-ci_unnamed}
export CI_IMAGE_NAME_TAG=${CI_IMAGE_NAME_TAG:-ubuntu:20.04}
# Randomize test order.
# See https://www.boost.org/doc/libs/1_71_0/libs/test/doc/html/boost_test/utf_reference/rt_param_reference/random.html
export BOOST_TEST_RANDOM=${BOOST_TEST_RANDOM:-1}
Expand Down
2 changes: 2 additions & 0 deletions ci/test/01_base_install.sh
Expand Up @@ -6,6 +6,8 @@

export LC_ALL=C.UTF-8

set -ex

CFG_DONE="ci.base-install-done" # Use a global git setting to remember whether this script ran to avoid running it twice

if [ "$(git config --global ${CFG_DONE})" == "true" ]; then
Expand Down
2 changes: 1 addition & 1 deletion ci/test/04_install.sh
Expand Up @@ -28,7 +28,7 @@ export BINS_SCRATCH_DIR="${BASE_SCRATCH_DIR}/bins/"
if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
# Export all env vars to avoid missing some.
# Though, exclude those with newlines to avoid parsing problems.
python3 -c 'import os; [print(f"{key}={value}") for key, value in os.environ.items() if "\n" not in value]' | tee /tmp/env
python3 -c 'import os; [print(f"{key}={value}") for key, value in os.environ.items() if "\n" not in value and "HOME" not in key]' | tee /tmp/env
echo "Creating $CI_IMAGE_NAME_TAG container to run in"
DOCKER_BUILDKIT=1 ${CI_RETRY_EXE} docker build \
--file "${BASE_ROOT_DIR}/ci/test_imagefile" \
Expand Down

0 comments on commit b5ed656

Please sign in to comment.