diff --git a/Jenkinsfile b/Jenkinsfile index 5a2e2b1cb..6578375d2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -49,7 +49,7 @@ def runStages() { set -e ./tests/simulation/restapi.sh --data-dir resttest0_data --base-port \$(( 9100 + EXECUTOR_NUMBER * 100 )) \ --base-rest-port \$(( 7100 + EXECUTOR_NUMBER * 100 )) --base-metrics-port \ - \$(( 8108 + EXECUTOR_NUMBER * 100 )) --sleep-timeout 30 --kill-old-processes + \$(( 8108 + EXECUTOR_NUMBER * 100 )) --resttest-delay 30 --kill-old-processes """ } diff --git a/tests/simulation/restapi.sh b/tests/simulation/restapi.sh index 95ea30d9c..1de7b5277 100755 --- a/tests/simulation/restapi.sh +++ b/tests/simulation/restapi.sh @@ -6,7 +6,7 @@ set -e BASE_PORT="49000" BASE_METRICS_PORT="48008" BASE_REST_PORT="47000" -TIMEOUT_DURATION="30" +RESTTEST_DELAY="30" TEST_DIRNAME="resttest0_data" KILL_OLD_PROCESSES="0" @@ -28,7 +28,7 @@ if [ ${PIPESTATUS[0]} != 4 ]; then fi OPTS="h" -LONGOPTS="help,data-dir:,base-port:,base-rest-port:,base-metrics-port:,sleep-timeout:,kill-old-processes" +LONGOPTS="help,data-dir:,base-port:,base-rest-port:,base-metrics-port:,resttest-delay:,kill-old-processes" print_help() { cat </dev/null || true + pkill -f -P $$ resttest &>/dev/null || true + sleep 2 + pkill -f -9 -P $$ nimbus_beacon_node &>/dev/null || true + pkill -f -9 -P $$ resttest &>/dev/null || true +} +trap 'cleanup' SIGINT SIGTERM EXIT + if [[ ! -f "${SNAPSHOT_FILE}" ]]; then echo "Creating testnet genesis..." ${NIMBUS_BEACON_NODE_BIN} \ @@ -236,7 +248,7 @@ if [[ ${BEACON_NODE_STATUS} -eq 0 ]]; then BEACON_NODE_PID="$(jobs -p)" ${RESTTEST_BIN} \ - --delay=${TIMEOUT_DURATION} \ + --delay=${RESTTEST_DELAY} \ --timeout=60 \ --skip-topic=slow \ --connections=4 \