From 36a4bc060192f9a3e4f4bff044c7c1fb19ef57bb Mon Sep 17 00:00:00 2001
From: Peter Mikus <pmikus@cisco.com>
Date: Fri, 4 Jan 2019 08:03:52 +0000
Subject: Change automatic to manual trigger for VIRL job for VPP project

- Leaving manual option for trigger: "virltest"
- Leaving job for re-use for vpp-device.
- Removed old TYPE parameter (used for obsolete perf tests).

Change-Id: Ia6598e2e7b45858a445664c84a90465b9d944a36
Signed-off-by: Peter Mikus <pmikus@cisco.com>
---
 jjb/vpp/vpp-macros.yaml | 40 ++++++++++++++++++++++++++++++++++++++++
 jjb/vpp/vpp.yaml        | 34 ++++------------------------------
 2 files changed, 44 insertions(+), 30 deletions(-)

(limited to 'jjb/vpp')

diff --git a/jjb/vpp/vpp-macros.yaml b/jjb/vpp/vpp-macros.yaml
index a11ca9bf5..bb35466f0 100644
--- a/jjb/vpp/vpp-macros.yaml
+++ b/jjb/vpp/vpp-macros.yaml
@@ -38,3 +38,43 @@
           gerrit-build-failed-verified-value: 1
           gerrit-build-unstable-verified-value: 1
           gerrit-build-notbuilt-verified-value: 1
+
+- trigger:
+    name: gerrit-trigger-csit-perftest
+    triggers:
+      - gerrit:
+          server-name: 'Primary'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'perftest'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{name}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+          skip-vote:
+            successful: true
+            failed: true
+            unstable: true
+            notbuilt: true
+
+- trigger:
+    name: gerrit-trigger-csit-virltest
+    triggers:
+      - gerrit:
+          server-name: 'Primary'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'virltest'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{name}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+          skip-vote:
+            successful: true
+            failed: true
+            unstable: true
+            notbuilt: true
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 6d8194fc8..0492c5f97 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -29,10 +29,6 @@
           branch: 'stable/1810'
           repo-stream-part: 'stable.1810'
 
-    type:
-      - short
-      - long
-
 - project:
     name: vpp-clang
     jobs:
@@ -957,7 +953,7 @@
           build-timeout: '90'
 
     triggers:
-      - gerrit-trigger-checkstyle-nonvoting:
+      - gerrit-trigger-csit-virltest:
           name: '{project}'
           branch: '{branch}'
 
@@ -1036,22 +1032,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:
@@ -1070,12 +1053,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"
-- 
cgit 1.2.3-korg