X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=3221c610e4d1ca6557267da420f60c176f823b30;hb=95a8c42349da54996cdc2c747d5d52b0ffed2e0d;hp=f433ed032d465aa616ef02f53866b6e60ee2dc3c;hpb=8550d2404b238e95f761077fcbc11db38b6e8042;p=ci-management.git

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index f433ed032..3221c610e 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -4,8 +4,6 @@
     jobs:
         - 'vpp-verify-{stream}-{os}'
         - 'vpp-merge-{stream}-{os}'
-        - 'vpp-verify-os-{stream}-{os}'
-        - 'vpp-merge-os-{stream}-{os}'
         - 'vpp-docs-merge-{stream}'
         - 'vpp-docs-verify-{stream}'
         - 'vpp-make-test-docs-merge-{stream}'
@@ -17,22 +15,20 @@
           repo-os-part: 'ubuntu.xenial.main'
       - centos7:
           repo-os-part: 'centos7'
-      - opensuse:
-          repo-os-part: 'opensuse'
 
     stream:
         - master:
             branch: 'master'
             repo-stream-part: 'master'
-        - '1710':
-            branch: 'stable/1710'
-            repo-stream-part: 'stable.1710'
         - '1801':
             branch: 'stable/1801'
             repo-stream-part: 'stable.1801'
         - '1804':
             branch: 'stable/1804'
             repo-stream-part: 'stable.1804'
+        - '1807':
+            branch: 'stable/1807'
+            repo-stream-part: 'stable.1807'
     type:
         - short
         - long
@@ -55,15 +51,11 @@
         - master:
             branch: 'master'
             repo-stream-part: 'master'
-        - '1804':
-            branch: 'stable/1804'
-            repo-stream-part: 'stable.1804'
 
 - project:
     name: vpp-misc
     jobs:
         - 'vpp-csit-verify-virl-{stream}'
-        - 'vpp-csit-verify-os-virl-{stream}'
         - 'vpp-csit-verify-hw-perf-{stream}'
         - 'vpp-checkstyle-verify-{stream}'
     project: 'vpp'
@@ -71,31 +63,33 @@
         - master:
             branch: 'master'
             repo-stream-part: 'master'
-        - '1710':
-            branch: 'stable/1710'
-            repo-stream-part: 'stable.1710'
         - '1801':
             branch: 'stable/1801'
             repo-stream-part: 'stable.1801'
         - '1804':
             branch: 'stable/1804'
             repo-stream-part: 'stable.1804'
+        - '1807':
+            branch: 'stable/1807'
+            repo-stream-part: 'stable.1807'
     os: ubuntu1604
 
 - project:
     name: vpp-master-only
     jobs:
         - 'vpp-beta-verify-{stream}-{os}'
+        - 'vpp-beta-merge-{stream}-{os}'
     project: 'vpp'
     stream:
         - master:
             branch: 'master'
             repo-stream-part: 'master'
+        - '1807':
+            branch: 'stable/1807'
+            repo-stream-part: 'stable.1807'
     os:
       - ubuntu1804:
           repo-os-part: 'ubuntu.bionic.main'
-      - osleap15:
-          repo-os-part: 'osleap15'
 
 - project:
     name: vpp-arm
@@ -110,6 +104,9 @@
         - '1804':
             branch: 'stable/1804'
             repo-stream-part: 'stable.1804'
+        - '1807':
+            branch: 'stable/1807'
+            repo-stream-part: 'stable.1807'
     os:
       - ubuntu1604:
           repo-os-part: 'ubuntu-arm.xenial.main'
@@ -121,28 +118,9 @@
     node: '{os}-us'
     concurrent: true
     triggers:
-        - gerrit:
-            server-name: 'Primary'
-            trigger-on:
-                - patchset-uploaded-event: 'false'
-                - comment-added-contains-event:
-                    comment-contains-value: 'betacheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'checkstyle_success'
-            projects:
-                - project-compare-type: 'ANT'
-                  project-pattern: '{project}'
-                  branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/{branch}'
-            skip-vote:
-                successful: true
-                failed: true
-                unstable: true
-                notbuilt: true
-            override-votes: true
-            gerrit-build-notbuilt-verified-value: 0
-            notbuilt-message: 'Automatic retry of failed jobs may be in process. A proper vote should be set when retry completes.'
+        - gerrit-trigger-checkstyle:
+            name: '{project}'
+            branch: '{branch}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -175,6 +153,7 @@
             !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
         - shell:
             !include-raw-escape:
+                - ../scripts/setup_vpp_dpdk_dev_env.sh
                 - include-raw-vpp-build.sh
     publishers:
         - archive:
@@ -191,6 +170,93 @@
             max-failed-builds: 1
             fixed-delay: 90
 
+- job-template:
+    name: 'vpp-beta-merge-{stream}-{os}'
+
+    project-type: freestyle
+    node: '{os}-us'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: 100
+        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}'
+        - maven-project-parameter:
+            maven: 'mvn33-new'
+        - maven-exec:
+            maven-version: 'mvn33-new'
+        - 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: ''
+            choosing-strategy: 'default'
+
+    wrappers:
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
+
+    triggers:
+        - gerrit-trigger-patch-merged:
+            name: '{project}'
+            branch: '{branch}'
+
+    builders:
+        - config-file-provider:
+            files:
+              - file-id: '.packagecloud'
+                target: '/root'
+        - config-file-provider:
+            files:
+              - file-id: 'packagecloud_api'
+                target: '/root'
+        - maven-target:
+            maven-version: 'mvn33-new'
+            goals: '--version'
+            settings: 'vpp-settings'
+            settings-type: cfp
+            global-settings: 'global-settings'
+            global-settings-type: cfp
+        - shell:
+            !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
+        - shell:
+            !include-raw-escape:
+                - ../scripts/setup_vpp_dpdk_dev_env.sh
+                - include-raw-vpp-build.sh
+        - provide-maven-settings:
+            settings-file: 'vpp-settings'
+            global-settings-file: 'global-settings'
+        - shell:
+            !include-raw-escape:
+                - ../scripts/packagecloud_push.sh
+        - shell:
+            !include-raw-escape:
+                - ../scripts/maven_push_functions.sh
+                - include-raw-vpp-maven-push.sh
+
+
+    publishers:
+        - archive:
+            artifacts: 'build-root/*.rpm,build-root/*.deb,dpdk/*.rpm,dpdk/*.deb'
+            allow-empty: 'true'
+            fingerprint: false
+            only-if-success: true
+            default-excludes: false
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
+
 - job-template:
     name: 'vpp-arm-verify-{stream}-{os}'
 
@@ -225,7 +291,7 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-trivial-patch-submitted:
+        - gerrit-trigger-checkstyle:
             name: '{project}'
             branch: '{branch}'
 
@@ -246,10 +312,6 @@
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
             archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
-        - naginator:
-            rerun-unstable-builds: false
-            max-failed-builds: 1
-            fixed-delay: 90
 
 - job-template:
     name: 'vpp-arm-merge-{stream}-{os}'
@@ -336,10 +398,6 @@
             default-excludes: false
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
-        - naginator:
-            rerun-unstable-builds: false
-            max-failed-builds: 1
-            fixed-delay: 90
 
 - job-template:
     name: 'vpp-checkstyle-verify-{stream}'
@@ -378,14 +436,34 @@
         - gerrit:
             server-name: 'Primary'
             trigger-on:
+                - patchset-created-event:
+                    exclude-drafts: 'true'
+                    exclude-trivial-rebase: 'false'
+                    exclude-no-code-change: 'true'
+                - draft-published-event
                 - comment-added-contains-event:
                     comment-contains-value: 'checkstylecheck'
+                - comment-added-contains-event:
+                    comment-contains-value: 'docsonly'
+                - comment-added-contains-event:
+                    comment-contains-value: 'recheck'
+                - comment-added-contains-event:
+                    comment-contains-value: 'reverify'
             projects:
                 - project-compare-type: 'ANT'
                   project-pattern: '{project}'
                   branches:
                     - branch-compare-type: 'ANT'
                       branch-pattern: '**/{branch}'
+                  file-paths:
+                    - compare-type: REG_EXP
+                      pattern: ^((?!\/COMMIT_MSG|docs|_abc|_def[\/\.]).)*$
+                  forbidden-file-paths:
+                    - compare-type: REG_EXP
+                      pattern: .*docs\/.*
+                    - compare-type: REG_EXP
+                      pattern: .*extras\/emacs\/.*
+                  disable-strict-forbidden-file-verification: 'true'
             override-votes: true
             gerrit-build-notbuilt-verified-value: 0
             gerrit-build-successful-verified-value: 1
@@ -413,6 +491,8 @@
             max-failed-builds: 1
             fixed-delay: 90
 
+
+
 - job-template:
     name: 'vpp-verify-{stream}-{os}'
 
@@ -447,15 +527,11 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-trivial-patch-submitted:
+        - gerrit-trigger-checkstyle:
             name: '{project}'
             branch: '{branch}'
 
     builders:
-        - 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_ubuntu_docker_test.sh
         - shell:
@@ -511,7 +587,7 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-trivial-patch-submitted:
+        - gerrit-trigger-checkstyle:
             name: '{project}'
             branch: '{branch}'
 
@@ -531,67 +607,6 @@
             max-failed-builds: 1
             fixed-delay: 90
 
-- job-template:
-    name: 'vpp-verify-os-{stream}-{os}'
-
-    project-type: freestyle
-    node: '{os}-basebuild-8c-32g'
-    concurrent: true
-
-    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}'
-        - 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-os-trivial-patch-submitted:
-            name: '{project}'
-            branch: '{branch}'
-
-    builders:
-        - 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_ubuntu_docker_test.sh
-        - shell:
-            !include-raw-escape:
-                - ../scripts/setup_vpp_dpdk_dev_env.sh
-                - include-raw-vpp-build.sh
-    publishers:
-        - archive:
-            artifacts: 'build-root/*.rpm,build-root/*.deb,dpdk/*.rpm,dpdk/*.deb'
-            allow-empty: 'true'
-            fingerprint: false
-            only-if-success: true
-            default-excludes: false
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
-            archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
-
 - job-template:
     name: 'vpp-merge-{stream}-{os}'
 
@@ -684,95 +699,6 @@
             max-failed-builds: 1
             fixed-delay: 90
 
-- job-template:
-    name: 'vpp-merge-os-{stream}-{os}'
-
-    project-type: freestyle
-    node: '{os}-basebuild-8c-32g'
-
-    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}'
-        - maven-project-parameter:
-            maven: 'mvn33-new'
-        - maven-exec:
-            maven-version: 'mvn33-new'
-        - 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: ''
-            choosing-strategy: 'default'
-
-    wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - gerrit-trigger-os-patch-merged:
-            name: '{project}'
-            branch: '{branch}'
-
-    builders:
-        - config-file-provider:
-            files:
-              - file-id: '.packagecloud'
-                target: '/root'
-        - config-file-provider:
-            files:
-              - file-id: 'packagecloud_api'
-                target: '/root'
-        - maven-target:
-            maven-version: 'mvn33-new'
-            goals: '--version'
-            settings: 'vpp-settings'
-            settings-type: cfp
-            global-settings: 'global-settings'
-            global-settings-type: cfp
-        - shell:
-            !include-raw-escape: include-raw-vpp-checkstyle.sh
-        - shell:
-            !include-raw-escape:
-                - ../scripts/setup_vpp_ubuntu_docker_test.sh
-        - shell:
-            !include-raw-escape:
-                - ../scripts/setup_vpp_dpdk_dev_env.sh
-                - include-raw-vpp-build.sh
-        - provide-maven-settings:
-            settings-file: 'vpp-settings'
-            global-settings-file: 'global-settings'
-        - shell:
-            !include-raw-escape:
-                - ../scripts/maven_push_functions.sh
-                - include-raw-vpp-maven-push.sh
-        - shell:
-            !include-raw-escape:
-                - ../scripts/packagecloud_push.sh
-
-    publishers:
-        - archive:
-            artifacts: 'build-root/*.rpm,build-root/*.deb,dpdk/*.rpm,dpdk/*.deb'
-            allow-empty: 'true'
-            fingerprint: false
-            only-if-success: true
-            default-excludes: false
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
-
 - job-template:
     name: 'vpp-csit-verify-virl-{stream}'
 
@@ -812,7 +738,7 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-trivial-patch-submitted:
+        - gerrit-trigger-checkstyle-nonvoting:
             name: '{project}'
             branch: '{branch}'
 
@@ -820,9 +746,6 @@
         - shell: 'echo "VPP_BRANCH={branch}" > $WORKSPACE/variables.prop'
         - inject:
             properties-file: variables.prop
-        - shell:
-            !include-raw-escape:
-                - include-raw-vpp-checkstyle.sh
         - shell:
             !include-raw-escape:
                 - ../scripts/setup_vpp_ubuntu_docker_test.sh
@@ -848,77 +771,6 @@
             max-failed-builds: 1
             fixed-delay: 90
 
-
-- job-template:
-    name: 'vpp-csit-verify-os-virl-{stream}'
-
-    project-type: freestyle
-    node: '{os}-basebuild-8c-32g'
-    concurrent: true
-
-    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}'
-        - repo-name-parameter:
-            repo-name: '{repo-stream-part}.ubuntu.xenial.main'
-        - is-csit-vpp-job-parameter:
-            is-csit-vpp-job: 'True'
-        - string:
-            name: CSIT_REF
-            description: "Also testing CSIT_REF"
-
-    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-os-trivial-patch-submitted:
-            name: '{project}'
-            branch: '{branch}'
-
-    builders:
-        - shell: 'echo "VPP_BRANCH={branch}" > $WORKSPACE/variables.prop'
-        - inject:
-            properties-file: variables.prop
-        - shell:
-            !include-raw-escape:
-                - include-raw-vpp-checkstyle.sh
-        - shell:
-            !include-raw-escape:
-                - ../scripts/setup_vpp_ubuntu_docker_test.sh
-                - ../scripts/setup_vpp_dpdk_dev_env.sh
-                - include-raw-vpp-build.sh
-        - shell:
-            !include-raw-escape:
-                - include-raw-vpp-csit-functional.sh
-
-    publishers:
-        - archive-artifacts:
-            artifacts: 'csit/report.html, csit/log.html, csit/output.xml'
-            latest-only: false
-
-        - robot-report:
-            output-path: 'csit'
-
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
-
 - job-template:
     name: 'vpp-csit-verify-hw-perf-{stream}'
 
@@ -959,23 +811,7 @@
             server-name: 'Primary'
             trigger-on:
                 - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-l2'
-                - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-ip4'
-                - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-ip6'
-                - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-lisp'
-                - comment-added-contains-event:
-                    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'
-                - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-memif'
-                - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-ipsechw'
+                    comment-contains-value: 'perftest'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{project}'
@@ -1025,7 +861,7 @@
 
     project-type: freestyle
     node: ubuntu1604-us
-    concurrent: true
+    concurrent: false
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -1054,7 +890,7 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-trivial-patch-submitted:
+        - gerrit-trigger-checkstyle:
             name: '{project}'
             branch: '{branch}'
 
@@ -1205,7 +1041,7 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-trivial-patch-submitted:
+        - gerrit-trigger-checkstyle:
             name: '{project}'
             branch: '{branch}'
 
@@ -1320,5 +1156,3 @@
             rerun-unstable-builds: false
             max-failed-builds: 1
             fixed-delay: 90
-
-