From 5be49421fe3c495635af4abe94e48c2eb069b75a Mon Sep 17 00:00:00 2001
From: Tibor Frank <tifrank@cisco.com>
Date: Wed, 11 Jul 2018 10:36:23 +0200
Subject: [PATCH] CSIT-1117: Update jenkins job infrastructure for
 2-node/3-node testing

 + 'csit-vpp-perf-{stream}-{topo}-{arch}'
   - {stream} [branch_id]
   - {topo} [2n|3n]
   - {arch} [skx|hsw|arm]

Change-Id: I5f01a1035cec4dbc663fa06c67e2a4d4ae692d28
Signed-off-by: Tibor Frank <tifrank@cisco.com>
---
 jjb/csit/csit.yaml     | 84 +++++++++++++++++++++++++++++---------------------
 jjb/global-macros.yaml | 15 +++++++++
 2 files changed, 64 insertions(+), 35 deletions(-)

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index e96f8d806..368149f91 100644
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Cisco and/or its affiliates.
+# Copyright (c) 2018 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -18,6 +18,14 @@
     os:
         - 'ubuntu1604'
         - 'centos7'
+    topo:
+        - '2n'
+        - '3n'
+
+    arch:
+        - 'skx'
+        - 'hsw'
+        - 'arm'
 
     jobs:
         - 'csit-vpp-functional-{stream}-{os}-virl'
@@ -35,7 +43,7 @@
         - 'csit-vpp-perf-trend-daily-master'
         - 'csit-vpp-perf-trend-semi-weekly-master'
         - 'csit-vpp-perf-mrr-daily-master'
-        - 'csit-vpp-perf-verify-{stream}'
+        - 'csit-vpp-perf-verify-{stream}-{topo}-{arch}'
         - 'csit-nsh_sfc-verify-perf-{stream}'
         - 'csit-nsh_sfc-verify-func-{stream}-{os}-virl'
         - 'csit-tldk-verify-func-{stream}-{os}-virl'
@@ -1055,40 +1063,46 @@
             maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-vpp-perf-verify-{stream}'
+    name: 'csit-vpp-perf-verify-{stream}-{topo}-{arch}'
 
     description: |
-      objective
-          perf verify - per csit gerrit patch
-      job
-          name
-              csit-vpp-perf-verify
-          trigger
-              keyword in comment to csit patch
-      perf test-cases selection
-          test-cases selected using trigger keyword followed by tags
-          all test-cases are labelled with CSIT RF topic tags defined in
-          csit/docs/tag_documentation.rst
-      proposed keywords
-          focus on testing specified vpp packet processing path
-          format - csit-perftest tag_list
-      default tags for vpp startup config and perf test type
-          IP4BASE, IP6BASE, L2XCBASE, L2BDBASE
-          64B/78B
-              64B/78B packet size
-          1T1C
-              one worker thread, one core
-          X710
-              x710 Fortville NIC
-          MRR
-              MDR throughput
-      results
-          jjb verify
-              PASS/FAIL
-          present
-              no
-          analyse
-              no
+      <ul>
+          <li>objective
+              <ul>
+                  <li>perf verify - per csit gerrit patch
+              </ul>
+          <li>job
+              <ul>
+                  <li>name: <b>csit-vpp-perf-verify-{stream}-{topo}-{arch}</b>
+                  <li>trigger: keyword in comment to csit patch:
+                      <b>csit-{topo}-{arch}-perftest tag_list</b>
+              </ul>
+          <li>perf test-cases selection
+              <ul>
+                  <li>test-cases selected using trigger keyword followed by tags
+                  <li>all test-cases are labelled with CSIT RF topic tags
+                      defined in <i>csit/docs/tag_documentation.rst</i>
+              </ul>
+          <li>proposed keywords
+              <ul>
+                  <li>focus on testing specified vpp packet processing path
+                  <li>format: csit-{topo}-{arch}-perftest tag_list
+              </ul>
+          <li>default tags for vpp startup config and perf test type
+              <ul>
+                  <li>IP4BASE, IP6BASE, L2BDBASE
+                  <li>64B/78B: 64B/78B packet size
+                  <li>1C: one core
+                  <li>X710: x710 Fortville NIC
+                  <li>MRR: MRR throughput
+              </ul>
+          <li>results
+              <ul>
+                  <li>jjb verify: PASS/FAIL
+                  <li>present: no
+                  <li>analyse: no
+              </ul>
+      </ul>
     project-type: freestyle
     node: 'ubuntu1604-basebuild-4c-4g'
     concurrent: false
@@ -1120,7 +1134,7 @@
             server-name: 'Primary'
             trigger-on:
                 - comment-added-contains-event:
-                    comment-contains-value: 'csit-perftest'
+                    comment-contains-value: 'csit-{topo}-{arch}-perftest'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{project}'
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 259d131b7..d34e4e23a 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -89,6 +89,21 @@
             default: '{stream}'
             description: "Stream job parameter to be used in shell scripts."
 
+- parameter:
+    name: topo-parameter
+    parameters:
+        - string:
+            name: TOPO
+            default: '{topo}'
+            description: "Topology parameter"
+
+- parameter:
+    name: arch-parameter
+    parameters:
+        - string:
+            name: ARCH
+            default: '{arch}'
+            description: "Architecture parameter"
 
 ##### SCMS
 - scm:
-- 
2.16.6