CSIT: Cleanup jobs

- rls1904
- func/dmm/tldk/hc/nsh
+ perf LTS
+ vpp_device LTS

Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: Ib88c93e76958d2f79db08eea5a639c264e6c492c

6 files changed, 90 insertions, 430 deletions

diff --git a/jjb/csit/csit-func.yaml b/jjb/csit/csit-func.yaml
deleted file mode 100644
index 7827397d9..000000000
--- a/jjb/csit/csit-func.yaml
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
-# Copyright (c) 2019 PANTHEON.tech s.r.o. 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-- project:
-    name: csit-func
-    description: 'CSIT Functinal Testing Jenkins jobs.'
-    os:
-      - 'ubuntu1604'
-      - 'centos7'
-
-    jobs:
-      - 'csit-vpp-functional-{stream}-{os}-virl'
-      - 'csit-nsh_sfc-verify-func-{stream}-{os}-virl'
-      - 'csit-tldk-verify-func-{stream}-{os}-virl'
-      - 'csit-dmm-functional-{stream}-ubuntu1604-virl'
-
-    project: 'csit'
-    branch: 'master'
-    branch-id: 'oper'
-    build-artifact-num-to-keep: 10
-    stream:
-      - '1904':
-          branch: 'rls1904'
-      - '1908_1':
-          branch: 'rls1908_1'
-
-- job-template:
-    name: 'csit-vpp-functional-{stream}-{os}-virl'
-
-    project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
-    concurrent: true
-    archive-artifacts: >
-      **/csit/report.html
-      **/csit/log.html
-      **/csit/output.xml
-    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}'
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
-      # This is an automatic verify job, part of API coverage.
-      # CRC checking is needed to ensure vpp crc job breaks only when intended.
-      # Can be removed when this job is no longer needed for full API coverage.
-      - csit-fail-on-crc-mismatch-parameter:
-          fail-on-crc-mismatch: 'True'
-
-    scm:
-      - gerrit-trigger-scm:
-          credentials-id: 'jenkins-gerrit-credentials'
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-
-    wrappers:
-      - fdio-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-manually-triggered:
-          name: '{project}'
-          branch: '{branch}'
-          comment-trigger-value: 'csit-virltest'
-
-    builders:
-      - shell:
-          !include-raw-escape:
-          - ../scripts/csit/vpp-functional-virl.sh
-
-    publishers:
-      - robot-report:
-          output-path: ''
-
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
-
-- job-template:
-    name: 'csit-nsh_sfc-verify-func-{stream}-{os}-virl'
-
-    project-type: freestyle
-    node: '{os}-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: '{os}'
-      - 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:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-manually-triggered:
-          name: '{project}'
-          branch: '{branch}'
-          comment-trigger-value: 'csit_nsh_sfc_func_{stream}'
-
-    builders:
-      - shell:
-          !include-raw-escape:
-          - ../scripts/csit/nsh_sfc-functional-virl.sh
-
-    publishers:
-      - robot-report:
-          output-path: 'archive'
-
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
-
-- job-template:
-    name: 'csit-tldk-verify-func-{stream}-{os}-virl'
-
-    project-type: freestyle
-    node: '{os}-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: '{os}'
-      - 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:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-manually-triggered:
-          name: '{project}'
-          branch: '{branch}'
-          comment-trigger-value: 'csit_verify_tldk_func'
-
-    builders:
-      - shell:
-          !include-raw-escape:
-          - ../scripts/csit/tldk-functional-virl.sh
-
-    publishers:
-      - robot-report:
-          output-path: 'archive'
-
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
-
-- job-template:
-    name: 'csit-dmm-functional-{stream}-ubuntu1604-virl'
-
-    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}'
-      - 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:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-manually-triggered:
-          name: '{project}'
-          branch: '{branch}'
-          comment-trigger-value: 'csit_verify_dmm_func'
-
-    builders:
-      - shell:
-          !include-raw-escape:
-          - ../scripts/csit/dmm-functional-virl.sh
-
-    publishers:
-      - robot-report:
-          output-path: ''
-
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
diff --git a/jjb/csit/csit-hc2vpp.yaml b/jjb/csit/csit-hc2vpp.yaml
deleted file mode 100644
index d49122015..000000000
--- a/jjb/csit/csit-hc2vpp.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright (c) 2020 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-- project:
-    name: csit-hc2vpp
-    description: 'jenkins jobs verify Hc2vpp functional and performance tests'
-    jobs:
-      - 'csit-hc2vpp-verify-func-{stream}-{os}'
-    project: 'csit'
-    branch: 'master'
-    build-artifact-num-to-keep: 10
-    os:
-      - ubuntu1804:
-          repo-os-part: 'ubuntu.bionic.main'
-      - ubuntu1604:
-          repo-os-part: 'ubuntu.xenial.main'
-
-    stream:
-      - '1904':
-          branch: 'rls1904'
-          branch-id: 'oper-rls1904'
-      - '1908':
-          branch: 'rls1908'
-          branch-id: 'oper-rls1908'
-
-- job-template:
-    name: 'csit-hc2vpp-verify-func-{stream}-{os}'
-
-    project-type: freestyle
-    node: '{os}-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}'
-      - os-parameter:
-          os: '{os}'
-      - stream-parameter:
-          stream: '{stream}'
-      - gerrit-parameter:
-          branch: '{branch}'
-      - 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:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-manually-triggered:
-          comment-trigger-value: 'verify-hc2vpp-func'
-          name: '{project}'
-          branch: '{branch}'
-
-    builders:
-      - shell:
-          !include-raw-escape:
-          - ../scripts/csit/hc2vpp-verify-func.sh
-
-    publishers:
-      - email-notification:
-          email-prefix: '[csit]'
-
-      - robot-report:
-          output-path: 'archive'
-
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn36'
diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index 5c45f6e26..5944311be 100644
--- a/jjb/csit/csit-perf.yaml
+++ b/jjb/csit/csit-perf.yaml
@@ -18,67 +18,89 @@
     description: 'CSIT Jenkins jobs.'
 
     jobs:
-      - 'csit-vpp-perf-verify-{stream}-{node-arch}'
-      - 'csit-vpp-perf-mrr-daily-master{node-arch}':
+      - 'csit-dpdk-perf-verify-{stream}-{node-arch}':
+          node-arch:
+            - 2n-clx
+            - 2n-skx
+            - 2n-dnv
+            - 3n-skx
+            - 3n-hsw
+            - 3n-dnv
+            - 3n-tsh:
+               executor: 'ubuntu1804arm-us'
+      - 'csit-dpdk-perf-mrr-weekly-master{node-arch}':
           node-arch:
             - ''
             - -2n-clx
             - -2n-skx
-            - -2n-dnv
             - -3n-skx
-            - -3n-dnv
+          periodicity: '0 0 * * 6'
+      - 'csit-vpp-perf-verify-{stream}-{node-arch}':
+          node-arch:
+            - 2n-clx
+            - 2n-skx
+            - 2n-dnv
+            - 3n-skx
+            - 3n-hsw
+            - 3n-dnv
+            - 3n-tsh:
+               executor: 'ubuntu1804arm-us'
+      - 'csit-vpp-perf-mrr-daily-master{node-arch}':
+          node-arch:
+            - '':
+                periodicity: '0 14 * * *'
+            - -2n-clx:
+                periodicity: '0 14 * * *'
+            - -2n-skx:
+                periodicity: '0 14 * * 1,4'
+            - -2n-dnv:
+                periodicity: '0 14 * * *'
+            - -3n-skx:
+                periodicity: '0 14 * * 1,4'
+            - -3n-dnv:
+                periodicity: '0 14 * * *'
             - -3n-tsh:
                 executor: 'ubuntu1804arm-us'
-                vpp-mrr-daily-periodicity: '0 14 * * 6'
-      - 'csit-vpp-perf-mrr-weekly-master-{node-arch}':
+                periodicity: '0 14 * * 6'
+      - 'csit-vpp-perf-mrr-weekly-{stream}-{node-arch}':
           node-arch:
             - 2n-clx
             - 2n-skx
+            - 3n-skx
+          stream:
+            - master:
+                branch: 'master'
+                branch-id: 'oper'
+            - '1908':
+                branch: 'rls1908'
+                branch-id: 'oper-rls1908'
+          periodicity: '0 0 * * 6'
       - 'csit-vpp-perf-ndrpdr-weekly-master-{node-arch}':
           node-arch:
             - 2n-clx
             - 2n-skx
             - 3n-skx
             - 3n-hsw
-      - 'csit-dpdk-perf-verify-{stream}-{node-arch}'
-      - 'csit-dpdk-perf-mrr-weekly-master{node-arch}':
-          node-arch:
-            - ''
-            - -2n-clx
-            - -2n-skx
-            - -3n-skx
+          periodicity: '0 0 * * 6'
 
     project: 'csit'
     executor: 'ubuntu1804-us'
     branch: 'master'
     branch-id: 'oper'
-    vpp-mrr-daily-periodicity: '0 14 * * 1,4'
     csit-perf-trial-duration: "1.0"
     csit-perf-trial-multiplicity: "10"
     stream:
       - master:
           branch: 'master'
           branch-id: 'oper'
-      - '1904':
-          branch: 'rls1904'
-          branch-id: 'oper-rls1904'
       - '1908_1':
           branch: 'rls1908_1'
           branch-id: 'oper-rls1908_1'
       - '2001':
           branch: 'rls2001'
           branch-id: 'oper-rls2001'
-
     build-artifact-num-to-keep: 10
-    node-arch:
-      - 2n-clx
-      - 2n-skx
-      - 2n-dnv
-      - 3n-skx
-      - 3n-hsw
-      - 3n-dnv
-      - 3n-tsh:
-          executor: 'ubuntu1804arm-us'
+
 
 - job-template:
     name: 'csit-vpp-perf-verify-{stream}-{node-arch}'
@@ -258,7 +280,7 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: '{vpp-mrr-daily-periodicity}'
+      - timed: '{periodicity}'
 
     builders:
       - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
@@ -278,7 +300,7 @@
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-vpp-perf-mrr-weekly-master-{node-arch}'
+    name: 'csit-vpp-perf-mrr-weekly-{stream}-{node-arch}'
 
     description: |
       <ul>
@@ -333,7 +355,7 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: '0 0 * * 6'
+      - timed: '{periodicity}'
 
     builders:
       - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
@@ -403,7 +425,7 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: '0 0 * * 6'
+      - timed: '{periodicity}'
 
     builders:
       - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
@@ -587,7 +609,7 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: '0 0 * * 6'
+      - timed: '{periodicity}'
 
     builders:
       - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
diff --git a/jjb/csit/csit-tox.yaml b/jjb/csit/csit-tox.yaml
index 9c54cd1c9..3f405e40b 100644
--- a/jjb/csit/csit-tox.yaml
+++ b/jjb/csit/csit-tox.yaml
@@ -23,8 +23,6 @@
     stream:
       - master:
           branch: 'master'
-      - '1904':
-          branch: 'rls1904'
       - '1908_1':
           branch: 'rls1908_1'
       - '2001':
diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml
index 9fb768a5d..5ac2cbd5b 100644
--- a/jjb/csit/csit-vpp-device.yaml
+++ b/jjb/csit/csit-vpp-device.yaml
@@ -25,46 +25,46 @@
           trigger: 'gerrit-trigger-csit-vpp-devicetest-manual'
     jobs:
       - 'csit-vpp-device-{stream}-{os}-{node-arch}'
-      - 'csit-vpp-device-{stream_timed}-{os}-{node-arch}-semiweekly'
-      - 'csit-vpp-device-{stream_timed}-{os}-{node-arch}-weekly'
-      - 'csit-vpp-device-master-ubuntu1804-1n-tx2-csit-verify-hourly'
-      - 'csit-vpp-device-master-ubuntu1804-1n-tx2-vpp-verify-hourly'
+      - 'csit-vpp-device-{stream}-{os}-{node-arch}-semiweekly':
+           stream:
+             - master:
+                branch: 'master'
+                branch-id: 'oper'
+             - '1908':
+                branch: 'rls1908_1'
+                branch-id: 'oper-rls1908_1'
+             - '2001':
+                branch: 'rls2001'
+                branch-id: 'oper-rls2001'
+      - 'csit-vpp-device-{stream}-{os}-{node-arch}-weekly':
+           stream:
+             - master:
+                branch: 'master'
+                branch-id: 'oper'
+             - '1908':
+                branch: 'rls1908_1'
+                branch-id: 'oper-rls1908_1'
+             - '2001':
+                branch: 'rls2001'
+                branch-id: 'oper-rls2001'
+      - 'csit-vpp-device-master-{os}-1n-tx2-csit-verify-hourly'
+      - 'csit-vpp-device-master-{os}-1n-tx2-vpp-verify-hourly'
 
     project: 'csit'
     executor: 'vpp-csit-device'
     branch: 'master'
     branch-id: 'oper'
     trigger: 'gerrit-trigger-csit-vpp-devicetest-full'
-    stream_timed:
-      - master:
-          branch: 'master'
-          branch-id: 'oper'
-      - '2001':
-          branch: 'rls2001'
-          branch-id: 'oper-rls2001'
     stream:
       - master:
           branch: 'master'
           branch-id: 'oper'
-      - '1904':
-          branch: 'rls1904'
-          branch-id: 'oper-rls1904'
       - '1908':
           branch: 'rls1908_1'
           branch-id: 'oper-rls1908_1'
       - '2001':
           branch: 'rls2001'
           branch-id: 'oper-rls2001'
-    exclude:
-      - stream: '1904'
-        os: 'ubuntu1804'
-        node-arch: '1n-tx2'
-      - stream_timed: '1908'
-        os: 'ubuntu1804'
-        node-arch: '1n-tx2'
-      - stream_timed: 'master'
-        os: 'ubuntu1804'
-        node-arch: '1n-tx2'
 
 - job-template:
     name: 'csit-vpp-device-{stream}-{os}-{node-arch}'
@@ -164,7 +164,7 @@
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-vpp-device-{stream_timed}-{os}-{node-arch}-semiweekly'
+    name: 'csit-vpp-device-{stream}-{os}-{node-arch}-semiweekly'
     description: |
       <ul>
           <li>objective
@@ -248,7 +248,7 @@
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-vpp-device-{stream_timed}-{os}-{node-arch}-weekly'
+    name: 'csit-vpp-device-{stream}-{os}-{node-arch}-weekly'
     description: |
       <ul>
           <li>objective
@@ -333,7 +333,7 @@
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-vpp-device-master-ubuntu1804-1n-tx2-csit-verify-hourly'
+    name: 'csit-vpp-device-master-{os}-1n-tx2-csit-verify-hourly'
     description: |
       <ul>
           <li>objective
@@ -413,7 +413,7 @@
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-vpp-device-master-ubuntu1804-1n-tx2-vpp-verify-hourly'
+    name: 'csit-vpp-device-master-{os}-1n-tx2-vpp-verify-hourly'
     description: |
       <ul>
           <li>objective
diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 5de96f9c7..2c75b308d 100644
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -17,7 +17,12 @@
     description: 'CSIT Jenkins jobs.'
 
     jobs:
-      - 'csit-docs-merge-{stream_timed}'
+      - 'csit-docs-merge-{stream}':
+          stream:
+            - master:
+                branch: 'master'
+            - '2001':
+                branch: 'rls2001'
       - 'csit-report-merge-{stream}'
       - 'csit-trending-daily-master'
 
@@ -26,16 +31,9 @@
     executor: 'ubuntu1804-us'
     executor-large: 'ubuntu1804-l'
     build-artifact-num-to-keep: 10
-    stream_timed:
-      - master:
-          branch: 'master'
-      - '2001':
-          branch: 'rls2001'
     stream:
       - master:
           branch: 'master'
-      - '1904':
-          branch: 'rls1904'
       - '1908':
           branch: 'rls1908'
       - '1908_1':
@@ -50,7 +48,7 @@
     project-name: csit
 
 - job-template:
-    name: 'csit-docs-merge-{stream_timed}'
+    name: 'csit-docs-merge-{stream}'
 
     project-type: freestyle
     node: '{executor}'
@@ -90,7 +88,7 @@
 
     triggers:
       - reverse:
-          jobs: 'csit-vpp-device-{stream_timed}-ubuntu1804-1n-skx-weekly'
+          jobs: 'csit-vpp-device-{stream}-ubuntu1804-1n-skx-weekly'
           result: 'success'
       - gerrit:
           server-name: 'Primary'