small modifications

- Jenkins: we don't need LOG_LEVEL=TRACE twice for the same binaries
- eth2_network_simulation: allow overriding NETWORK_TYPE and
  BOOTSTRAP_NODE_NETWORK_TYPE from the environment
This commit is contained in:
Ștefan Talpalaru 2020-02-20 16:17:55 +01:00
parent c25f8d4adf
commit 571818495f
No known key found for this signature in database
GPG Key ID: CBF7934204F1B6F9
2 changed files with 3 additions and 3 deletions

2
Jenkinsfile vendored
View File

@ -21,7 +21,7 @@ def runStages() {
parallel( parallel(
"tools": { "tools": {
stage("Tools") { stage("Tools") {
sh "make -j${env.NPROC} LOG_LEVEL=TRACE" sh "make -j${env.NPROC}"
sh "make -j${env.NPROC} LOG_LEVEL=TRACE NIMFLAGS='-d:NETWORK_TYPE=libp2p -d:testnet_servers_image'" sh "make -j${env.NPROC} LOG_LEVEL=TRACE NIMFLAGS='-d:NETWORK_TYPE=libp2p -d:testnet_servers_image'"
} }
}, },

View File

@ -27,8 +27,8 @@ MASTER_NODE=$(( TOTAL_NODES - 1 ))
# You can run a mixed simulation of daemon and native libp2p nodes # You can run a mixed simulation of daemon and native libp2p nodes
# by changing the variables below: # by changing the variables below:
NETWORK_TYPE=libp2p NETWORK_TYPE=${NETWORK_TYPE:-"libp2p"}
BOOTSTRAP_NODE_NETWORK_TYPE=libp2p BOOTSTRAP_NODE_NETWORK_TYPE=${BOOTSTRAP_NODE_NETWORK_TYPE:-"libp2p"}
SIMULATION_DIR="${SIM_ROOT}/data" SIMULATION_DIR="${SIM_ROOT}/data"
METRICS_DIR="${SIM_ROOT}/prometheus" METRICS_DIR="${SIM_ROOT}/prometheus"