Post CSIT job cleanup fixes

* Fix 3n-tsh executor for csit ligato jobs
* Remove previously forgotten csit-nsh_sfc-verify-perf-{stream} template
* Reintroduce 2n-dnv and 3n-dnv jobs
* Streamline node-arch variable in csit jobs

Change-Id: Iea467e9ad25714b7fc74deefbe8ec6d5c323c67b
Signed-off-by: juraj.linkes <juraj.linkes@pantheon.tech>

1 files changed, 37 insertions, 89 deletions

diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index 70b460ca0..6d4fb96c3 100644
--- a/jjb/csit/csit-perf.yaml
+++ b/jjb/csit/csit-perf.yaml
@@ -19,41 +19,34 @@
 
     jobs:
       - 'csit-vpp-perf-verify-{stream}-{node-arch}'
-      - 'csit-vpp-perf-mrr-daily-master{vpp-mrr-daily-node-arch}'
+      - 'csit-vpp-perf-mrr-daily-master{node-arch}':
+          node-arch:
+            - ''
+            - -2n-skx
+            - -2n-dnv
+            - -3n-skx
+            - -3n-dnv
+            - -3n-tsh:
+                executor: 'ubuntu1804arm-us'
       - 'csit-vpp-perf-mrr-weekly-master-2n-skx'
-      - 'csit-vpp-perf-ndrpdr-weekly-master-{vpp-ndrpdr-weekly-node-arch}'
+      - 'csit-vpp-perf-ndrpdr-weekly-master-{node-arch}':
+          node-arch:
+            - 2n-skx
+            - 3n-skx
+            - 3n-hsw
       - 'csit-dpdk-perf-verify-{stream}-{node-arch}'
-      - 'csit-dpdk-perf-mrr-weekly-master{dpdk-mrr-weekly-node-arch}'
+      - 'csit-dpdk-perf-mrr-weekly-master{node-arch}':
+          node-arch:
+            - ''
+            - -2n-skx
+            - -3n-skx
       - 'csit-ligato-perf-verify-{stream}-{node-arch}'
 
     project: 'csit'
+    executor: 'ubuntu1804-us'
+    ligato-executor: 'ubuntu1804-basebuild-4c-4g'
     branch: 'master'
     branch-id: 'oper'
-    executor: 'ubuntu1804-us'
-    build-artifact-num-to-keep: 10
-    node-arch:
-      - 2n-skx
-      - 3n-skx
-      - 3n-hsw
-      - 3n-tsh
-
-    vpp-ndrpdr-weekly-node-arch:
-      - 2n-skx
-      - 3n-skx
-      - 3n-hsw
-
-    dpdk-mrr-weekly-node-arch:
-      - ''
-      - -2n-skx
-      - -3n-skx
-
-    vpp-mrr-daily-node-arch:
-      - ''
-      - -2n-skx
-      - -3n-skx
-      - -3n-tsh:
-          executor: 'ubuntu1804arm-us'
-
     stream:
       - master:
           branch: 'master'
@@ -76,6 +69,17 @@
           branch-id: 'oper-rls1904'
           executor: 'ubuntu1804-us'
 
+    build-artifact-num-to-keep: 10
+    node-arch:
+      - 2n-skx
+      - 2n-dnv
+      - 3n-skx
+      - 3n-hsw
+      - 3n-dnv
+      - 3n-tsh:
+          executor: 'ubuntu1804arm-us'
+          ligato-executor: 'ubuntu1804arm-us'
+
 - job-template:
     name: 'csit-vpp-perf-verify-{stream}-{node-arch}'
 
@@ -185,7 +189,7 @@
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-vpp-perf-mrr-daily-master{vpp-mrr-daily-node-arch}'
+    name: 'csit-vpp-perf-mrr-daily-master{node-arch}'
 
     description: |
       <ul>
@@ -317,13 +321,13 @@
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-vpp-perf-ndrpdr-weekly-master-{vpp-ndrpdr-weekly-node-arch}'
+    name: 'csit-vpp-perf-ndrpdr-weekly-master-{node-arch}'
 
     description: |
       <ul>
           <li>objective
               <ul>
-                  <li>check vpp perf ndrpdr weekly on {vpp-ndrpdr-weekly-node-arch}
+                  <li>check vpp perf ndrpdr weekly on {node-arch}
               </ul>
           <li>perf test-cases selection
               <ul>
@@ -482,7 +486,7 @@
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-dpdk-perf-mrr-weekly-master{dpdk-mrr-weekly-node-arch}'
+    name: 'csit-dpdk-perf-mrr-weekly-master{node-arch}'
 
     description: |
       <ul>
@@ -596,7 +600,7 @@
     # ligato-perf job due to dependency on using docker inside.
     # TODO: Find the mechanics how to offload job logic from compiling docker
     #   image so we can move this executor to ubuntu1804-us
-    node: 'ubuntu1804-basebuild-4c-4g'
+    node: '{ligato-executor}'
     concurrent: true
     archive-artifacts: 'archive/*.*'
     latest-only: false
@@ -660,59 +664,3 @@
 
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
-
-- job-template:
-    name: 'csit-nsh_sfc-verify-perf-{stream}'
-
-    project-type: freestyle
-    node: 'ubuntu1604-basebuild-4c-4g'
-    concurrent: true
-    archive-artifacts: 'archive/*.*'
-    latest-only: false
-
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-      - gerrit-parameter:
-          branch: '{branch}'
-      - os-parameter:
-          os: 'ubuntu1604'
-      - stream-parameter:
-          stream: '{stream}'
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
-
-    scm:
-      - gerrit-trigger-scm:
-          credentials-id: 'jenkins-gerrit-credentials'
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-
-    wrappers:
-      - fdio-infra-wrappers-non-activity-timeout:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-manually-triggered:
-          name: '{project}'
-          branch: '{branch}'
-          comment-trigger-value: 'csit_nsh_sfc_perf_{stream}'
-
-    builders:
-      - shell:
-          !include-raw-escape: jjb/csit/include-raw-csit-nsh_sfc-perf-hw.sh
-
-    publishers:
-      - robot-report:
-          output-path: 'archive'
-
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'