From c712a602bad0b999f4f6f1736b6b3872934e6f9c Mon Sep 17 00:00:00 2001
From: "robert.tomczyk" <robert.tomczyk@est.tech>
Date: Fri, 14 Jun 2019 10:42:22 +0100
Subject: [PATCH] OPENDEV: Add patchset-created trigger for push upstream
 jenkins job.

Change-Id: I10b919e92255731ba45f8f5e536811b76c31d100
---
 jjb/global/jjb-macros.yaml                    | 20 +++++++++
 ...-templates-opendev-push-upstream-test.yaml | 41 +++++++++++++++++++
 .../opendev-sandbox-push-upstream-jobs.yml    |  2 +-
 3 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 jjb/opendev/global-templates-opendev-push-upstream-test.yaml

diff --git a/jjb/global/jjb-macros.yaml b/jjb/global/jjb-macros.yaml
index 3f37cb8ba..834b60fd1 100644
--- a/jjb/global/jjb-macros.yaml
+++ b/jjb/global/jjb-macros.yaml
@@ -223,6 +223,26 @@
                 - compare-type: 'ANT'
                   pattern: '{files}'
 
+- trigger:
+    name: nordix-gerrit-patchset-created-or-push-upstream
+    triggers:
+      - gerrit:
+          server-name: 'Nordix Gerrit'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'push-upstream'
+            - patchset-created-event:
+                exclude-drafts: true
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: 'ANT'
+                  pattern: '{files}'
+
 # triggers for ONAP Gerrit
 - trigger:
     name: onap-gerrit-trigger-change-merged
diff --git a/jjb/opendev/global-templates-opendev-push-upstream-test.yaml b/jjb/opendev/global-templates-opendev-push-upstream-test.yaml
new file mode 100644
index 000000000..d4ba1f63d
--- /dev/null
+++ b/jjb/opendev/global-templates-opendev-push-upstream-test.yaml
@@ -0,0 +1,41 @@
+- job-template:
+    name: 'opendev-{project-name}-{stream}-push-upstream-test'
+
+    node: infra-build01-ubuntu1804
+
+    disabled: false
+
+    concurrent: true
+
+    properties:
+      - logrotate
+
+    parameters:
+      - project-parameters:
+          project: 'opendev/{project}'
+          branch: '{branch}'
+      - nordix-gerrit-parameters
+
+    scm:
+      - git-scm-gerrit:
+          ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
+          branch: '{branch}'
+          refspec: $GERRIT_REFSPEC
+
+    triggers:
+      - nordix-gerrit-patchset-created-or-push-upstream:
+          project: 'opendev/{project}'
+          branch: '{branch}'
+          files: '**'
+
+    wrappers:
+      - build-timeout:
+          timeout: 10
+
+    builders:
+      - shell:
+          !include-raw-escape: ./push-upstream-jobs.sh
+
+    publishers:
+      - notify-slack:
+          slack-channel: '#infra'
diff --git a/jjb/opendev/opendev-sandbox/opendev-sandbox-push-upstream-jobs.yml b/jjb/opendev/opendev-sandbox/opendev-sandbox-push-upstream-jobs.yml
index 8862f0676..375eac00f 100644
--- a/jjb/opendev/opendev-sandbox/opendev-sandbox-push-upstream-jobs.yml
+++ b/jjb/opendev/opendev-sandbox/opendev-sandbox-push-upstream-jobs.yml
@@ -26,4 +26,4 @@
           branch: '{stream}'
 
     jobs:
-      - 'opendev-{project-name}-{stream}-push-upstream'
+      - 'opendev-{project-name}-{stream}-push-upstream-test'
-- 
2.25.1