Merge pull request #4690 from rgerhards/es7-test

testbench: restore original order of ES test execution
This commit is contained in:
Rainer Gerhards 2022-02-04 17:54:33 +01:00 committed by GitHub
commit 94b467b3ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 12 deletions

View File

@ -59,16 +59,14 @@ jobs:
echo PWD: $(pwd)
ls -la
ls -ld rsyslog-*
sudo chmod -R go+rw .
sudo chmod -vR go+rw .
ls -la
ls -ld rsyslog-*
echo FIND ..:
echo FIND TRS:
find .. -name .dep_wrk
echo FIND:
find . -name .dep_wrk
echo ls of curr dir:
echo END CI DEBUGGING
rm -rf $(find . -name .dep_wrk)
sudo chmod -R a+r .
sudo chmod -vR a+r .
devtools/gather-check-logs.sh
cat failed-tests.log

View File

@ -62,16 +62,13 @@ TESTS += \
es-duplicated-ruleset.sh
# the following test need to be serialized:
TESTS += \
es-basic.sh \
es-basic-es6.0.sh \
es-basic-es7.14.sh \
es-basic.sh \
es-basic-bulk.sh
#es-basic-es6.0.log: es-basic.log
#es-basic-es7.14.log: es-basic-es6.0.log
es-basic-es7.14.log: es-basic.log
es-basic-es6.0.log: es-basic-es7.14.log
es-basic-bulk.log: es-basic-es6.0.log
#es-basic-bulk.log: es-basic-es7.14.log
es-basic-es7.14.log: es-basic-es6.0.log
es-basic.log: es-basic-es7.14.log
es-basic-bulk.log: es-basic.log
es-basic-server.log: es-basic-bulk.log
# special "test" for stopping ES once all ES tests are done