Fix distribution jobs

- Change repo name integration -> integration/distribution
- Restore original gerrit triggers, we do not need custom triggers
- We leave integration mail list unitl we agree on sub-lists

Change-Id: I0be23566b915ded30f88c2bfafd08167ce9db7b6
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml
index 81c677920ae4e5ca928b902d638d24442084f3e0..78eb68b2a45983740554d006f2cec65096dae961 100644 (file)
--- a/jjb/integration/integration-distribution-jobs.yaml
+++ b/jjb/integration/integration-distribution-jobs.yaml
@@ -34,7 +34,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
         - gerrit-parameter:
             branch: '{branch}'
 
@@ -51,8 +51,8 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - integration-distribution-gerrit-trigger-patch-submitted:
-            name: 'integration'
+        - gerrit-trigger-patch-submitted:
+            name: 'integration/distribution'
             branch: '{branch}'
 
     prebuilders:
@@ -86,7 +86,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - gerrit-trigger-scm:
@@ -101,8 +101,8 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - integration-distribution-gerrit-trigger-patch-merged:
-            name: 'integration'
+        - gerrit-trigger-patch-merged:
+            name: 'integration/distribution'
             branch: '{branch}'
 
     prebuilders:

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 41f29bf1dad0fbd5f6a5d1e3ee5e0fe239f7141e..e66647c383d5e520a9317cf3f934631d41471ff5 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -99,62 +99,6 @@
             skip-tag: true
             choosing-strategy: 'gerrit'
 
-- trigger:
-    name: integration-distribution-gerrit-trigger-patch-submitted
-    triggers:
-        - gerrit:
-            server-name: 'OpenDaylight'
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'true'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'true'
-                - draft-published-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{name}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                file-paths:
-                  - compare-type: 'ANT'
-                    pattern: 'pom.xml'
-                  - compare-type: 'ANT'
-                    pattern: 'distributions/**'
-                  - compare-type: 'ANT'
-                    pattern: 'features/**'
-                  - compare-type: 'ANT'
-                    pattern: 'feature-selector/**'
-
-- trigger:
-    name: integration-distribution-gerrit-trigger-patch-merged
-    triggers:
-        - gerrit:
-            server-name: 'OpenDaylight'
-            trigger-on:
-                - change-merged-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'remerge'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{name}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                file-paths:
-                  - compare-type: 'ANT'
-                    pattern: 'pom.xml'
-                  - compare-type: 'ANT'
-                    pattern: 'distributions/**'
-                  - compare-type: 'ANT'
-                    pattern: 'features/**'
-                  - compare-type: 'ANT'
-                    pattern: 'feature-selector/**'
-
 - trigger:
     name: integration-test-gerrit-trigger-patch-submitted
     triggers: