OpenStack Heat Orchestration Templates

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

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 83daad88bdfbfe1b864d2540a43452f326453463..e029397f850235eb01abb9412061715e9deb6b74 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -75,7 +75,7 @@
     parameters:
         - string:
             name: DISTROGITURL
-            default: 'ssh://jenkins-$SILO@git.opendaylight.org:29418/integration/distribution'
+            default: '{git-url}/integration/distribution'
             description: 'Distribution GIT URL (do not modify)'
 
 - parameter:
@@ -120,14 +120,20 @@
             skip-tag: true
 
 # 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
-
+# This is a single macro to use for all csit jobs who vote on every (relevant) patch set.
+# Only 'recheck' trigger word is supported, it always triggers the full set of relevant jobs,
+# in order to prevent Jenkins from starting only a subset and still voting Verified+1.
+# Contrary to gerrit-trigger-patch-submitted, this votes +1 also on unstable runs.
+# Arguments:
+#     server: name of gerrit server to listen to
+#     project: pattern to match triggering projects
+#     branch: triggering branch name
+#     files: pattern to match triggering filepaths
 - trigger:
     name: integration-trigger-patch-submitted
     triggers:
         - gerrit:
-            server-name: 'OpenDaylight'
+            server-name: '{server}'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'true'
@@ -136,43 +142,18 @@
                 - draft-published-event
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
             override-votes: true
             gerrit-build-unstable-verified-value: +1
             gerrit-build-unstable-codereview-value: 0
             projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{name}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                file-paths:
-                  - compare-type: 'ANT'
-                    pattern: '{pattern}'
-
-# 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-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: '{pattern}'
+                - project-compare-type: 'ANT'
+                  project-pattern: '{project}'
+                  branches:
+                      - branch-compare-type: 'ANT'
+                        branch-pattern: '**/{branch}'
+                  file-paths:
+                      - compare-type: 'ANT'
+                        pattern: '{files}'
 
 # Macro: integration-csit-only
 # Operation: this macro sets a trigger on reverse job list
@@ -278,6 +259,8 @@
 # Macro: integration-copy-ssh-keys
 # Operation: Copy ssh public key used as authentication for robot
 # Used by: {project}-csit-* job templates
+#
+# TODO: Remove this macro. This code is moved into the new macro opendaylight-infra-stack
 
 - builder:
     name: integration-copy-ssh-keys
@@ -465,7 +448,7 @@
             !include-raw:
                 - include-raw-integration-multipatch-distribution-test.sh
 
-# Macro: integration-cleanup-worspace
+# Macro: integration-cleanup-workspace
 # Operation: Cleans up files possibly left there by the previous build
 # Used by: {project}-csit-* job templates
 
@@ -529,7 +512,7 @@
             builders:
                 - shell: |
                     #!/bin/bash
-                    mkdir $WORKSPACE/archives
+                    mkdir -p $WORKSPACE/archives
                     curl --output robot-plugin.zip "$BUILD_URL/robot/report/*zip*/robot-plugin.zip"
                     unzip -d $WORKSPACE/archives robot-plugin.zip
                     mv *log* *.log *.log.gz *.csv *.png $WORKSPACE/archives || true  # Don't fail if file missing