From 0276dee0af158a6870af227344dcdde35e00333e Mon Sep 17 00:00:00 2001
From: Vratko Polak <vrpolak@cisco.com>
Date: Fri, 22 Nov 2019 14:56:25 +0100
Subject: Apply BMRR parameters to each MRR job

+ Define global macros to make values configurable on demand.
+ Define minimal values to be used as global default.
+ The vpp-csit and csit-vpp jobs need different values.
+ Ndrpdr jobs do not use the values.

Change-Id: I868da5fdf16cfb627c48b44a028ed2f6a708ce77
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
---
 jjb/csit/csit-perf.yaml  | 22 ++++++++++++++++++++++
 jjb/global-defaults.yaml |  6 +++++-
 jjb/global-macros.yaml   | 16 ++++++++++++++++
 jjb/vpp/vpp.yaml         | 12 ++++--------
 4 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index 45101e7c..cc722f5b 100644
--- a/jjb/csit/csit-perf.yaml
+++ b/jjb/csit/csit-perf.yaml
@@ -54,6 +54,8 @@
     branch: 'master'
     branch-id: 'oper'
     vpp-mrr-daily-periodicity: '0 2,14 * * *'
+    csit-perf-trial-duration: "1.0"
+    csit-perf-trial-multiplicity: "10"
     stream:
       - master:
           branch: 'master'
@@ -146,6 +148,10 @@
       - gerrit-refspec-parameter
       - gerrit-event-type-parameter
       - gerrit-event-comment-text-parameter
+      - csit-perf-trial-duration-parameter:
+          csit-perf-trial-duration: "{csit-perf-trial-duration}"
+      - csit-perf-trial-multiplicity-parameter:
+          csit-perf-trial-multiplicity: "{csit-perf-trial-multiplicity}"
       - string:
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
@@ -239,6 +245,10 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
+      - csit-perf-trial-duration-parameter:
+          csit-perf-trial-duration: "{csit-perf-trial-duration}"
+      - csit-perf-trial-multiplicity-parameter:
+          csit-perf-trial-multiplicity: "{csit-perf-trial-multiplicity}"
       - string:
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
@@ -309,6 +319,10 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
+      - csit-perf-trial-duration-parameter:
+          csit-perf-trial-duration: "{csit-perf-trial-duration}"
+      - csit-perf-trial-multiplicity-parameter:
+          csit-perf-trial-multiplicity: "{csit-perf-trial-multiplicity}"
       - string:
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
@@ -464,6 +478,10 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
+      - csit-perf-trial-duration-parameter:
+          csit-perf-trial-duration: "{csit-perf-trial-duration}"
+      - csit-perf-trial-multiplicity-parameter:
+          csit-perf-trial-multiplicity: "{csit-perf-trial-multiplicity}"
       - string:
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
@@ -552,6 +570,10 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
+      - csit-perf-trial-duration-parameter:
+          csit-perf-trial-duration: "{csit-perf-trial-duration}"
+      - csit-perf-trial-multiplicity-parameter:
+          csit-perf-trial-multiplicity: "{csit-perf-trial-multiplicity}"
       - string:
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index 93bf6cc9..2f3f1692 100644
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -22,4 +22,8 @@
     branch: master
 
     # voting
-    skip-vote: false
\ No newline at end of file
+    skip-vote: false
+
+    # CSIT
+    csit-perf-trial-duration: 1.0
+    csit-perf-trial-multiplicity: 1
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index a9534219..3a9d9062 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -142,6 +142,22 @@
           # yamllint disable-line rule:line-length
           description: "GERRIT_REFSPEC parameter to override separately cloned CSIT repository, leave empty for autodetection / no override."
 
+- parameter:
+    name: csit-perf-trial-duration-parameter
+    parameters:
+      - string:
+          name: CSIT_PERF_TRIAL_DURATION
+          default: "{csit-perf-trial-duration}"
+          description: "Duration of a trial measurement in BMRR tests."
+
+- parameter:
+    name: csit-perf-trial-multiplicity-parameter
+    parameters:
+      - string:
+          name: CSIT_PERF_TRIAL_MULTIPLICITY
+          default: "{csit-perf-trial-multiplicity}"
+          description: "Number of subsamples for BMRR tests."
+
 ##### SCMS
 - scm:
     name: git-scm
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 14dd93b5..27eb64c9 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -959,14 +959,10 @@
       - gerrit-event-type-parameter
       - gerrit-event-comment-text-parameter
       - gerrit-csit-refspec-parameter
-      - string:
-          name: CSIT_PERF_TRIAL_DURATION
-          default: "10.0"
-          description: "Duration of a trial measurement in BMRR tests."
-      - string:
-          name: CSIT_PERF_TRIAL_MULTIPLICITY
-          default: "5"
-          description: "Number of subsamples for BMRR tests."
+      - csit-perf-trial-duration-parameter:
+          csit-perf-trial-duration: "10.0"
+      - csit-perf-trial-multiplicity-parameter:
+          csit-perf-trial-multiplicity: "5"
       - stream-parameter:
           stream: '{stream}'
       - string:
-- 
cgit 1.2.3-korg