From: Eric Ball <eball@linuxfoundation.org>
Date: Mon, 15 Jul 2019 21:20:58 +0000 (-0700)
Subject: Enable merge jobs to trigger downstream job
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F92%2F1192%2F2;p=ci-management.git

Enable merge jobs to trigger downstream job

Enable all merge jobs in ta project to trigger
a downstream ta-ci-build job, so that ta-ci-build
is triggered on every successful merge.

Issue: IT-16719
Change-Id: Ib0debc513f697e0ad77d49a89329cc66bb27f46b
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
---

diff --git a/jjb/akraino-templates/akraino-ta-common-macros.yaml b/jjb/akraino-templates/akraino-ta-common-macros.yaml
index 8ed76b5..24436b9 100644
--- a/jjb/akraino-templates/akraino-ta-common-macros.yaml
+++ b/jjb/akraino-templates/akraino-ta-common-macros.yaml
@@ -287,9 +287,13 @@
 - publisher:
     name: ta-publisher-job-verify
     publishers:
-        - lf-infra-publish
+      - lf-infra-publish
 
 - publisher:
     name: ta-publisher-job-merge
     publishers:
-        - lf-infra-publish
+      - lf-infra-publish
+      - trigger-parameterized-builds:
+          - project: 'ta-ci-build'
+            condition: UNSTABLE_OR_BETTER
+            trigger-with-no-params: true
diff --git a/jjb/akraino-templates/akraino-ta-common-templates.yaml b/jjb/akraino-templates/akraino-ta-common-templates.yaml
index f0e868b..e1ecc08 100644
--- a/jjb/akraino-templates/akraino-ta-common-templates.yaml
+++ b/jjb/akraino-templates/akraino-ta-common-templates.yaml
@@ -251,11 +251,6 @@
           build-timeout: '{build-timeout}'
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
-    # TODO: define how it should be triggered
-    # Ideally should build whenever RPM is uploaded to nexus
-    triggers:
-      - timed: "@daily"
-
     builders:
       - ta-builder-scm:
           git-url: '{git-url}'