File tree Expand file tree Collapse file tree 5 files changed +17
-13
lines changed Expand file tree Collapse file tree 5 files changed +17
-13
lines changed Original file line number Diff line number Diff line change @@ -82,14 +82,14 @@ jobs:
8282 - set -o errexit; source ./ci/lint/06_script.sh
8383
8484 - stage : test
85- name : ' ARM [GOAL: install] [bionic ] [unit tests, functional tests]'
85+ name : ' ARM [GOAL: install] [buster ] [unit tests, functional tests]'
8686 arch : arm64
8787 env : >-
8888 FILE_ENV="./ci/test/00_setup_env_arm.sh"
8989 QEMU_USER_CMD="" # Can run the tests natively without qemu
9090
9191stage : test
92- name : ' S390x [GOAL: install] [bionic ] [unit tests, functional tests]'
92+ name : ' S390x [GOAL: install] [buster ] [unit tests, functional tests]'
9393 arch : s390x
9494 env : >-
9595 FILE_ENV="./ci/test/00_setup_env_s390x.sh"
Original file line number Diff line number Diff line change @@ -51,7 +51,7 @@ export DEPENDS_DIR=${DEPENDS_DIR:-$BASE_ROOT_DIR/depends}
5151export BASE_OUTDIR=${BASE_OUTDIR:- $BASE_SCRATCH_DIR / out/ $HOST }
5252export SDK_URL=${SDK_URL:- https:// bitcoincore.org/ depends-sources/ sdks}
5353export WINEDEBUG=${WINEDEBUG:- fixme-all}
54- export DOCKER_PACKAGES=${DOCKER_PACKAGES:- build-essential libtool autotools-dev automake pkg-config bsdmainutils curl ca-certificates ccache python3 rsync git}
54+ export DOCKER_PACKAGES=${DOCKER_PACKAGES:- build-essential libtool autotools-dev automake pkg-config bsdmainutils curl ca-certificates ccache python3 rsync git procps }
5555export GOAL=${GOAL:- install}
5656export DIR_QA_ASSETS=${DIR_QA_ASSETS:- ${BASE_SCRATCH_DIR} / qa-assets}
5757export PATH=${BASE_ROOT_DIR} /ci/retry:$PATH
Original file line number Diff line number Diff line change @@ -16,6 +16,8 @@ if [ -n "$QEMU_USER_CMD" ]; then
1616 # Likely cross-compiling, so install the needed gcc and qemu-user
1717 export PACKAGES=" $PACKAGES qemu-user"
1818fi
19+ # Use debian to avoid 404 apt errors when cross compiling
20+ export DOCKER_NAME_TAG=" debian:buster"
1921export USE_BUSY_BOX=true
2022export RUN_UNIT_TESTS=true
2123export RUN_FUNCTIONAL_TESTS=true
Original file line number Diff line number Diff line change @@ -16,6 +16,8 @@ if [ -n "$QEMU_USER_CMD" ]; then
1616 export DPKG_ADD_ARCH=" s390x"
1717 export PACKAGES=" $PACKAGES g++-s390x-linux-gnu qemu-user libc6:s390x libstdc++6:s390x libfontconfig1:s390x libxcb1:s390x"
1818fi
19+ # Use debian to avoid 404 apt errors
20+ export DOCKER_NAME_TAG=" debian:buster"
1921export RUN_UNIT_TESTS=true
2022export RUN_FUNCTIONAL_TESTS=true
2123export GOAL=" install"
Original file line number Diff line number Diff line change 7272 }
7373fi
7474
75- if [ " $TRAVIS_OS_NAME " == " osx" ; then
76- top -l 1 -s 0 | awk ' /PhysMem/ {print}'
77- echo " Number of CPUs: $( sysctl -n hw.logicalcpu) "
78- else
79- DOCKER_EXEC free -m -h
80- DOCKER_EXEC echo " Number of CPUs \(nproc\):" \$\( nproc\)
81- DOCKER_EXEC echo " Free disk space:"
82- DOCKER_EXEC df -h
83- fi
84-
8575if [ -n " $DPKG_ADD_ARCH " ; then
8676 DOCKER_EXEC dpkg --add-architecture " $DPKG_ADD_ARCH "
8777fi
@@ -94,6 +84,16 @@ elif [ "$TRAVIS_OS_NAME" != "osx" ]; then
9484 ${CI_RETRY_EXE} DOCKER_EXEC apt-get install --no-install-recommends --no-upgrade -y $PACKAGES $DOCKER_PACKAGES
9585fi
9686
87+ if [ " $TRAVIS_OS_NAME " == " osx" ; then
88+ top -l 1 -s 0 | awk ' /PhysMem/ {print}'
89+ echo " Number of CPUs: $( sysctl -n hw.logicalcpu) "
90+ else
91+ DOCKER_EXEC free -m -h
92+ DOCKER_EXEC echo " Number of CPUs \(nproc\):" \$\( nproc\)
93+ DOCKER_EXEC echo " Free disk space:"
94+ DOCKER_EXEC df -h
95+ fi
96+
9797if [ ! -d ${DIR_QA_ASSETS} ]; then
9898 DOCKER_EXEC git clone https://github.com/bitcoin-core/qa-assets ${DIR_QA_ASSETS}
9999fi
You can’t perform that action at this time.
0 commit comments