make verify: archive failed VPP unit test data

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

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index a4e7c7d..d98ecd0 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -9,6 +9,7 @@
         - 'vpp-make-test-docs-merge-{stream}'
         - 'vpp-make-test-docs-verify-{stream}'
         - 'vpp-test-packagecloud-{stream}-{os}'
+        - 'vpp-promote-{stream}-{os}'
 
     project: 'vpp'
     os:
@@ -35,6 +36,9 @@
         - '1704':
             branch: 'stable/1704'
             repo-stream-part: 'stable.1704'
+        - '1707':
+            branch: 'stable/1707'
+            repo-stream-part: 'stable.1707'
     type:
         - short
         - long
@@ -64,6 +68,9 @@
         - '1704':
             branch: 'stable/1704'
             repo-stream-part: 'stable.1704'
+        - '1707':
+            branch: 'stable/1707'
+            repo-stream-part: 'stable.1707'
     os: ubuntu1604
 
 
@@ -123,6 +130,7 @@
             default-excludes: false
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
+            archive-artifacts: '/tmp/vpp-failed-unittests/*/*'
 
 - job-template:
     name: 'vpp-verify-image-{stream}-{os}'
@@ -235,6 +243,10 @@
             files:
               - file-id: '.packagecloud'
                 target: '/home/jenkins'
+        - config-file-provider:
+            files:
+              - file-id: 'packagecloud_api'
+                target: '/home/jenkins'
         - maven-target:
             maven-version: 'mvn33-new'
             goals: '--version'
@@ -311,13 +323,15 @@
 
     builders:
         - shell:
-            !include-raw-escape: include-raw-vpp-checkstyle.sh
+            !include-raw-escape:
+                - include-raw-vpp-checkstyle.sh
         - shell:
             !include-raw-escape:
                 - ../scripts/setup_vpp_dpdk_dev_env.sh
                 - include-raw-vpp-build.sh
         - shell:
-            !include-raw-escape: include-raw-vpp-csit-functional.sh
+            !include-raw-escape:
+                - include-raw-vpp-csit-functional.sh
 
     publishers:
         - archive-artifacts:
@@ -381,6 +395,8 @@
                     comment-contains-value: 'vpp-verify-perf-vxlan'
                 - comment-added-contains-event:
                     comment-contains-value: 'vpp-verify-perf-vhost'
+                - comment-added-contains-event:
+                    comment-contains-value: 'vpp-verify-perf-acl'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{project}'
@@ -399,7 +415,8 @@
                 - ../scripts/setup_vpp_dpdk_dev_env.sh
                 - include-raw-vpp-build.sh
         - shell:
-            !include-raw-escape: include-raw-vpp-csit-verify-perf.sh
+            !include-raw-escape:
+                - include-raw-vpp-csit-verify-perf.sh
 
     publishers:
         - archive-artifacts:
@@ -516,6 +533,9 @@
             build-timeout: '{build-timeout}'
 
     triggers:
+        - reverse:
+            jobs: 'vpp-merge-{stream}-ubuntu1604'
+            result: 'success'
         - gerrit:
             server-name: 'Primary'
             trigger-on:
@@ -651,6 +671,9 @@
             build-timeout: '{build-timeout}'
 
     triggers:
+        - reverse:
+            jobs: 'vpp-merge-{stream}-ubuntu1604'
+            result: 'success'
         - gerrit:
             server-name: 'Primary'
             trigger-on:
@@ -760,3 +783,68 @@
             default-excludes: false
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
+
+- job-template:
+    name: 'vpp-promote-{stream}-{os}'
+
+    project-type: freestyle
+    node: '{os}-basebuild-4c-4g'
+
+    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}'
+      - os-parameter:
+          os: '{os}'
+      - stream-parameter:
+          stream: '{stream}'
+      - repo-name-parameter:
+          repo-name: '{repo-stream-part}.{repo-os-part}'
+
+    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: 'test-pkgcloud'
+
+    builders:
+      - config-file-provider:
+          files:
+            - file-id: '.packagecloud'
+              target: '/home/jenkins'
+      - config-file-provider:
+          files:
+            - file-id: 'packagecloud_api'
+              target: '/home/jenkins'
+      - shell:
+          !include-raw-escape: include-raw-vpp-checkstyle.sh
+      - shell:
+          !include-raw-escape: include-raw-vpp-test-checkstyle.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_vpp_dpdk_dev_env.sh
+          - include-raw-vpp-build.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/packagecloud_promote.sh
+
+    publishers:
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'