From ea1ab47682a6692ca3f14ef33ba6ee74ac832d7f Mon Sep 17 00:00:00 2001 From: Ed Kern Date: Tue, 17 Apr 2018 15:09:07 -0600 Subject: VPP: arm verify and merge on reg triggers This migrates arm builds for master and 1804 from regex triggers to automatic triggers Change-Id: I313975043fa22b1b0be9e9e12bf5bda453a54e8c Signed-off-by: Ed Kern --- jjb/vpp/vpp.yaml | 37 +++++++------------------------------ 1 file changed, 7 insertions(+), 30 deletions(-) (limited to 'jjb/vpp/vpp.yaml') diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index e318f568c..bd9f76058 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -204,22 +204,10 @@ build-timeout: '{build-timeout}' triggers: - - gerrit: - server-name: 'Primary' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'armcheck' - - 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}' - 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-trivial-patch-submitted: + name: '{project}' + branch: '{branch}' + builders: - shell: !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh @@ -281,20 +269,9 @@ build-timeout: '{build-timeout}' triggers: - - gerrit: - server-name: 'Primary' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'armmerge' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - 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-patch-merged: + name: '{project}' + branch: '{branch}' builders: - config-file-provider: -- cgit 1.2.3-korg