Merge pull request #124 from iExecBlockchainComputing/feature/local-metrics

Add metrics infrastructure

Author: zguesmi

.drone.yml

@@ -8,33 +8,33 @@ pipeline:
       - npm run autotest fast
       - KYC=1 npm run autotest fast
 
-  docker_token_openethereum:
+  docker_token_nethermind:
     image: plugins/docker
     repo: iexechub/poco-chaintest
     secrets: [docker_username, docker_password]
-    dockerfile: testchains/openethereum.dockerfile
+    dockerfile: testchains/nethermind.dockerfile
     build_args:
       - MNEMONIC=actual surround disorder swim upgrade devote digital misery truly verb slide final
       - CHAIN_TYPE=token
       - CHAIN_BLOCK_TIME=1
       - CHAIN_FORCE_SEALING=false
     auto_tag: true
-    auto_tag_suffix: token-openethereum
+    auto_tag_suffix: token-nethermind
     when:
       ref: [refs/tags/v*]
 
-  docker_native_openethereum:
+  docker_native_nethermind:
     image: plugins/docker
     repo: iexechub/poco-chaintest
     secrets: [docker_username, docker_password]
-    dockerfile: testchains/openethereum.dockerfile
+    dockerfile: testchains/nethermind.dockerfile
     build_args:
       - MNEMONIC=actual surround disorder swim upgrade devote digital misery truly verb slide final
       - CHAIN_TYPE=native
       - CHAIN_BLOCK_TIME=1
       - CHAIN_FORCE_SEALING=false
     auto_tag: true
-    auto_tag_suffix: native-openethereum
+    auto_tag_suffix: native-nethermind
     when:
       ref: [refs/tags/v*]
 
@@ -60,4 +60,4 @@ pipeline:
     auto_tag: true
     auto_tag_suffix: native
     when:
-      ref: [refs/tags/v*]
+      ref: [refs/tags/v*]

Jenkinsfile

@@ -116,56 +116,6 @@ pipeline {
 			}
 		}
 
-		stage("Native 1s image") {
-			when {
-				expression {
-					env.TAG_NAME != null && env.TAG_NAME.toString().contains(buildWhenTagContains)
-				}
-			}
-			steps {
-				script {
-					nethermindNative1secImage = docker.build(
-						registry + "/poco-chain:native-${TAG_NAME}",
-						"--file testchains/nethermind.dockerfile" \
-						+ " --build-arg \"MNEMONIC=actual surround disorder swim upgrade devote digital misery truly verb slide final\"" \
-						+ " --build-arg CHAIN_TYPE=native" \
-						+ " --build-arg CHAIN_BLOCK_TIME=1" \
-						+ " --build-arg CHAIN_FORCE_SEALING=true" \
-						+ " --no-cache .")
-				}
-				script {
-					docker.withRegistry("https://" + registry, "nexus") {
-						nethermindNative1secImage.push()
-					}
-				}
-			}
-		}
-
-		stage("Token 1s image") {
-			when {
-				expression {
-					env.TAG_NAME != null && env.TAG_NAME.toString().contains(buildWhenTagContains)
-				}
-			}
-			steps {
-				script {
-					nethermindToken1secImage = docker.build(
-						registry + "/poco-chain:token-${TAG_NAME}",
-						"--file testchains/nethermind.dockerfile" \
-                        + " --build-arg \"MNEMONIC=actual surround disorder swim upgrade devote digital misery truly verb slide final\"" \
-						+ " --build-arg CHAIN_TYPE=token" \
-						+ " --build-arg CHAIN_BLOCK_TIME=1" \
-						+ " --build-arg CHAIN_FORCE_SEALING=true" \
-						+ " --no-cache .")
-				}
-				script {
-					docker.withRegistry("https://" + registry, "nexus") {
-						nethermindToken1secImage.push()
-					}
-				}
-			}
-		}
-
 		stage("Native 5s image ") {
 			when {
 				expression {

nethermind.drone.yml

@@ -1,14 +1,16 @@
 ###
 ## docker image build \
 ##      --file testchains/nethermind.dockerfile \
-##      --tag nexus.iex.ec/poco-chain:native-vX.Y.Z-some-fork.0 \
+##      --tag nexus.iex.ec/poco-chain:native-vX.Y.Z-alpha.0 \
+##      --build-arg MNEMONIC="actual surround disorder swim upgrade devote digital misery truly verb slide final" \
 ##      --build-arg CHAIN_TYPE=native \
-##      --build-arg CHAIN_BLOCK_TIME=1 \
+##      --build-arg CHAIN_BLOCK_TIME=5 \
 ##      --build-arg CHAIN_FORCE_SEALING=true \
 ##      .
 ###
-FROM iexechub/nethermind:1.14.1-patch.0
-USER root
+
+FROM iexechub/nethermind:1.14.1-patch.0 AS builder
+
 RUN apt-get update && apt-get install bash jq nodejs npm -y
 # Add git required to install ethereumjs-abi from github (https://github.com/MetaMask/web3-provider-engine/issues/345)
 #
@@ -25,41 +27,39 @@ RUN echo -e "Node: `node -v` - npm: `npm -v`"
 ###
 # Type of the blockchain to build.
 # "native" or "token".
-ARG CHAIN_TYPE
-# New blocks creating interval in seconds.
+ARG CHAIN_TYPE=native
+RUN echo "CHAIN_TYPE: ${CHAIN_TYPE}"
+# New blocks creation interval in seconds.
 # "1", "5", "20", ...
-ARG CHAIN_BLOCK_TIME
+ARG CHAIN_BLOCK_TIME=5
+RUN echo "CHAIN_BLOCK_TIME: ${CHAIN_BLOCK_TIME}"
 # Always create new blocks (even without txs).
 # "true" or "false"
-ARG CHAIN_FORCE_SEALING
+ARG CHAIN_FORCE_SEALING=true
+RUN echo "CHAIN_FORCE_SEALING: ${CHAIN_FORCE_SEALING}"
 
 ###
-## Log build configuration.
+## Copy chain config.
 ###
-ENV MESSAGE="\n##########\n"
-ENV MESSAGE="${MESSAGE}### CHAIN_TYPE: ${CHAIN_TYPE} \n"
-ENV MESSAGE="${MESSAGE}### CHAIN_BLOCK_TIME: ${CHAIN_BLOCK_TIME} \n"
-ENV MESSAGE="${MESSAGE}### CHAIN_FORCE_SEALING: ${CHAIN_FORCE_SEALING} \n"
-ENV MESSAGE="${MESSAGE}########## \n"
-RUN echo -e ${MESSAGE}
+COPY testchains/nethermind/poco-chain.json /nethermind/chainspec/poco-chain.json
+COPY testchains/nethermind/poco-chain.cfg /nethermind/configs/poco-chain.cfg
+COPY testchains/nethermind/keystore /nethermind/keystore
+RUN sed -i "s/@stepDuration@/${CHAIN_BLOCK_TIME}/" /nethermind/chainspec/poco-chain.json
+RUN sed -i "s/@forceSealing@/${CHAIN_FORCE_SEALING}/" /nethermind/configs/poco-chain.cfg
+# Remove eip1559 for sidechains
+RUN if [ "${CHAIN_TYPE}" = "native" ] ; \
+    then \
+        sed -i "/eip1559/d" /nethermind/chainspec/poco-chain.json; \
+    fi
 
 ###
-## Copy files and setup the chain config.
+## Copy PoCo contracts
 ###
-ENV BASE_DIR="/iexec-poco/testchains/nethermind"
-RUN mkdir /iexec-poco
 COPY . /iexec-poco
-COPY ./testchains/nethermind/keystore/key-c08c3def622af1476f2db0e3cc8ccaead07be3bb /nethermind/keystore/
 RUN mv /iexec-poco/config/config_${CHAIN_TYPE}.json /iexec-poco/config/config.json
-RUN sed -i "s/@stepDuration@/${CHAIN_BLOCK_TIME}/" ${BASE_DIR}/spec.json
-RUN sed -i "s/@force_sealing@/${CHAIN_FORCE_SEALING}/" ${BASE_DIR}/authority.cfg
-# remove eip1559 for sidechains
-RUN if [ "${CHAIN_TYPE}" = "native" ] ; \
-    then \
-        sed -i "/eip1559/d" ${BASE_DIR}/spec.json; \
-    fi
+
 ###
-## Run migration
+## Deploy contracts
 ###
 ARG DEV_NODE
 ARG MNEMONIC
@@ -70,14 +70,19 @@ RUN echo "MNEMONIC: ${MNEMONIC}"
 RUN if [ "${CHAIN_TYPE}" = "native" ] ; \
     then \
         echo "Migration file: ${BASE_DIR}/migrate.sh"; \
-        bash ${BASE_DIR}/migrate.sh; \
+        bash /iexec-poco/testchains/nethermind/migrate.sh; \
     else \
         echo "Migration file: ${BASE_DIR}/migrate-all.sh"; \
-        bash ${BASE_DIR}/migrate-all.sh; \
+        bash /iexec-poco/testchains/nethermind/migrate-all.sh; \
     fi
 
-# ###
+FROM iexechub/nethermind:1.14.1-patch.0
+
+COPY --from=builder /nethermind /nethermind
+COPY --from=builder /iexec-poco/build /build
+
+###
 ## Configure entrypoint
 ###
-ENTRYPOINT [ "../../nethermind/Nethermind.Runner" ]
-CMD [ "--config=/iexec-poco/testchains/nethermind/authority.cfg" ]
+ENTRYPOINT [ "/nethermind/Nethermind.Runner" ]
+CMD [ "--config=/nethermind/configs/poco-chain.cfg" ]