status-im/nimbus-eth2
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth2.git synced 2025-02-18 09:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Disable discovery5 service for REST test. (#2738)

Browse Source 
Run REST test before Finalization test.
This commit is contained in:
Eugene Kabanov 2021-07-26 22:55:24 +03:00 committed by GitHub
parent 941cc125a3
commit 4ba69bf54d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Jenkinsfile vendored
View File

@ -44,6 +44,10 @@ def runStages() {
sh "make -j${env.NPROC} DISABLE_TEST_FIXTURES_SCRIPT=1 test" sh "make -j${env.NPROC} DISABLE_TEST_FIXTURES_SCRIPT=1 test"
} }
stage("REST test suite") {
sh "./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"
}
stage("Testnet finalization") { stage("Testnet finalization") {
// EXECUTOR_NUMBER will be 0 or 1, since we have 2 executors per Jenkins node // EXECUTOR_NUMBER will be 0 or 1, since we have 2 executors per Jenkins node
sh """#!/bin/bash sh """#!/bin/bash
@ -52,10 +56,6 @@ def runStages() {
./scripts/launch_local_testnet.sh --nodes 4 --stop-at-epoch 5 --log-level DEBUG --disable-htop --data-dir local_testnet1_data --base-port \$(( 9000 + EXECUTOR_NUMBER * 100 )) --base-rpc-port \$(( 7000 + EXECUTOR_NUMBER * 100 )) --base-metrics-port \$(( 8008 + EXECUTOR_NUMBER * 100 )) --timeout 2400 -- --verify-finalization --discv5:no ./scripts/launch_local_testnet.sh --nodes 4 --stop-at-epoch 5 --log-level DEBUG --disable-htop --data-dir local_testnet1_data --base-port \$(( 9000 + EXECUTOR_NUMBER * 100 )) --base-rpc-port \$(( 7000 + EXECUTOR_NUMBER * 100 )) --base-metrics-port \$(( 8008 + EXECUTOR_NUMBER * 100 )) --timeout 2400 -- --verify-finalization --discv5:no
""" """
} }
stage("REST test suite") {
sh "./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"
}
} catch(e) { } catch(e) {
// we need to rethrow the exception here // we need to rethrow the exception here
throw e throw e

1
tests/simulation/restapi.sh
View File

@ -195,6 +195,7 @@ ${NIMBUS_BEACON_NODE_BIN} \
--rest \ --rest \
--rest-address=${REST_ADDRESS} \ --rest-address=${REST_ADDRESS} \
--rest-port=${BASE_REST_PORT} \ --rest-port=${BASE_REST_PORT} \
--discv5=no \
${ADDITIONAL_BEACON_NODE_ARGS} \ ${ADDITIONAL_BEACON_NODE_ARGS} \
"$@" > ${LOG_NODE_FILE} 2>&1 & "$@" > ${LOG_NODE_FILE} 2>&1 &
BEACON_NODE_STATUS=$? BEACON_NODE_STATUS=$?