Push to packagecloud before nexus

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

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 14a6a2b..ba11bd8 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -56,7 +56,6 @@
     name: vpp-misc
     jobs:
         - 'vpp-csit-verify-virl-{stream}'
-        - 'vpp-csit-verify-hw-perf-{stream}'
         - 'vpp-checkstyle-verify-{stream}'
     project: 'vpp'
     stream:
@@ -74,6 +73,17 @@
             repo-stream-part: 'stable.1807'
     os: ubuntu1604
 
+- project:
+    name: vpp-perpatch
+    jobs:
+        - 'vpp-csit-verify-perf-{stream}-2n-skx'
+    project: 'vpp'
+    stream:
+        - master:
+            branch: 'master'
+            repo-stream-part: 'master'
+    os: ubuntu1604
+
 - project:
     name: vpp-master-only
     jobs:
@@ -137,6 +147,8 @@
             os: '{os}'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.{repo-os-part}'
+        - stream-parameter:
+            stream: '{stream}'
 
     scm:
         - gerrit-trigger-scm:
@@ -206,7 +218,7 @@
 
     wrappers:
         - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+            build-timeout: 120
 
     triggers:
         - gerrit-trigger-patch-merged:
@@ -279,6 +291,8 @@
             os: '{os}'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.{repo-os-part}'
+        - stream-parameter:
+            stream: '{stream}'
 
     scm:
         - gerrit-trigger-scm:
@@ -288,19 +302,20 @@
 
     wrappers:
         - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+            build-timeout: 120
 
     triggers:
-        - gerrit-trigger-checkstyle:
+        - gerrit-trigger-checkstyle-nonvoting:
             name: '{project}'
             branch: '{branch}'
 
     builders:
         - shell:
-            !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
+            !include-raw-escape: ../scripts/setup_vpp_ubuntu_arm_test.sh
         - shell:
             !include-raw-escape:
                 - ../scripts/setup_vpp_dpdk_dev_env.sh
+                - include-raw-vpp-parallel-vars.sh
                 - include-raw-vpp-arm-build.sh
     publishers:
         - archive:
@@ -349,7 +364,7 @@
 
     wrappers:
         - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+            build-timeout: 120
 
     triggers:
         - gerrit-trigger-patch-merged:
@@ -383,11 +398,11 @@
             global-settings-file: 'global-settings'
         - shell:
             !include-raw-escape:
-                - ../scripts/maven_push_functions.sh
-                - include-raw-vpp-maven-push.sh
+                - ../scripts/packagecloud_push.sh
         - shell:
             !include-raw-escape:
-                - ../scripts/packagecloud_push.sh
+                - ../scripts/maven_push_functions.sh
+                - include-raw-vpp-maven-push.sh
 
     publishers:
         - archive:
@@ -491,8 +506,6 @@
             max-failed-builds: 1
             fixed-delay: 90
 
-
-
 - job-template:
     name: 'vpp-verify-{stream}-{os}'
 
@@ -515,6 +528,8 @@
             os: '{os}'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.{repo-os-part}'
+        - stream-parameter:
+            stream: '{stream}'
 
     scm:
         - gerrit-trigger-scm:
@@ -524,7 +539,7 @@
 
     wrappers:
         - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+            build-timeout: 120
 
     triggers:
         - gerrit-trigger-checkstyle:
@@ -575,6 +590,8 @@
             os: 'ubuntu1604'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.ubuntu.xenial.main'
+        - stream-parameter:
+            stream: '{stream}'
 
     scm:
         - gerrit-trigger-scm:
@@ -679,11 +696,11 @@
             global-settings-file: 'global-settings'
         - shell:
             !include-raw-escape:
-                - ../scripts/maven_push_functions.sh
-                - include-raw-vpp-maven-push.sh
+                - ../scripts/packagecloud_push.sh
         - shell:
             !include-raw-escape:
-                - ../scripts/packagecloud_push.sh
+                - ../scripts/maven_push_functions.sh
+                - include-raw-vpp-maven-push.sh
 
     publishers:
         - archive:
@@ -726,6 +743,8 @@
         - string:
             name: CSIT_REF
             description: "Also testing CSIT_REF"
+        - stream-parameter:
+            stream: '{stream}'
 
     scm:
         - gerrit-trigger-scm:
@@ -735,7 +754,7 @@
 
     wrappers:
         - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+            build-timeout: '90'
 
     triggers:
         - gerrit-trigger-checkstyle-nonvoting:
@@ -766,17 +785,12 @@
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
-        - naginator:
-            rerun-unstable-builds: false
-            max-failed-builds: 1
-            fixed-delay: 90
-
 - job-template:
-    name: 'vpp-csit-verify-hw-perf-{stream}'
+    name: 'vpp-csit-verify-perf-{stream}-2n-skx'
 
     project-type: freestyle
     node: '{os}-basebuild-8c-32g'
-    concurrent: false
+    concurrent: true
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -792,9 +806,21 @@
         - os-parameter:
             os: '{os}'
         - repo-name-parameter:
-            repo-name: '{repo-stream-part}.ubuntu.xenial.main'
-        - is-csit-vpp-job-parameter:
-            is-csit-vpp-job: 'True'
+            repo-name: '{repo-stream-part}.ubuntu.bionic.main'
+        - gerrit-refspec-parameter
+        - gerrit-event-type-parameter
+        - gerrit-event-comment-text-parameter
+        - gerrit-csit-refspec-parameter
+        - string:
+            name: CSIT_PERF_TRIAL_DURATION
+            default: "1.0"
+            description: "Duration of a trial measurement in BMRR tests."
+        - string:
+            name: CSIT_PERF_TRIAL_MULTIPLICITY
+            default: "30"
+            description: "Number of subsamples for BMRR tests."
+        - stream-parameter:
+            stream: '{stream}'
 
     scm:
         - gerrit-trigger-scm:
@@ -804,7 +830,7 @@
 
     wrappers:
         - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: 30
+            build-timeout: 300
 
     triggers:
         - gerrit:
@@ -819,30 +845,23 @@
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
             skip-vote:
-                successful: false
-                failed: false
-                unstable: false
-                notbuilt: false
+                successful: true
+                failed: true
+                unstable: true
+                notbuilt: true
 
     builders:
-        - shell: 'echo "VPP_BRANCH={branch}" > $WORKSPACE/variables.prop'
-        - inject:
-            properties-file: variables.prop
         - shell:
             !include-raw-escape:
-                - ../scripts/setup_vpp_dpdk_dev_env.sh
-                - include-raw-vpp-build.sh
-        - shell:
-            !include-raw-escape:
-                - include-raw-vpp-csit-verify-perf.sh
+                - clone-csit-run-main.sh
 
     publishers:
         - archive-artifacts:
-            artifacts: 'csit/archive/*.*'
+            artifacts: 'csit_new/*.*, csit_parent/*.*'
             latest-only: false
 
         - robot-report:
-            output-path: 'csit/archive/*.*'
+            output-path: 'csit_new/'
 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
@@ -878,6 +897,8 @@
             os: 'ubuntu1604'
         - maven-exec:
             maven-version: 'mvn33-new'
+        - stream-parameter:
+            stream: '{stream}'
 
     scm:
         - gerrit-trigger-scm:
@@ -945,6 +966,8 @@
             os: 'ubuntu1604'
         - maven-exec:
             maven-version: 'mvn33-new'
+        - stream-parameter:
+            stream: '{stream}'
 
     scm:
         - gerrit-trigger-scm:
@@ -1029,6 +1052,8 @@
             os: 'ubuntu1604'
         - maven-exec:
             maven-version: 'mvn33-new'
+        - stream-parameter:
+            stream: '{stream}'
 
     scm:
         - gerrit-trigger-scm:
@@ -1096,6 +1121,8 @@
             os: 'ubuntu1604'
         - maven-exec:
             maven-version: 'mvn33-new'
+        - stream-parameter:
+            stream: '{stream}'
 
     scm:
         - gerrit-trigger-scm: