Merge "VPP: Remove unused cpoc and promote jobs"

[ci-management.git] / jjb / csit / csit.yaml

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index a5639c9..324420e 100644 (file)
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -29,6 +29,7 @@
         - 'csit-docs-merge-{stream_timed}'
         - 'csit-docs-verify-{stream}'
         - 'csit-report-merge-{stream}'
+        - 'csit-trending-daily-master'
         - 'csit-vpp-perf-trend-daily-master'
         - 'csit-vpp-perf-trend-semi-weekly-master'
         - 'csit-vpp-perf-check-{stream}'
@@ -49,9 +50,6 @@
         - master:
             branch: 'master'
             branch-id: 'oper'
-        - '1801':
-            branch: 'rls1801'
-            branch-id: 'oper-rls1801'
     stream:
         - master:
             branch: 'master'
@@ -1656,6 +1654,60 @@
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
+- job-template:
+    name: 'csit-trending-daily-master'
+
+    project-type: freestyle
+    node: 'ubuntu1604-basebuild-8c-32g'
+    concurrent: false
+
+    logrotate:
+        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}'
+        - maven-exec:
+            maven-version: 'mvn33-new'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: 'jenkins-gerrit-credentials'
+            refspec: ''
+            choosing-strategy: 'default'
+
+    wrappers:
+        - fdio-infra-wrappers-non-activity-timeout:
+            build-timeout: '{build-timeout}'
+
+    triggers:
+        - reverse:
+            jobs: 'csit-vpp-perf-mrr-daily-master'
+            result: 'success'
+
+    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-cpta.sh
+
+    publishers:
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
+
 - job-template:
     name: 'csit-vpp-perf-trend-daily-master'
 
@@ -2574,6 +2626,9 @@
         - fdio-infra-wrappers-non-activity-timeout:
             build-timeout: '{build-timeout}'
 
+    triggers:
+        - timed: 'H H(21-22) * * *'
+
     builders:
         - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
         - inject: