From 0746750667bf795d999c8bcdbad5b759c4ff2c39 Mon Sep 17 00:00:00 2001
From: RT <rapol@fantom.foundation>
Date: Fri, 2 Aug 2024 02:47:54 +0000
Subject: [PATCH 1/4] b5

---
 RT.jenkinsfile                                | 11 +++--
 .../release_testing}/b5.ValsBlackout.yml      | 41 +++++--------------
 2 files changed, 17 insertions(+), 35 deletions(-)
 rename {release_testing => scenarios/release_testing}/b5.ValsBlackout.yml (50%)

diff --git a/RT.jenkinsfile b/RT.jenkinsfile
index 185dbccf..d1b1469d 100644
--- a/RT.jenkinsfile
+++ b/RT.jenkinsfile
@@ -1,3 +1,5 @@
+@Library('shared-library') _
+
 // Norma CI test norma using "make test"
 
 def buildSuccess = false
@@ -7,7 +9,7 @@ def enableB1 = false
 def enableB2 = false
 def enableB3 = false
 def enableB4 = false
-def enableB5 = false
+def enableB5 = true
 def enableC1 = false
 
 
@@ -207,13 +209,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: '**'
+					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 50%
rename from release_testing/b5.ValsBlackout.yml
rename to scenarios/release_testing/b5.ValsBlackout.yml
index f8c6a045..02c55410 100644
--- a/release_testing/b5.ValsBlackout.yml
+++ b/scenarios/release_testing/b5.ValsBlackout.yml
@@ -1,51 +1,32 @@
 # 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
+name: B5.ValsBlackout
+duration: 900 # 15 minute sim: 5 minutes > stop 3 validators > 5 minutes further > start the stopped 3 validators > 5 minutes
 
-# backward compatibility, to be removed.
-num_validators: 4
+# This is equivalent to the genesis-validator in node section
+num_validators: 2
 
 nodes:
-  - name: full-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
     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 +34,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?

From 746aff949d53e690b70b267be5d09d81c4b39095 Mon Sep 17 00:00:00 2001
From: RT <rapol@fantom.foundation>
Date: Mon, 5 Aug 2024 08:01:29 +0000
Subject: [PATCH 2/4] post success -> post always

---
 RT.jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RT.jenkinsfile b/RT.jenkinsfile
index d1b1469d..0a6e86b1 100644
--- a/RT.jenkinsfile
+++ b/RT.jenkinsfile
@@ -213,7 +213,7 @@ pipeline {
 			}
 			
 			post {
-				success {
+				always {
 					script {
 						def artifacts = ["*.yml", "*.csv", "*.log", "*.html"]
 						uploadArtifacts(artifacts)

From 80516efbdd5271cb95909bcde0396320f61d8991 Mon Sep 17 00:00:00 2001
From: RT <rapol@fantom.foundation>
Date: Mon, 12 Aug 2024 15:34:52 +0000
Subject: [PATCH 3/4] remove deprecated num_validator

---
 scenarios/release_testing/b5.ValsBlackout.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scenarios/release_testing/b5.ValsBlackout.yml b/scenarios/release_testing/b5.ValsBlackout.yml
index 02c55410..46c2a2fd 100644
--- a/scenarios/release_testing/b5.ValsBlackout.yml
+++ b/scenarios/release_testing/b5.ValsBlackout.yml
@@ -6,10 +6,12 @@
 name: B5.ValsBlackout
 duration: 900 # 15 minute sim: 5 minutes > stop 3 validators > 5 minutes further > start the stopped 3 validators > 5 minutes
 
-# This is equivalent to the genesis-validator in node section
-num_validators: 2
-
 nodes:
+  - name: static-validator
+    instances: 2
+    client:
+      type: validator
+
   - name: crashing-validator
     instances: 4
     start: 1

From d2e901c825fa6ad2d1cad28a4be08705b84bd922 Mon Sep 17 00:00:00 2001
From: RT <rapol@fantom.foundation>
Date: Mon, 12 Aug 2024 18:47:24 +0000
Subject: [PATCH 4/4] typo in scenario

---
 scenarios/release_testing/b5.ValsBlackout.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scenarios/release_testing/b5.ValsBlackout.yml b/scenarios/release_testing/b5.ValsBlackout.yml
index 46c2a2fd..445c8b1a 100644
--- a/scenarios/release_testing/b5.ValsBlackout.yml
+++ b/scenarios/release_testing/b5.ValsBlackout.yml
@@ -16,8 +16,8 @@ nodes:
     instances: 4
     start: 1
     timer:
-      end: 300
-      start: 600
+      300: end
+      600: start
     client:
       type: validator