FIX vpp-csit-verify jobs

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

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 28a688b..b8b45fc 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -4,14 +4,12 @@
     jobs:
         - 'vpp-verify-{stream}-{os}'
         - 'vpp-merge-{stream}-{os}'
-        - 'vpp-verify-image-{stream}-{os}'
         - 'vpp-docs-merge-{stream}'
         - 'vpp-docs-verify-{stream}'
         - 'vpp-make-test-docs-merge-{stream}'
         - 'vpp-make-test-docs-verify-{stream}'
-        - 'vpp-test-packagecloud-{stream}-{os}'
         - 'vpp-promote-{stream}-{os}'
-        - 'vpp-test-poc-verify-{stream}-{os}'
+        - 'vpp-cpoc-verify-{stream}-{os}'
 
     project: 'vpp'
     os:
@@ -26,9 +24,6 @@
         - master:
             branch: 'master'
             repo-stream-part: 'master'
-        - test:
-            branch: 'stable/test'
-            repo-stream-part: 'stable.test'
         - '1710':
             branch: 'stable/1710'
             repo-stream-part: 'stable.1710'
@@ -49,9 +44,6 @@
         - master:
             branch: 'master'
             repo-stream-part: 'master'
-        - test:
-            branch: 'stable/test'
-            repo-stream-part: 'stable.test'
         - '1710':
             branch: 'stable/1710'
             repo-stream-part: 'stable.1710'
@@ -119,69 +111,6 @@
             maven-version: 'mvn33-new'
             archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
 
-- job-template:
-    name: 'vpp-verify-image-{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:
-            server-name: 'Primary'
-            trigger-on:
-                - comment-added-contains-event:
-                    comment-contains-value: 'verify-images'
-            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
-
-    builders:
-        - shell:
-            !include-raw-escape: include-raw-vpp-checkstyle.sh
-        - shell:
-            !include-raw-escape:
-                - ../scripts/setup_vpp_dpdk_dev_env.sh
-                - include-raw-vpp-build.sh
-
-    publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
-
 - job-template:
     name: 'vpp-merge-{stream}-{os}'
 
@@ -309,11 +238,15 @@
             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:
@@ -401,6 +334,9 @@
                 notbuilt: false
 
     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
@@ -705,76 +641,6 @@
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
-- job-template:
-    name: 'vpp-test-packagecloud-{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}'
-        - 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'
-                #variable: 'SETTINGS_FILE'
-        - 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_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-promote-{stream}-{os}'
 
@@ -841,10 +707,10 @@
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'vpp-test-poc-verify-{stream}-{os}'
+    name: 'vpp-cpoc-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-m'
+    node: '{os}-s'
     concurrent: true
 
     logrotate:
@@ -878,6 +744,9 @@
             name: '{project}'
             branch: '{branch}'
             comment-trigger-value: 'test-cpoc'
+        - gerrit-trigger-trivial-patch-submitted-skip-vote:
+            name: '{project}'
+            branch: '{branch}'
 
     builders:
         - shell:
@@ -899,6 +768,9 @@
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
             archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
-        - retry-build-on-builder-error
+        - naginator:
+            rerun-unstable-builds: true
+            max-failed-builds: 1
+            fixed-delay: 10