Make integration patch test build via Gerrit comments

Change-Id: I45dbda9c115505d0bc32920ea7d77d09c04df045
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/integration/integration-jobs.yaml b/jjb/integration/integration-jobs.yaml
index 93093df1394688f2a124458dde4573854efc3e58..a08fb171e5ecb45c476e877ea3499f4bcef4c4c3 100644 (file)
--- a/jjb/integration/integration-jobs.yaml
+++ b/jjb/integration/integration-jobs.yaml
@@ -277,12 +277,6 @@
     parameters:
         - project-parameter:
             project: 'integration'
-        - integration-patch-git:
-            patch-git: ''
-        - integration-patch-refspec:
-            patch-refspec: ''
-        - integration-patch-git-url:
-            patch-git-url: 'ssh://jenkins-$SILO@git.opendaylight.org:29418/$PATCHGIT'
 
     scm:
         - integration-gerrit-scm:
@@ -297,6 +291,24 @@
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
+    triggers:
+        - gerrit:
+            server-name: 'OpenDaylight'
+            trigger-on:
+                - comment-added-contains-event:
+                    comment-contains-value: 'test-integration'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: '**'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**'
+            skip-vote:
+                successful: true
+                failed: true
+                unstable: true
+                notbuilt: true
+
     prebuilders:
         - integration-get-bundle-url
         - inject:
@@ -304,7 +316,7 @@
         - wipe-org-opendaylight-repo
         - maven-target:
             maven-version: '{mvn32}'
-            pom: '$PATCHGIT/pom.xml'
+            pom: '$GERRIT_PROJECT/pom.xml'
             goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r source:jar javadoc:jar'
             java-opts:
                 - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index ab6fe55f10669f5b24f9eba03b8fb0aed1eb597e..b17eb4dabf36e76f01a43df1ea6b551340b147d6 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -46,38 +46,14 @@
             default: '{test-options}'
             description:  'Robot command options'
 
-- parameter:
-    name: integration-patch-git
-    parameters:
-        - string:
-            name: PATCHGIT
-            default: '{patch-git}'
-            description:  'Patch GIT repository'
-
-- parameter:
-    name: integration-patch-git-url
-    parameters:
-        - string:
-            name: PATCHGITURL
-            default: '{patch-git-url}'
-            description:  'Patch GIT URL (do not modify)'
-
-- parameter:
-    name: integration-patch-refspec
-    parameters:
-        - string:
-            name: PATCHREFSPEC
-            default: '{patch-refspec}'
-            description:  'Patch Refspec'
-
 - scm:
     name: integration-gerrit-scm
     scm:
         - git:
             credentials-id: '{credentials-id}'
-            url: '$PATCHGITURL'
-            basedir: '$PATCHGIT'
-            refspec: '$PATCHREFSPEC'
+            url: 'ssh://jenkins-$SILO@git.opendaylight.org:29418/$GERRIT_PROJECT'
+            basedir: '$GERRIT_PROJECT'
+            refspec: '$GERRIT_REFSPEC'
             branches:
                 - 'origin/{branch}'
             skip-tag: true