Merge "Rename to taglist.log so that it gets archived"

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

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 293ce27d8dd2ed6c91b2b6dbccbf5c8e23ddfb8f..aed030ec35bc2a4bf2c775f224697ee77ea4717e 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -46,6 +46,39 @@
             default: '{test-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)'
+
+- 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
+
 - trigger:
     name: integration-distribution-gerrit-trigger-patch-submitted
     triggers:
@@ -68,6 +101,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 +126,8 @@
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
                 file-paths:
+                  - compare-type: 'ANT'
+                    pattern: 'pom.xml'
                   - compare-type: 'ANT'
                     pattern: 'distributions/**'
                   - compare-type: 'ANT'
@@ -121,10 +158,35 @@
                     branch-pattern: '**/{branch}'
                 file-paths:
                   - compare-type: 'ANT'
-                    pattern: 'test/csit/{project}/**'
+                    pattern: 'test/csit/suites/{project}/**'
+
+- trigger:
+    name: integration-csit-gerrit-trigger-patch-submitted
+    triggers:
+        - gerrit:
+            server-name: 'OpenDaylight'
+            trigger-on:
+                - patchset-created-event:
+                    exclude-drafts: 'false'
+                    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-test-gerrit-trigger-patch-merged
+    name: integration-csit-gerrit-trigger-patch-merged
     triggers:
         - gerrit:
             server-name: 'OpenDaylight'
@@ -140,7 +202,7 @@
                     branch-pattern: '**/{branch}'
                 file-paths:
                   - compare-type: 'ANT'
-                    pattern: 'test/**'
+                    pattern: 'test/csit/**'
 
 - wrapper:
     name: integration-jclouds-controller-mininet
@@ -156,6 +218,21 @@
                 count: '{mininet-vms}'
                 stop-on-terminate: False
 
+- wrapper:
+    name: integration-jclouds-controller-fedora-mininet
+    wrappers:
+      - jclouds:
+          instances:
+            - rk-c-el6-java:
+                cloud-name: 'Rackspace DFW - Integration Dynamic Lab'
+                count: '{controller-vms}'
+                stop-on-terminate: False
+            - rk-f21-mininet:
+                cloud-name: 'Rackspace DFW - Integration Dynamic Lab'
+                count: '{mininet-vms}'
+                stop-on-terminate: False
+
+
 #################
 # Shell Scripts #
 #################
@@ -165,12 +242,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 #