Merge "Set settings to hicn-settings."

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

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 51a8c02..69a404a 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -28,10 +28,9 @@
       - '1810':
           branch: 'stable/1810'
           repo-stream-part: 'stable.1810'
-
-    type:
-      - short
-      - long
+      - '1901':
+          branch: 'stable/1901'
+          repo-stream-part: 'stable.1901'
 
 - project:
     name: vpp-clang
@@ -40,8 +39,8 @@
 
     project: 'vpp'
     os:
-      - ubuntu1604:
-          repo-os-part: 'ubuntu.xenial.main'
+      - ubuntu1804:
+          repo-os-part: 'ubuntu.bionic.main'
       - centos7:
           repo-os-part: 'centos7'
       - opensuse:
@@ -74,6 +73,9 @@
       - '1810':
           branch: 'stable/1810'
           repo-stream-part: 'stable.1810'
+      - '1901':
+          branch: 'stable/1901'
+          repo-stream-part: 'stable.1901'
     os: ubuntu1604
 
 - project:
@@ -97,9 +99,9 @@
       - master:
           branch: 'master'
           repo-stream-part: 'master'
-      - '1810':
-          branch: 'stable/1810'
-          repo-stream-part: 'stable.1810'
+      - '1901':
+          branch: 'stable/1901'
+          repo-stream-part: 'stable.1901'
     os:
       - ubuntu1804:
           repo-os-part: 'ubuntu.bionic.main'
@@ -114,6 +116,9 @@
       - master:
           branch: 'master'
           repo-stream-part: 'master'
+      - '1901':
+          branch: 'stable/1901'
+          repo-stream-part: 'stable.1901'
     os:
       - ubuntu1804:
           repo-os-part: 'ubuntu-arm.bionic.main'
@@ -122,7 +127,7 @@
     name: vpp-arm-old
     jobs:
       - 'vpp-arm-old-verify-{stream}-{os}'
-      - 'vpp-arm-merge-{stream}-{os}'
+      - 'vpp-arm-old-merge-{stream}-{os}'
     project: 'vpp'
     stream:
       - '1804':
@@ -138,6 +143,12 @@
       - ubuntu1604:
           repo-os-part: 'ubuntu-arm.xenial.main'
 
+- project:
+    name: vpp-view
+    views:
+      - project-view
+    project-name: vpp
+
 - job-template:
     name: 'vpp-beta-verify-{stream}-{os}'
 
@@ -393,7 +404,7 @@
           build-timeout: 120
 
     triggers:
-      - gerrit-trigger-checkstyle-nonvoting:
+      - gerrit-trigger-checkstyle:
           name: '{project}'
           branch: '{branch}'
 
@@ -481,11 +492,101 @@
           global-settings: 'global-settings'
           global-settings-type: cfp
       - 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-arm-build.sh
+          - include-raw-vpp-parallel-vars.sh
+          - include-raw-vpp-arm-build-no-test.sh
+
+      - provide-maven-settings:
+          settings-file: 'vpp-settings'
+          global-settings-file: 'global-settings'
+      - 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-arm-old-merge-{stream}-{os}'
+
+    project-type: freestyle
+    node: '{os}arm-us'
+
+    build-discarder:
+      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: 120
+
+    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_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-no-test.sh
+
       - provide-maven-settings:
           settings-file: 'vpp-settings'
           global-settings-file: 'global-settings'
@@ -677,7 +778,7 @@
     name: 'vpp-verify-{stream}-clang'
 
     project-type: freestyle
-    node: 'ubuntu1604-us'
+    node: 'ubuntu1804-us'
     concurrent: true
 
     build-discarder:
@@ -694,7 +795,7 @@
       - os-parameter:
           os: 'ubuntu1604'
       - repo-name-parameter:
-          repo-name: '{repo-stream-part}.ubuntu.xenial.main'
+          repo-name: '{repo-stream-part}.ubuntu.bionic.main'
       - stream-parameter:
           stream: '{stream}'
 
@@ -867,7 +968,7 @@
           build-timeout: '90'
 
     triggers:
-      - gerrit-trigger-checkstyle-nonvoting:
+      - gerrit-trigger-csit-virltest:
           name: '{project}'
           branch: '{branch}'
 
@@ -946,22 +1047,9 @@
           build-timeout: 300
 
     triggers:
-      - gerrit:
-          server-name: 'Primary'
-          trigger-on:
-            - comment-added-contains-event:
-                comment-contains-value: 'perftest'
-          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
+      - gerrit-trigger-csit-perftest:
+          name: '{project}'
+          branch: '{branch}'
 
     builders:
       - shell:
@@ -980,12 +1068,3 @@
 
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
-
-- parameter:
-    name: type-parameter
-
-    parameters:
-      - string:
-          name: TYPE
-          default: '{type}'
-          description: "TYPE parameter if not given by trigger"