From aab72dd7c774290cc7529a2d5f823d89529945d3 Mon Sep 17 00:00:00 2001 From: Aric Gardner Date: Thu, 16 Mar 2017 14:49:13 -0400 Subject: [PATCH] jjb: xci: Fix trigger for cleanup jobs Trigger should only run on change-merged and change-abandonded The documentation could be imporved more explicitly here: https://docs.openstack.org/infra/jenkins-job-builder/triggers.html#trigger-on but the modified lines do not take true or false they stand alone Fixes: ea33eda6954a ("jjb: infra: bifrost-cleanup-job: Do not trigger on new patchsets") Fixes: f6bba721fd13 ("jjb: infra: bifrost-cleanup-job: Do not trigger on patchset creation") Change-Id: Ibc574220ea86c5a039855d6f4fe35eef0aac7e0e Signed-off-by: Aric Gardner Signed-off-by: Markos Chandras --- jjb/xci/bifrost-cleanup-job.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/jjb/xci/bifrost-cleanup-job.yml b/jjb/xci/bifrost-cleanup-job.yml index 571e275da..4e9e2a8d4 100644 --- a/jjb/xci/bifrost-cleanup-job.yml +++ b/jjb/xci/bifrost-cleanup-job.yml @@ -88,11 +88,8 @@ trigger-on: # We only run this when the change is merged or # abandoned since we don't need the logs anymore - - patchset-uploaded-event: 'false' - - change-merged-event: 'true' - - change-abandoned-event: 'true' - - change-restored-event: 'false' - - draft-published-event: 'false' + - change-merged-event + - change-abandoned-event # This is an OPNFV maintenance job. We don't want to provide # feedback on Gerrit silent: true @@ -119,11 +116,8 @@ trigger-on: # We only run this when the change is merged or # abandoned since we don't need the logs anymore - - patchset-uploaded-event: 'false' - - change-merged-event: 'true' - - change-abandoned-event: 'true' - - change-restored-event: 'false' - - draft-published-event: 'false' + - change-merged-event + - change-abandoned-event # This is an OPNFV maintenance job. We don't want to provide # feedback on Gerrit silent: true -- 2.16.6