Add push-upstream job for Apex

[infra/cicd.git] / jjb / global / jjb-macros.yaml

diff --git a/jjb/global/jjb-macros.yaml b/jjb/global/jjb-macros.yaml
index e4f23a2d29f098b661fb1d8251554be31dfcf9c1..3de22ee034a4ef7edb49b42585d90cb873d03a56 100644 (file)
--- a/jjb/global/jjb-macros.yaml
+++ b/jjb/global/jjb-macros.yaml
@@ -35,11 +35,11 @@
           description: Non-interactive user to stream Gerrit Events on Nordix Gerrit
       - string:
           name: GIT_BASE_HTTPS
-          default: https://gerrit.nordix.org/
+          default: https://gerrit.nordix.org
           description: HTTPS URL of Project Repo on Nordix Gerrit to clone repo
       - string:
           name: GIT_BASE_SSH
-          default: ssh://$GERRIT_USER@gerrit.nordix.org:29418/
+          default: ssh://$GERRIT_USER@gerrit.nordix.org:29418
           description: HTTPS URL of Project Repo on Nordix Gerrit to clone repo
 
 - parameter:
@@ -51,11 +51,11 @@
           description: Non-interactive user to stream Gerrit Events on ONAP Gerrit
       - string:
           name: GIT_BASE_HTTPS
-          default: https://gerrit.onap.org/r/p/
+          default: https://gerrit.onap.org/r/p
           description: HTTPS URL to Project Repo on ONAP Gerrit to clone repo
       - string:
           name: GIT_BASE_SSH
-          default: ssh://$GERRIT_USER@gerrit.onap.org:29418/
+          default: ssh://$GERRIT_USER@gerrit.onap.org:29418
           description: SSH URL to Project Repo on ONAP Gerrit to clone repo
 
 # defaults for job build history
@@ -72,10 +72,12 @@
 - scm:
     name: git-scm
     scm:
-      - git: &git-scm-defaults
-          url: '$GIT_BASE_HTTPS/$PROJECT'
+      - git:
+          url: '$GIT_BASE_SSH/$PROJECT'
+          credentials-id: '{ssh-credentials-id}'
           branches:
-            - 'origin/$BRANCH'
+            - 'refs/heads/{branch}'
+          refspec: '{refspec}'
           timeout: 15
           per-build-tag: false
           skip-tag: true
@@ -84,16 +86,28 @@
           ignore-notify: false
           wipe-workspace: true
           prune: false
+          choosing-strategy: 'default'
 
 - scm:
     name: git-scm-gerrit
     scm:
       - git:
+          url: '$GIT_BASE_SSH/$PROJECT'
+          credentials-id: '{ssh-credentials-id}'
+          branches:
+            - 'refs/heads/{branch}'
+          refspec: '{refspec}'
+          timeout: 15
+          per-build-tag: false
+          skip-tag: true
+          shallow-clone: false
+          use-author: false
+          ignore-notify: false
+          wipe-workspace: true
+          prune: false
           choosing-strategy: 'gerrit'
-          refspec: '$GERRIT_REFSPEC'
-          <<: *git-scm-defaults
 
-# triggers for Nordix and upstream Gerrits
+# triggers for Nordix Gerrit
 - trigger:
     name: nordix-gerrit-trigger-patchset-created
     triggers:
@@ -143,6 +157,46 @@
                 - compare-type: 'ANT'
                   pattern: '{files}'
 
+- trigger:
+    name: nordix-gerrit-push-upstream
+    triggers:
+      - gerrit:
+          server-name: 'Nordix Gerrit'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'push-upstream'
+          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
+    triggers:
+      - gerrit:
+          server-name: 'ONAP Gerrit'
+          trigger-on:
+            - change-merged-event
+            - comment-added-contains-event:
+                comment-contains-value: 'remerge'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: 'ANT'
+                  pattern: '{files}'
+          silent: true
+          silent-start: true
+
 # wrappers to use for jobs
 - wrapper:
     name: nordixinfra-jjb-creds-wrapper