Stop triggering on draft contributions to Integration

[releng/builder.git] / jjb / integration / integration-macros.yaml

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 3906c78f7d9c818144659044429a1b92a44c3edb..8930da462cae774670d25930d7a1f089df671194 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -36,7 +36,7 @@
         - string:
             name: TESTPLAN
             default: '{test-plan}'
-            description:  'Test plan we will run'
+            description: 'Test plan we will run'
 
 - parameter:
     name: integration-test-options
@@ -44,7 +44,60 @@
         - string:
             name: TESTOPTIONS
             default: '{test-options}'
-            description:  'Robot command options'
+            description: 'Robot command options'
+
+- parameter:
+    name: integration-patch-git-url
+    parameters:
+        - string:
+            name: PATCHGITURL
+            default: 'ssh://jenkins-$SILO@git.opendaylight.org:29418/$GERRIT_PROJECT'
+            description: 'Patch GIT URL (do not modify)'
+
+- parameter:
+    name: integration-patch-refspec
+    parameters:
+        - string:
+            name: PATCHREFSPEC
+            default: '{branch}'
+            description: 'Integration Patch Refspec'
+
+- scm:
+    name: integration-gerrit-scm
+    scm:
+        - git:
+            credentials-id: '{credentials-id}'
+            url: '$PATCHGITURL'
+            basedir: '$GERRIT_PROJECT'
+            refspec: '$GERRIT_REFSPEC'
+            branches:
+                - 'origin/{branch}'
+            skip-tag: true
+            choosing-strategy: 'gerrit'
+
+- scm:
+    name: integration-git-scm
+    scm:
+        - git:
+            credentials-id: '{credentials-id}'
+            basedir: 'integration'
+            url: '$GIT_BASE'
+            refspec: ''
+            branches:
+                - 'origin/{branch}'
+            skip-tag: true
+
+- scm:
+    name: integration-patch-scm
+    scm:
+        - git:
+            credentials-id: '{credentials-id}'
+            url: '$GIT_BASE'
+            refspec: '$PATCHREFSPEC'
+            branches:
+                - 'origin/{branch}'
+            skip-tag: true
+            choosing-strategy: 'gerrit'
 
 - trigger:
     name: integration-distribution-gerrit-trigger-patch-submitted
@@ -53,7 +106,7 @@
             server-name: 'OpenDaylight'
             trigger-on:
                 - patchset-created-event:
-                    exclude-drafts: 'false'
+                    exclude-drafts: 'true'
                     exclude-trivial-rebase: 'false'
                     exclude-no-code-change: 'false'
                 - draft-published-event
@@ -68,6 +121,8 @@
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
                 file-paths:
+                  - compare-type: 'ANT'
+                    pattern: 'pom.xml'
                   - compare-type: 'ANT'
                     pattern: 'distributions/**'
                   - compare-type: 'ANT'
@@ -91,6 +146,8 @@
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
                 file-paths:
+                  - compare-type: 'ANT'
+                    pattern: 'pom.xml'
                   - compare-type: 'ANT'
                     pattern: 'distributions/**'
                   - compare-type: 'ANT'
@@ -105,7 +162,7 @@
             server-name: 'OpenDaylight'
             trigger-on:
                 - patchset-created-event:
-                    exclude-drafts: 'false'
+                    exclude-drafts: 'true'
                     exclude-trivial-rebase: 'false'
                     exclude-no-code-change: 'false'
                 - draft-published-event
@@ -124,7 +181,32 @@
                     pattern: 'test/csit/suites/{project}/**'
 
 - trigger:
-    name: integration-test-gerrit-trigger-patch-merged
+    name: integration-csit-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: 'false'
+                - 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: 'test/csit/**'
+
+- trigger:
+    name: integration-csit-gerrit-trigger-patch-merged
     triggers:
         - gerrit:
             server-name: 'OpenDaylight'
@@ -140,7 +222,7 @@
                     branch-pattern: '**/{branch}'
                 file-paths:
                   - compare-type: 'ANT'
-                    pattern: 'test/**'
+                    pattern: 'test/csit/**'
 
 - wrapper:
     name: integration-jclouds-controller-mininet
@@ -151,7 +233,7 @@
                 cloud-name: 'Rackspace DFW - Integration Dynamic Lab'
                 count: '{controller-vms}'
                 stop-on-terminate: False
-            - rk-c-el6-mininet:
+            - '{mininet-image}':
                 cloud-name: 'Rackspace DFW - Integration Dynamic Lab'
                 count: '{mininet-vms}'
                 stop-on-terminate: False
@@ -165,12 +247,47 @@
     builders:
         - shell:
             !include-raw include-raw-integration-get-slave-addresses.sh
+- builder:
+    name: integration-get-bundle-vars
+    builders:
+        - shell:
+            !include-raw include-raw-integration-get-bundle-vars.sh
 
 - builder:
     name: integration-deploy-controller-run-test
     builders:
         - shell:
             !include-raw include-raw-integration-deploy-controller-run-test.sh
+- builder:
+    name: integration-deploy-controller
+    builders:
+        - shell:
+            !include-raw include-raw-integration-deploy-controller.sh
+
+
+- builder:
+    name: integration-configure-clustering
+    builders:
+        - shell:
+            !include-raw include-raw-integration-configure-clustering.sh
+
+- builder:
+    name: integration-start-cluster-run-test
+    builders:
+        - shell:
+            !include-raw include-raw-integration-start-cluster-run-test.sh
+
+- builder:
+    name: integration-deploy-controller-offline
+    builders:
+        - shell:
+            !include-raw include-raw-integration-deploy-controller-offline.sh
+
+- builder:
+    name: integration-get-bundle-url
+    builders:
+        - shell:
+            !include-raw include-raw-integration-get-bundle-url.sh
 
 ##############
 # Publishers #