From ccb9a5a69f785e7542d573e8b828c1c031808ee1 Mon Sep 17 00:00:00 2001 From: Chris Luke Date: Thu, 27 Jul 2017 09:53:25 -0400 Subject: Fix VPP merge job & docs Change https://gerrit.fd.io/r/#/c/6729 to remove Ubuntu 14.04 builds from the VPP CI workflow unfortunately also removed the triggers that cause the some post-merge jobs to run; specifically this meant that the job that builds VPP documentation was no longer invoked. The trigger is defined in terms of one earlier post-merge job; in an ideal world you'd want "any of" or "all of" the upstream jobs to be listed, but apparently this does not work. The upshot is that the trigger was defined to run after the Ubuntu 14.04 jobs and that trigger was removed since it referenced the defunct Ubuntu 14.04. This should restore that trigger by basing it off of Ubuntu 16.04 instead. Change-Id: I05dc8738f662ec1c37ee005486b57a7644342333 Signed-off-by: Chris Luke --- jjb/vpp/vpp.yaml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'jjb/vpp') diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 4cd56a7dc..4c82ae0d4 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -525,6 +525,9 @@ build-timeout: '{build-timeout}' triggers: + - reverse: + jobs: 'vpp-merge-{stream}-ubuntu1604' + result: 'success' - gerrit: server-name: 'Primary' trigger-on: @@ -660,6 +663,9 @@ build-timeout: '{build-timeout}' triggers: + - reverse: + jobs: 'vpp-merge-{stream}-ubuntu1604' + result: 'success' - gerrit: server-name: 'Primary' trigger-on: -- cgit 1.2.3-korg