diff --git a/RT.jenkinsfile b/RT.jenkinsfile index cc372eb8..e26d1cb4 100644 --- a/RT.jenkinsfile +++ b/RT.jenkinsfile @@ -9,7 +9,7 @@ def enableB1 = true def enableB2 = true def enableB3 = true def enableB4 = false -def enableB5 = false +def enableB5 = true def enableC1 = false @@ -212,13 +212,14 @@ pipeline { } steps { - build/norma run --label b5 -o . release_testing/b5.ValsBlackout.yml + build/norma run --label b5 -o . scenarios/release_testing/b5.ValsBlackout.yml } post { - success { - dir('./norma_data_b5_latest') { - archiveArtifacts artifacts: '**' + always { + script { + def artifacts = ["*.yml", "*.csv", "*.log", "*.html"] + uploadArtifacts(artifacts) } } } diff --git a/release_testing/b5.ValsBlackout.yml b/scenarios/release_testing/b5.ValsBlackout.yml similarity index 51% rename from release_testing/b5.ValsBlackout.yml rename to scenarios/release_testing/b5.ValsBlackout.yml index f8c6a045..445c8b1a 100644 --- a/release_testing/b5.ValsBlackout.yml +++ b/scenarios/release_testing/b5.ValsBlackout.yml @@ -1,51 +1,34 @@ # Scenario B5: over 2/3 of validators stop then restart after 5 minutes -# - Set up: start 4 validators, 2 RPC nodes and 2 observers +# - Set up: start 6 validators, 2 RPC nodes and 2 observers # - Test: process transactions for 5 minutes, then stop 3 validators. Restart the validators again after another 5 minutes passed. # - Validation: what would happen? -name: B5 -duration: 610 # 10 minute sim: 5 minutes > stop 3 validators > 5 minutes further > start the stopped 3 validators > 10 seconds grace period - -# backward compatibility, to be removed. -num_validators: 4 +name: B5.ValsBlackout +duration: 900 # 15 minute sim: 5 minutes > stop 3 validators > 5 minutes further > start the stopped 3 validators > 5 minutes nodes: - - name: full-validator + - name: static-validator instances: 2 - timer: - start: 0 - end: 610 client: - imagename: main type: validator - + - name: crashing-validator - instances: 3 + instances: 4 + start: 1 timer: - start: 0 - end: 300 - start: 600 - end: 610 + 300: end + 600: start client: - imagename: main type: validator - - name: RPC + - name: rpc instances: 2 - timer: - start: 0 - end: 610 client: - imagename: main - type: RPC + type: rpc - name: observer instances: 2 - timer: - start: 0 - end: 610 client: - imagename: main type: observer # In the network there is a single application producing constant load. @@ -53,9 +36,7 @@ applications: - name: load type: counter start: 1 # start time - end: 609 # termination time + end: 899 # termination time users: 20 # number of users / accounts generating txs rate: constant: 100 # Tx/s - -validate: true # what happen?