Merge "Verify JJB when global-jjb is updated"

diff --git a/jjb-test/expected-xml/gerrit-ciman-jjb-merge b/jjb-test/expected-xml/gerrit-ciman-jjb-merge
index 12b0e87..30e26bb 100644 (file)
--- a/jjb-test/expected-xml/gerrit-ciman-jjb-merge
+++ b/jjb-test/expected-xml/gerrit-ciman-jjb-merge
@@ -146,6 +146,10 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
               <compareType>ANT</compareType>
               <pattern>**/*.yaml</pattern>
             </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.FilePath>
+            <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.FilePath>
+              <compareType>ANT</compareType>
+              <pattern>**/global-jjb</pattern>
+            </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.FilePath>
           </filePaths>
           <disableStrictForbiddenFileVerification>false</disableStrictForbiddenFileVerification>
         </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.GerritProject>

diff --git a/jjb-test/expected-xml/gerrit-ciman-jjb-verify b/jjb-test/expected-xml/gerrit-ciman-jjb-verify
index 69c3166..9d55382 100644 (file)
--- a/jjb-test/expected-xml/gerrit-ciman-jjb-verify
+++ b/jjb-test/expected-xml/gerrit-ciman-jjb-verify
@@ -146,6 +146,10 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
               <compareType>ANT</compareType>
               <pattern>**/*.yaml</pattern>
             </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.FilePath>
+            <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.FilePath>
+              <compareType>ANT</compareType>
+              <pattern>**/global-jjb</pattern>
+            </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.FilePath>
           </filePaths>
           <disableStrictForbiddenFileVerification>false</disableStrictForbiddenFileVerification>
         </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.GerritProject>

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index d927ca3..cebe4bc 100644 (file)
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -150,6 +150,8 @@
         pattern: '**/*.sh'
       - compare-type: ANT
         pattern: '**/*.yaml'
+      - compare-type: ANT
+        pattern: '**/global-jjb'
 
     #####################
     # Job Configuration #