commit fd869058689f22d03861cfbe15cb4e9458572137
author You Wang <you@opennetworking.org> Fri Mar 13 11:23:11 2020 -0700
committer You Wang <you@opennetworking.org> Fri Mar 13 19:53:50 2020 -0700
tree ddd304f370d7b28908af23fc5b9e2522e3fd7c5e
parent 806e396b589bcb7e74d4db5ee939db70c5e74e16

Trigger OMEC docker-publish jobs on Github PR merge

Change-Id: I4cf494521b6c86457ccddd82e24740ab9435d1b6

jjb/cord-macros.yaml

diff --git a/jjb/cord-macros.yaml b/jjb/cord-macros.yaml
index e58eab3..5a0f123 100644
--- a/jjb/cord-macros.yaml
+++ b/jjb/cord-macros.yaml
@@ -138,6 +138,24 @@
           org-list: '{obj:github_pr_org_list}'
           allow-whitelist-orgs-as-admins: true
 
+# Trigger on GitHub PR merge
+# docs: https://docs.openstack.org/infra/jenkins-job-builder/triggers.html#triggers.generic-webhook-trigger
+- trigger:
+    name: cord-infra-github-pr-trigger-merge
+    triggers:
+      - generic-webhook-trigger:
+            post-content-params:
+                - type: JSONPath
+                  key: action
+                  value: $.action
+                - type: JSONPath
+                  key: merged
+                  value: $.pull_request.merged
+            regex-filter-text: $action,$merged
+            regex-filter-expression: ^(closed,true)$
+            cause: Generic Cause
+            token: '{project}'
+
 # wrapper to provide pypi config file
 
 - wrapper:

jjb/docker-publish-github.yaml

diff --git a/jjb/docker-publish-github.yaml b/jjb/docker-publish-github.yaml
index 1071aea..148c228 100644
--- a/jjb/docker-publish-github.yaml
+++ b/jjb/docker-publish-github.yaml
@@ -16,7 +16,8 @@
           display-status: 'docker-publish'
 
     triggers:
-      - github
+      - cord-infra-github-pr-trigger-merge:
+          project: '{project}'
 
     wrappers:
       - lf-infra-wrappers: