From 38d117a3f1c74089aec468cc9097f86d7df4182f Mon Sep 17 00:00:00 2001
From: Vratko Polak <vrpolak@cisco.com>
Date: Wed, 6 Nov 2019 17:29:21 +0100
Subject: [PATCH] CSIT: Add executor value to job description

For some jobs, it is not entirely clear which executor is used.
People verifying changes related to executors
previously needed to click job configuration to see it.
Now they only need to look at job description.
If a job does not list the executor in its description,
it means it does not use anything fancy.

Change-Id: Idbfdc015a9989b8ff65a8a0f0ca6593c16b2683f
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
---
 jjb/csit/csit-perf.yaml       | 24 ++++++++++++++++++++++++
 jjb/csit/csit-vpp-device.yaml | 20 ++++++++++++++++++++
 jjb/vpp/vpp.yaml              |  7 +++++++
 3 files changed, 51 insertions(+)

diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index b424ab05b..45101e7c1 100644
--- a/jjb/csit/csit-perf.yaml
+++ b/jjb/csit/csit-perf.yaml
@@ -95,6 +95,10 @@
                   <li>trigger: keyword in comment to csit patch:
                       <b>csit-{node-arch}-perftest tag_list</b>
               </ul>
+          <li>executor
+              <ul>
+                  <li>{executor}
+              </ul>
           <li>perf test-cases selection
               <ul>
                   <li>test-cases selected using trigger keyword followed by tags
@@ -202,6 +206,10 @@
               <ul>
                   <li>check vpp perf mrr daily
               </ul>
+          <li>executor
+              <ul>
+                  <li>{executor}
+              </ul>
           <li>perf test-cases selection
               <ul>
                   <li>all CSIT VPP MRR perf suites
@@ -268,6 +276,10 @@
               <ul>
                   <li>check vpp perf mrr weekly on {node-arch}
               </ul>
+          <li>executor
+              <ul>
+                  <li>{executor}
+              </ul>
           <li>perf test-cases selection
               <ul>
                   <li>NF Density CSIT VPP MRR perf suites
@@ -334,6 +346,10 @@
               <ul>
                   <li>check vpp perf ndrpdr weekly on {node-arch}
               </ul>
+          <li>executor
+              <ul>
+                  <li>{executor}
+              </ul>
           <li>perf test-cases selection
               <ul>
                   <li>pre-selected CSIT VPP NDRPDR perf suites
@@ -405,6 +421,10 @@
                   <li>trigger: keyword in comment to csit patch:
                       <b>csit-dpdk-{node-arch}-perftest tag_list</b>
               </ul>
+          <li>executor
+              <ul>
+                  <li>{executor}
+              </ul>
           <li>perf test-cases selection
               <ul>
                   <li>test-cases selected using trigger keyword followed by tags
@@ -499,6 +519,10 @@
               <ul>
                   <li>check dpdk perf mrr weekly
               </ul>
+          <li>executor
+              <ul>
+                  <li>{executor}
+              </ul>
           <li>perf test-cases selection
               <ul>
                   <li>all CSIT DPDK MRR perf suites
diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml
index 3e3571401..c435f2198 100644
--- a/jjb/csit/csit-vpp-device.yaml
+++ b/jjb/csit/csit-vpp-device.yaml
@@ -74,6 +74,10 @@
                   <li>trigger: keyword in comment to csit patch:
                       <b>csit-devicetest tag_list</b>
               </ul>
+          <li>executor
+              <ul>
+                  <li>{executor}
+              </ul>
           <li>test-cases selection
               <ul>
                   <li>test-cases selected using trigger keyword followed by tags
@@ -162,6 +166,10 @@
                       in nexus against verified CSIT codebase of corresponding
                       branch.
               </ul>
+          <li>executor
+              <ul>
+                  <li>{executor}
+              </ul>
           <li>test-cases selection
               <ul>
                   <li>pre-selected test-cases
@@ -240,6 +248,10 @@
                   <li>Validate CSIT code of corresponding branch against
                       verified vpp build from corresponding branch.
               </ul>
+          <li>executor
+              <ul>
+                  <li>{executor}
+              </ul>
           <li>test-cases selection
               <ul>
                   <li>pre-selected test-cases
@@ -320,6 +332,10 @@
                   <li>Validate CSIT code of corresponding branch against
                       verified vpp build from corresponding branch.
               </ul>
+          <li>executor
+              <ul>
+                  <li>vpp-csit-arm-ubuntu18
+              </ul>
           <li>test-cases selection
               <ul>
                   <li>pre-selected test-cases
@@ -396,6 +412,10 @@
                       in nexus against verified CSIT codebase of corresponding
                       branch.
               </ul>
+          <li>executor
+              <ul>
+                  <li>vpp-csit-arm-ubuntu18
+              </ul>
           <li>test-cases selection
               <ul>
                   <li>pre-selected test-cases
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index f69d0afef..42beead61 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -847,6 +847,13 @@
 
 - job-template:
     name: 'vpp-csit-verify-device-{stream}-{device-node-arch}'
+    description: |
+      <ul>
+          <li>executor
+              <ul>
+                  <li>{executor}
+              </ul>
+      </ul>
 
     project-type: freestyle
     node: '{executor}'
-- 
2.16.6