Merge "Do not skip commit-message-only checkstyle"

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

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 46a04fe..a866115 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -64,7 +64,7 @@
       - '1908':
           branch: 'stable/1908'
           repo-stream-part: 'stable.1908'
-    os: ubuntu1604
+    os: ubuntu1804
 
 - project:
     name: vpp-perpatch
@@ -182,16 +182,7 @@
     project-type: freestyle
     node: '{os}-us'
     concurrent: true
-    archive-artifacts: >
-      **/build-root/*.rpm
-      **/build-root/*.deb
-      **/dpdk/*.rpm
-      **/dpdk/*.deb
-      **/tmp/vpp-failed-unittests/*/* **/core
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
+    archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
 
     triggers:
       - gerrit-trigger-checkstyle:
@@ -251,15 +242,6 @@
 
     project-type: freestyle
     node: '{os}-us'
-    archive-artifacts: >
-      **/build-root/*.rpm
-      **/build-root/*.deb
-      **/dpdk/*.rpm
-      **/dpdk/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -334,15 +316,7 @@
     project-type: freestyle
     node: '{os}arm-us'
     concurrent: true
-    archive-artifacts: >
-      **/build-root/*.rpm
-      **/build-root/*.deb
-      **/dpdk/*.rpm
-      **/dpdk/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
+    archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -393,7 +367,6 @@
     publishers:
       - fdio-infra-shiplogs:
           maven-version: 'mvn36'
-          archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1
@@ -404,15 +377,6 @@
 
     project-type: freestyle
     node: '{os}arm-m'
-    archive-artifacts: >
-      **/build-root/*.rpm
-      **/build-root/*.deb
-      **/dpdk/*.rpm
-      **/dpdk/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -489,6 +453,7 @@
     project-type: freestyle
     node: '{os}-us'
     concurrent: true
+    archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -504,7 +469,7 @@
       - os-parameter:
           os: '{os}'
       - repo-name-parameter:
-          repo-name: '{repo-stream-part}.ubuntu.xenial.main'
+          repo-name: '{repo-stream-part}.ubuntu.bionic.main'
 
     scm:
       - gerrit-trigger-scm:
@@ -523,7 +488,7 @@
             - patchset-created-event:
                 exclude-drafts: 'true'
                 exclude-trivial-rebase: 'false'
-                exclude-no-code-change: 'true'
+                exclude-no-code-change: 'false'
             - draft-published-event
             - comment-added-contains-event:
                 comment-contains-value: 'checkstylecheck'
@@ -578,7 +543,6 @@
     publishers:
       - fdio-infra-shiplogs:
           maven-version: 'mvn36'
-          archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
       - naginator:
           rerun-unstable-builds: true
           max-failed-builds: 1
@@ -590,15 +554,7 @@
     project-type: freestyle
     node: '{os}-us'
     concurrent: true
-    archive-artifacts: >
-      **/build-root/*.rpm
-      **/build-root/*.deb
-      **/dpdk/*.rpm
-      **/dpdk/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
+    archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -648,7 +604,6 @@
     publishers:
       - fdio-infra-shiplogs:
           maven-version: 'mvn36'
-          archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 2
@@ -660,6 +615,7 @@
     project-type: freestyle
     node: 'ubuntu1804-us'
     concurrent: true
+    archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -673,7 +629,7 @@
       - gerrit-parameter:
           branch: '{branch}'
       - os-parameter:
-          os: 'ubuntu1604'
+          os: 'ubuntu1804'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.ubuntu.bionic.main'
       - stream-parameter:
@@ -705,7 +661,6 @@
     publishers:
       - fdio-infra-shiplogs:
           maven-version: 'mvn36'
-          archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1
@@ -717,6 +672,7 @@
     project-type: freestyle
     node: 'ubuntu1804-us'
     concurrent: true
+    archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -808,22 +764,12 @@
           fixed: true
       - fdio-infra-shiplogs:
           maven-version: 'mvn36'
-          archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
 
 - job-template:
     name: 'vpp-merge-{stream}-{os}'
 
     project-type: freestyle
     node: '{os}-us'
-    archive-artifacts: >
-      **/build-root/*.rpm
-      **/build-root/*.deb
-      **/dpdk/*.rpm
-      **/dpdk/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'