From 7470dbac0683a33bf7a8478147e832159445a031 Mon Sep 17 00:00:00 2001 From: "Eby, Robert (re2429)" Date: Thu, 26 Jul 2018 16:33:38 -0400 Subject: [PATCH] Added missing trigger logic to JJB template Change-Id: I4b7d37f86548c3b8893012663e72a0e2c62b0245 Signed-off-by: Eby, Robert (re2429) --- jjb/addon-onap/addon-onap.yaml | 1 + jjb/akraino-templates/akraino-jjb-templates.yaml | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/jjb/addon-onap/addon-onap.yaml b/jjb/addon-onap/addon-onap.yaml index 8f5acee..def81af 100644 --- a/jjb/addon-onap/addon-onap.yaml +++ b/jjb/addon-onap/addon-onap.yaml @@ -39,3 +39,4 @@ - akraino-project-stream-release-config views: - common-view + cron: 'H H * * 0' # push fresh snapshot weekly diff --git a/jjb/akraino-templates/akraino-jjb-templates.yaml b/jjb/akraino-templates/akraino-jjb-templates.yaml index f08dcea..d0cd987 100644 --- a/jjb/akraino-templates/akraino-jjb-templates.yaml +++ b/jjb/akraino-templates/akraino-jjb-templates.yaml @@ -20,6 +20,15 @@ project-type: freestyle node: '{build-node}' + gerrit_merge_triggers: + - change-merged-event + - comment-added-contains-event: + comment-contains-value: remerge$ + + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: '.*' + parameters: - lf-infra-parameters: project: '{project}' @@ -65,3 +74,16 @@ - ../global-jjb/shell/lftools-install.sh - ../global-jjb/shell/deploy-maven-file.sh - lf-provide-maven-settings-cleanup + + triggers: + - timed: '{obj:cron}' + - gerrit: + server-name: '{gerrit-server-name}' + trigger-on: '{obj:gerrit_merge_triggers}' + projects: + - project-compare-type: ANT + project-pattern: '{project}' + branches: + - branch-compare-type: ANT + branch-pattern: '**/{branch}' + file-paths: '{obj:gerrit_trigger_file_paths}' -- 2.16.6