Add CSIT rls1908_1 branch and revert cadence of csit mrr-daily jobs

Change-Id: I08e2150d78f3145bce6daf2e06e590bdf1fab63c
Signed-off-by: Jan Gelety <jgelety@cisco.com>

5 files changed, 13 insertions, 174 deletions

diff --git a/jjb/csit/csit-func.yaml b/jjb/csit/csit-func.yaml
index 86c9f1c83..cbb306c37 100644
--- a/jjb/csit/csit-func.yaml
+++ b/jjb/csit/csit-func.yaml
@@ -36,9 +36,6 @@
       - master:
           branch: 'master'
           branch-id: 'oper'
-      - '1908':
-          branch: 'rls1908'
-          branch-id: 'oper-rls1908'
     stream:
       - master:
           branch: 'master'
@@ -46,8 +43,8 @@
           branch: 'rls1901'
       - '1904':
           branch: 'rls1904'
-      - '1908':
-          branch: 'rls1908'
+      - '1908_1':
+          branch: 'rls1908_1'
 
 - job-template:
     name: 'csit-vpp-verify-{stream_timed}-{os}-weekly'
diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index 25cb21b7c..21a50e19c 100644
--- a/jjb/csit/csit-perf.yaml
+++ b/jjb/csit/csit-perf.yaml
@@ -29,7 +29,7 @@
             - -3n-dnv
             - -3n-tsh:
                 executor: 'ubuntu1804arm-us'
-                vpp-mrr-daily-periodicity: '0 16 * * 6'
+                vpp-mrr-daily-periodicity: '0 14 * * *'
       - 'csit-vpp-perf-mrr-weekly-master-{node-arch}':
           node-arch:
             - 2n-clx
@@ -54,7 +54,7 @@
     ligato-executor: 'ubuntu1804-basebuild-4c-4g'
     branch: 'master'
     branch-id: 'oper'
-    vpp-mrr-daily-periodicity: '0 14 * * 1,4'
+    vpp-mrr-daily-periodicity: '0 2,14 * * *'
     stream:
       - master:
           branch: 'master'
@@ -68,9 +68,9 @@
           branch: 'rls1904'
           branch-id: 'oper-rls1904'
           executor: 'ubuntu1804-us'
-      - '1908':
-          branch: 'rls1908'
-          branch-id: 'oper-rls1908'
+      - '1908_1':
+          branch: 'rls1908_1'
+          branch-id: 'oper-rls1908_1'
           executor: 'ubuntu1804-us'
 
     build-artifact-num-to-keep: 10
diff --git a/jjb/csit/csit-tox.yaml b/jjb/csit/csit-tox.yaml
index a4c3182b3..49603a1ca 100644
--- a/jjb/csit/csit-tox.yaml
+++ b/jjb/csit/csit-tox.yaml
@@ -14,8 +14,8 @@
           branch: 'rls1901'
       - '1904':
           branch: 'rls1904'
-      - '1908':
-          branch: 'rls1908'
+      - '1908_1':
+          branch: 'rls1908_1'
 
 - job-template:
     name: 'csit-verify-tox-{stream}'
diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml
index 2d1b3cedf..70dee6d21 100644
--- a/jjb/csit/csit-vpp-device.yaml
+++ b/jjb/csit/csit-vpp-device.yaml
@@ -39,9 +39,6 @@
       - master:
           branch: 'master'
           branch-id: 'oper'
-      - '1908':
-          branch: 'rls1908'
-          branch-id: 'oper-rls1908'
     stream:
       - master:
           branch: 'master'
@@ -53,8 +50,8 @@
           branch: 'rls1904'
           branch-id: 'oper-rls1904'
       - '1908':
-          branch: 'rls1908'
-          branch-id: 'oper-rls1908'
+          branch: 'rls1908_1'
+          branch-id: 'oper-rls1908_1'
     exclude:
       - stream: '1901'
         os: 'ubuntu1804'
diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 2f1dc8554..248f93594 100644
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -19,8 +19,6 @@
     jobs:
       - 'csit-docs-merge-{stream_timed}'
       - 'csit-report-merge-{stream}'
-      - 'csit-report-merge-1901_3'
-      - 'csit-report-merge-1904_2'
       - 'csit-trending-daily-master'
 
     project: 'csit'
@@ -32,9 +30,6 @@
       - master:
           branch: 'master'
           executor: 'ubuntu1804-us'
-      - '1908':
-          branch: 'rls1908'
-          executor: 'ubuntu1804-us'
     stream:
       - master:
           branch: 'master'
@@ -45,8 +40,8 @@
       - '1904':
           branch: 'rls1904'
           executor: 'ubuntu1804-us'
-      - '1908':
-          branch: 'rls1908'
+      - '1908_1':
+          branch: 'rls1908_1'
           executor: 'ubuntu1804-us'
 
 - project:
@@ -209,156 +204,6 @@
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-report-merge-1901_3'
-
-    project-type: freestyle
-    node: '{executor-large}'
-    concurrent: false
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: 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: 'rls1901_3'
-      - maven-exec:
-          maven-version: 'mvn33-new'
-      - 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: 'default'
-
-    wrappers:
-      - fdio-infra-wrappers-non-activity-timeout:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit:
-          server-name: 'Primary'
-          trigger-on:
-            - comment-added-contains-event:
-                comment-contains-value: 'run-report'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/rls1901_3'
-          skip-vote:
-            successful: true
-            failed: true
-            unstable: true
-            notbuilt: true
-
-    builders:
-      - maven-target:
-          maven-version: 'mvn33-new'
-          goals: '--version'
-          settings: 'csit-settings'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - provide-maven-settings:
-          settings-file: 'csit-settings'
-          global-settings-file: 'global-settings'
-      - shell:
-          !include-raw-escape: include-raw-csit-report.sh
-
-    publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
-
-- job-template:
-    name: 'csit-report-merge-1904_2'
-
-    project-type: freestyle
-    node: '{executor-large}'
-    concurrent: false
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: 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: 'rls1904_2'
-      - maven-exec:
-          maven-version: 'mvn33-new'
-      - 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: 'default'
-
-    wrappers:
-      - fdio-infra-wrappers-non-activity-timeout:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit:
-          server-name: 'Primary'
-          trigger-on:
-            - comment-added-contains-event:
-                comment-contains-value: 'run-report'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/rls1904_2'
-          skip-vote:
-            successful: true
-            failed: true
-            unstable: true
-            notbuilt: true
-
-    builders:
-      - maven-target:
-          maven-version: 'mvn33-new'
-          goals: '--version'
-          settings: 'csit-settings'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - provide-maven-settings:
-          settings-file: 'csit-settings'
-          global-settings-file: 'global-settings'
-      - shell:
-          !include-raw-escape: include-raw-csit-report.sh
-
-    publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
-
-- job-template:
     name: 'csit-trending-daily-master'
 
     project-type: freestyle