summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/csit/csit.yaml75
-rw-r--r--jjb/sweetcomb/sweetcomb.yaml2
2 files changed, 76 insertions, 1 deletions
diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index fc5af7df4..41979aeab 100644
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -36,6 +36,7 @@
- 'csit-docs-verify-{stream}'
- 'csit-report-merge-{stream}'
- 'csit-report-merge-1901_2'
+ - 'csit-report-merge-1904_1'
- 'csit-trending-daily-master'
- 'csit-dpdk-perf-verify-{stream}-{topo}-{arch}'
- 'csit-dpdk-perf-mrr-weekly-master'
@@ -766,6 +767,80 @@
maven-version: 'mvn33-new'
- job-template:
+ name: 'csit-report-merge-1904_1'
+
+ project-type: freestyle
+ node: 'ubuntu1604-basebuild-8c-32g'
+ concurrent: 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_1'
+ - maven-exec:
+ maven-version: 'mvn33-new'
+
+ 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_1'
+ 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:
+ - archive:
+ artifacts: 'resources/tools/presentation/csit.report.tar.gz'
+ allow-empty: 'true'
+ fingerprint: false
+ only-if-success: true
+ default-excludes: false
+
+ - fdio-infra-shiplogs:
+ maven-version: 'mvn33-new'
+
+- job-template:
name: 'csit-trending-daily-master'
project-type: freestyle
diff --git a/jjb/sweetcomb/sweetcomb.yaml b/jjb/sweetcomb/sweetcomb.yaml
index 64be1fd3b..baf29f878 100644
--- a/jjb/sweetcomb/sweetcomb.yaml
+++ b/jjb/sweetcomb/sweetcomb.yaml
@@ -20,7 +20,7 @@
jobs:
- 'sweetcomb-verify-{stream}-{os}'
- 'sweetcomb-merge-{stream}-{os}'
- - 'sweetcomb-test-{stream}-ubuntu1604'
+ #- 'sweetcomb-test-{stream}-ubuntu1604'
project: 'sweetcomb'
os: