Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use 2 btest retries for CI

Browse source
This commit is contained in:
Jon Siwek 2020-02-03 19:55:08 -08:00
parent 391164c9bc
commit 63e68665d3
4 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.cirrus.yml
View file

@ -1,5 +1,6 @@
cpus: &CPUS 8 cpus: &CPUS 8
btest_jobs: &BTEST_JOBS 8 btest_jobs: &BTEST_JOBS 8
btest_retries: &BTEST_RETRIES 2
memory: &MEMORY 6GB memory: &MEMORY 6GB
config: &CONFIG --build-type=release --enable-cpp-tests config: &CONFIG --build-type=release --enable-cpp-tests
@ -46,6 +47,7 @@ env:
CIRRUS_WORKING_DIR: /zeek CIRRUS_WORKING_DIR: /zeek
ZEEK_CI_CPUS: *CPUS ZEEK_CI_CPUS: *CPUS
ZEEK_CI_BTEST_JOBS: *BTEST_JOBS ZEEK_CI_BTEST_JOBS: *BTEST_JOBS
ZEEK_CI_BTEST_RETRIES: *BTEST_RETRIES
ZEEK_CI_CONFIGURE_FLAGS: *CONFIG ZEEK_CI_CONFIGURE_FLAGS: *CONFIG
# This is a single-purpose, read-only GitHub deploy key (SSH private key) for # This is a single-purpose, read-only GitHub deploy key (SSH private key) for
# the zeek-testing-private repository. # the zeek-testing-private repository.

2
aux/btest

@ -1 +1 @@
Subproject commit f7bd3a78092a0807d69e9cc54ac41fbe1908cc21 Subproject commit e2bd542a5e0cab91876bd29b344f441e512caa59

3
ci/test.sh
View file

@ -13,6 +13,7 @@ if [[ -z "${CIRRUS_CI}" ]]; then
[[ $(which nproc) ]] && ZEEK_CI_CPUS=$(nproc) [[ $(which nproc) ]] && ZEEK_CI_CPUS=$(nproc)
[[ -n "${1}" ]] && ZEEK_CI_CPUS=${1} [[ -n "${1}" ]] && ZEEK_CI_CPUS=${1}
ZEEK_CI_BTEST_JOBS=${ZEEK_CI_CPUS} ZEEK_CI_BTEST_JOBS=${ZEEK_CI_CPUS}
ZEEK_CI_BTEST_RETRIES=2
fi fi
function pushd function pushd
@ -56,7 +57,7 @@ function run_btests
banner "Running baseline tests: zeek" banner "Running baseline tests: zeek"
pushd testing/btest pushd testing/btest
${BTEST} -d -b -x btest-results.xml -j ${ZEEK_CI_BTEST_JOBS} || result=1 ${BTEST} -z ${ZEEK_CI_BTEST_RETRIES} -d -b -x btest-results.xml -j ${ZEEK_CI_BTEST_JOBS} || result=1
make coverage make coverage
prep_artifacts prep_artifacts
popd popd

3
ci/travis-job
View file

@ -10,6 +10,7 @@
LEAK_TEST_DISTRO="ubuntu_18.04_leaktest" LEAK_TEST_DISTRO="ubuntu_18.04_leaktest"
COVERITY_DISTRO="ubuntu_18.04" COVERITY_DISTRO="ubuntu_18.04"
BTEST_RETRIES=2
usage() { usage() {
echo "usage: $0 CMD DISTRO" echo "usage: $0 CMD DISTRO"
@ -229,7 +230,7 @@ run() {
set +e set +e
# Must specify a value for "-j" option, otherwise Travis uses a huge value. # Must specify a value for "-j" option, otherwise Travis uses a huge value.
../../aux/btest/btest -j 4 -d ../../aux/btest/btest -z ${BTEST_RETRIES} -j 4 -d
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
ret=1 ret=1