Switch controller slave to CentOS7 slave

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

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 960d3f057af16d8e474c69f4c03d4bdf4e0b489e..cd2c83ff5f2f67297fc87207c3c5aa2f5fcc47bf 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -4,7 +4,7 @@
         - string:
             name: BRANCH
             default: '{branch}'
-            description: 'GIT branch'
+            description: 'Distribution GIT branch'
 
 - parameter:
     name: integration-bundleurl
@@ -63,8 +63,8 @@
             description: 'Integration Patch Refspec'
 
 # Macro: integration-gerrit-scm
-# Operation: this macro downloads a gerrit from any project and uses the project as basedir
-# Used by: integration-patch-test-{stream} job template
+# Operation: this macro downloads a project gerrit
+# Used by: all csit jobs
 
 - scm:
     name: integration-gerrit-scm
@@ -72,16 +72,16 @@
         - git:
             credentials-id: '{credentials-id}'
             url: '$GIT_BASE'
-            basedir: '$GERRIT_PROJECT'
-            refspec: '$GERRIT_REFSPEC'
+            basedir: '{basedir}'
+            refspec: '{refspec}'
             branches:
                 - 'origin/{branch}'
             skip-tag: true
             choosing-strategy: 'gerrit'
 
 # Macro: integration-distribution-scm
-# Operation: this macro downloads the integration/distribution repo and uses distribution as basedir
-# Used by: {project}-csit-* and integration-patch-test-{stream} job templates
+# Operation: this macro downloads the integration/distribution repo using distribution as basedir
+# Used by: integration-patch-test-{stream} job template
 
 - scm:
     name: integration-distribution-scm
@@ -95,28 +95,12 @@
                 - 'origin/{branch}'
             skip-tag: true
 
-# Macro: integration-patch-scm
-# Operation: this macro downloads a test patch that can be used to debug in the sandbox
-# Used by: {project}-csit-* job templates
-
-- 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'
-
-# Macro: integration-test-gerrit-trigger-patch-submitted
-# Operation: this macro sets a trigger for patch submit on test/csit/suites/{project}/**
+# Macro: integration-trigger-patch-submitted
+# Operation: this macro sets a trigger for patch submitted on a path pattern
 # Used by: {project}-verify-csit-* job templates
 
 - trigger:
-    name: integration-test-gerrit-trigger-patch-submitted
+    name: integration-trigger-patch-submitted
     triggers:
         - gerrit:
             server-name: 'OpenDaylight'
@@ -138,43 +122,14 @@
                     branch-pattern: '**/{branch}'
                 file-paths:
                   - compare-type: 'ANT'
-                    pattern: 'test/csit/suites/{project}/**'
-
-# Macro: integration-csit-gerrit-trigger-patch-submitted
-# Operation: this macro sets a trigger for patch submit on test/csit/**
-# Used by: integration-verify-csit-1node-{stream} job template
+                    pattern: '{pattern}'
 
-- trigger:
-    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: '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: 'test/csit/**'
-
-# Macro: integration-csit-gerrit-trigger-patch-merged
-# Operation: this macro sets a trigger for patch merged on test/csit/**
+# Macro: integration-trigger-patch-merged
+# Operation: this macro sets a trigger for patch merged on a path pattern
 # Used by: not used yet
 
 - trigger:
-    name: integration-csit-gerrit-trigger-patch-merged
+    name: integration-trigger-patch-merged
     triggers:
         - gerrit:
             server-name: 'OpenDaylight'
@@ -190,7 +145,7 @@
                     branch-pattern: '**/{branch}'
                 file-paths:
                   - compare-type: 'ANT'
-                    pattern: 'test/csit/**'
+                    pattern: '{pattern}'
 
 # Macro: integration-jclouds-controller-mininet
 # Operation: this macro will spin the controller and mininet vms
@@ -201,12 +156,12 @@
     wrappers:
       - jclouds:
           instances:
-            - rk-c-el6-java:
+            - rk-c7-java:
                 cloud-name: 'Rackspace DFW - Integration Dynamic Lab'
                 count: '{controller-vms}'
                 stop-on-terminate: False
             - '{mininet-image}':
-                cloud-name: 'Rackspace DFW - Integration Dynamic Lab'
+                cloud-name: '{mininet-cloud-name}'
                 count: '{mininet-vms}'
                 stop-on-terminate: False