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 5e8a216..69a404a 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -32,10 +32,6 @@
           branch: 'stable/1901'
           repo-stream-part: 'stable.1901'
 
-    type:
-      - short
-      - long
-
 - project:
     name: vpp-clang
     jobs:
@@ -43,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:
@@ -147,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}'
 
@@ -776,7 +778,7 @@
     name: 'vpp-verify-{stream}-clang'
 
     project-type: freestyle
-    node: 'ubuntu1604-us'
+    node: 'ubuntu1804-us'
     concurrent: true
 
     build-discarder:
@@ -793,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}'
 
@@ -966,7 +968,7 @@
           build-timeout: '90'
 
     triggers:
-      - gerrit-trigger-checkstyle-nonvoting:
+      - gerrit-trigger-csit-virltest:
           name: '{project}'
           branch: '{branch}'
 
@@ -1045,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:
@@ -1079,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"