Disable discovery5 service for REST test. (#2738)

Run REST test before Finalization test.

Jenkinsfile

@@ -44,6 +44,10 @@ def runStages() {
 			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") {
 			// EXECUTOR_NUMBER will be 0 or 1, since we have 2 executors per Jenkins node
 			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
 			"""
 		}
-
-		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) {
 		// we need to rethrow the exception here
 		throw e

tests/simulation/restapi.sh

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