This repository has been archived by the owner on Aug 2, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 3.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #9658 from EOSIO/zach-1.8-test
CI: Fix Serial Test Bug + Simplification + UX
- Loading branch information
Showing
12 changed files
with
114 additions
and
89 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,49 +1,45 @@ | ||
| #!/bin/bash | ||
| set -eo pipefail | ||
| echo '--- :evergreen_tree: Configuring Environment' | ||
| . ./.cicd/helpers/general.sh | ||
| mkdir -p "$BUILD_DIR" | ||
| if [[ $(uname) == 'Darwin' && $FORCE_LINUX != true ]]; then | ||
| echo '+++ :package: Packaging EOSIO' | ||
| PACKAGE_COMMANDS="bash -c 'cd build/packages && chmod 755 ./*.sh && ./generate_package.sh brew'" | ||
| echo "$ $PACKAGE_COMMANDS" | ||
| eval $PACKAGE_COMMANDS | ||
| ARTIFACT='*.rb;*.tar.gz' | ||
| cd build/packages | ||
| [[ -d x86_64 ]] && cd 'x86_64' # backwards-compatibility with release/1.6.x | ||
| buildkite-agent artifact upload "./$ARTIFACT" --agent-access-token $BUILDKITE_AGENT_ACCESS_TOKEN | ||
| for A in $(echo $ARTIFACT | tr ';' ' '); do | ||
| if [[ $(ls $A | grep -c '') == 0 ]]; then | ||
| echo "+++ :no_entry: ERROR: Expected artifact \"$A\" not found!" | ||
| pwd | ||
| ls -la | ||
| exit 1 | ||
| fi | ||
| done | ||
| else # Linux | ||
| ARGS="${ARGS:-"--rm --init -v $(pwd):$MOUNTED_DIR"}" | ||
| echo '--- :docker: Selecting Container' | ||
| ARGS="${ARGS:-"--rm --init -v \"\$(pwd):$MOUNTED_DIR\""}" | ||
| . "$HELPERS_DIR/file-hash.sh" "$CICD_DIR/platforms/$PLATFORM_TYPE/$IMAGE_TAG.dockerfile" | ||
| PRE_COMMANDS="cd '$MOUNTED_DIR/build/packages' && chmod 755 ./*.sh" | ||
| PRE_COMMANDS="cd \"$MOUNTED_DIR/build/packages\" && chmod 755 ./*.sh" | ||
| if [[ "$IMAGE_TAG" =~ "ubuntu" ]]; then | ||
| ARTIFACT='*.deb' | ||
| PACKAGE_TYPE='deb' | ||
| PACKAGE_COMMANDS="./generate_package.sh '$PACKAGE_TYPE'" | ||
| PACKAGE_COMMANDS="./generate_package.sh \"$PACKAGE_TYPE\"" | ||
| elif [[ "$IMAGE_TAG" =~ "centos" ]]; then | ||
| ARTIFACT='*.rpm' | ||
| PACKAGE_TYPE='rpm' | ||
| PACKAGE_COMMANDS="mkdir -p ~/rpmbuild/BUILD && mkdir -p ~/rpmbuild/BUILDROOT && mkdir -p ~/rpmbuild/RPMS && mkdir -p ~/rpmbuild/SOURCES && mkdir -p ~/rpmbuild/SPECS && mkdir -p ~/rpmbuild/SRPMS && yum install -y rpm-build && ./generate_package.sh '$PACKAGE_TYPE'" | ||
| PACKAGE_COMMANDS="mkdir -p ~/rpmbuild/BUILD && mkdir -p ~/rpmbuild/BUILDROOT && mkdir -p ~/rpmbuild/RPMS && mkdir -p ~/rpmbuild/SOURCES && mkdir -p ~/rpmbuild/SPECS && mkdir -p ~/rpmbuild/SRPMS && yum install -y rpm-build && ./generate_package.sh \"$PACKAGE_TYPE\"" | ||
| fi | ||
| COMMANDS="$PRE_COMMANDS && $PACKAGE_COMMANDS" | ||
| COMMANDS="echo \"+++ :package: Packaging EOSIO\" && $PRE_COMMANDS && $PACKAGE_COMMANDS" | ||
| DOCKER_RUN_COMMAND="docker run $ARGS $(buildkite-intrinsics) '$FULL_TAG' bash -c '$COMMANDS'" | ||
| echo "$ $DOCKER_RUN_COMMAND" | ||
| eval $DOCKER_RUN_COMMAND | ||
| cd build/packages | ||
| [[ -d x86_64 ]] && cd 'x86_64' # backwards-compatibility with release/1.6.x | ||
| fi | ||
| cd build/packages | ||
| [[ -d x86_64 ]] && cd 'x86_64' # backwards-compatibility with release/1.6.x | ||
| if [[ "$BUILDKITE" == 'true' ]]; then | ||
| echo '--- :arrow_up: Uploading Artifacts' | ||
| buildkite-agent artifact upload "./$ARTIFACT" --agent-access-token $BUILDKITE_AGENT_ACCESS_TOKEN | ||
| for A in $(echo $ARTIFACT | tr ';' ' '); do | ||
| if [[ $(ls "$A" | grep -c '') == 0 ]]; then | ||
| echo "+++ :no_entry: ERROR: Expected artifact \"$A\" not found!" | ||
| pwd | ||
| ls -la | ||
| exit 1 | ||
| fi | ||
| done | ||
| fi | ||
| for A in $(echo $ARTIFACT | tr ';' ' '); do | ||
| if [[ $(ls "$A" | grep -c '') == 0 ]]; then | ||
| echo "+++ :no_entry: ERROR: Expected artifact \"$A\" not found!" | ||
| pwd | ||
| ls -la | ||
| exit 1 | ||
| fi | ||
| done | ||
| echo '--- :white_check_mark: Done!' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,30 @@ | ||
| #!/bin/bash | ||
| set -eo pipefail | ||
| # variables | ||
| echo "+++ $([[ "$BUILDKITE" == 'true' ]] && echo ':evergreen_tree: ')Configuring Environment" | ||
| [[ -z "$JOBS" ]] && export JOBS=$(getconf _NPROCESSORS_ONLN) | ||
| echo "--- $([[ "$BUILDKITE" == 'true' ]] && echo ':evergreen_tree: ')Configuring Environment" | ||
| [[ -z "$JOBS" ]] && export JOBS="$(getconf _NPROCESSORS_ONLN)" | ||
| GIT_ROOT="$(dirname $BASH_SOURCE[0])/.." | ||
| if [[ "$(uname)" == 'Linux' ]]; then | ||
| . /etc/os-release | ||
| if [[ "$ID" == 'centos' ]]; then | ||
| [[ -f /opt/rh/rh-python36/enable ]] && source /opt/rh/rh-python36/enable | ||
| fi | ||
| fi | ||
| cd $GIT_ROOT/build | ||
| cd "$GIT_ROOT/build" | ||
| # count tests | ||
| echo "+++ $([[ "$BUILDKITE" == 'true' ]] && echo ':microscope: ')Running Parallelizable Tests" | ||
| TEST_COUNT=$(ctest -N -LE _tests | grep -i 'Total Tests: ' | cut -d ':' -f 2 | awk '{print $1}') | ||
| if [[ $TEST_COUNT > 0 ]]; then | ||
| TEST_COUNT=$(ctest -N -LE '_tests' | grep -i 'Total Tests: ' | cut -d ':' -f '2' | awk '{print $1}') | ||
| if [[ "$TEST_COUNT" > '0' ]]; then | ||
| echo "$TEST_COUNT tests found." | ||
| else | ||
| echo "+++ $([[ "$BUILDKITE" == 'true' ]] && echo ':no_entry: ')ERROR: No tests registered with ctest! Exiting..." | ||
| exit 1 | ||
| fi | ||
| # run tests | ||
| set +e # defer ctest error handling to end | ||
| echo "$ ctest -j $JOBS -LE _tests --output-on-failure -T Test" | ||
| ctest -j $JOBS -LE _tests --output-on-failure -T Test | ||
| CTEST_COMMAND="ctest -j '$JOBS' -LE '_tests' --output-on-failure -T 'Test'" | ||
| echo "$ $CTEST_COMMAND" | ||
| eval $CTEST_COMMAND | ||
| EXIT_STATUS=$? | ||
| echo 'Done running parallelizable tests.' | ||
| exit $EXIT_STATUS | ||
| exit $EXIT_STATUS |
Oops, something went wrong.