Merge "Make -daily- jobs run only on Sunday"

diff --git a/jenkins-admin/del_computer.groovy b/jenkins-admin/del_computer.groovy
new file mode 100644 (file)
index 0000000..0143887
--- /dev/null
+++ b/jenkins-admin/del_computer.groovy
@@ -0,0 +1,39 @@
+/*****************
+* Removes offline slave nodes
+*
+* NOTE: Some slaves can't be removed as the backing instance already is
+* missing but the UI collection didn't get the update. See the
+* slay_computer.groovy for a more drastic destruction
+*
+* NOTE 2: If you have any slaves you want to live through this and you
+* have them currently marked offline you _must_ bring them back online.
+*****************/
+
+import hudson.model.*
+
+def numberOfflineNodes = 0
+def numberNodes = 0
+
+slaveNodes = hudson.model.Hudson.instance
+
+for (slave in slaveNodes.nodes) {
+    def computer = slave.computer
+    numberNodes ++
+    println ""
+    println "Checking computer ${computer.name}:"
+    if (computer.offline) {
+        numberOfflineNodes ++
+        println '\tcomputer.isOffline: ' + slave.getComputer().isOffline()
+        println '\tcomputer.offline: ' + computer.offline
+        println '\tRemoving slave'
+        slaveNodes.removeNode(slave)
+    } else {
+        println '\tcomputer.isOffline: ' + slave.getComputer().isOffline()
+        println '\tcomputer.offline: ' + computer.offline
+    }
+}
+
+println "Number of Offline Nodes: " + numberOfflineNodes
+println "Number of Nodes: " + numberNodes
+
+// vim: sw=4 sts=4 ts=4 et ai :

diff --git a/jenkins-admin/slay_computer.groovy b/jenkins-admin/slay_computer.groovy
new file mode 100644 (file)
index 0000000..97ede6c
--- /dev/null
+++ b/jenkins-admin/slay_computer.groovy
@@ -0,0 +1,35 @@
+/*****************
+* Completely slays misbehaving slave nodes
+*
+* NOTE: Use del_computer.groovy first! If nodes are still hanging around
+* _then_ consider using this script. This one is mucking around in a
+* location we should not normally be touching, however if a slave
+* refuses to go away (tosses an exception) this _will_ get rid of it.
+*
+* NOTE 2: If you have any slaves you want to live through this and you
+* have them currently marked offline you _must_ bring them back online.
+*****************/
+
+import jenkins.*
+import jenkins.model.*
+import hudson.*
+import hudson.model.*
+
+for (aComputer in Jenkins.instance.computers) {
+    try {
+        println "displayName: " + aComputer.properties.displayName
+        println "offline: " + aComputer.properties.offline
+        println "temporarilyOffline: " + aComputer.properties.temporarilyOffline
+        if (aComputer.properties.offline) {
+            println "Bad node, removing"
+            Jenkins.instance.removeComputer(aComputer)
+        }
+        println ""
+    }
+    catch (NullPointerException nullPointer) {
+        println "NullPointerException caught"
+        println ""
+    }
+}
+
+// vim: sw=4 sts=4 ts=4 et ai :

diff --git a/jjb-templates/clm.yaml b/jjb-templates/clm.yaml
index ff6f8e5b8e79a875ad8e51f28de1c55945113a9b..9d5e433f6636396944dab6b46925514254a6175e 100644 (file)
--- a/jjb-templates/clm.yaml
+++ b/jjb-templates/clm.yaml
@@ -39,7 +39,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{JENKINS_SETTINGS}'
         global-settings: '{odl-global-settings}'

diff --git a/jjb-templates/merge.yaml b/jjb-templates/merge.yaml
index 60339777e09b1bdc9a32c708991a60dd09189f19..db400f33f620e628370a072c620888d6aee9bfd3 100644 (file)
--- a/jjb-templates/merge.yaml
+++ b/jjb-templates/merge.yaml
@@ -23,6 +23,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:

diff --git a/jjb-templates/sonar.yaml b/jjb-templates/sonar.yaml
index afcfe9a3a95884d5032aff8c917dcde456237845..26f80b4012b62bfea0ecc93ee2f1ff8c011d1a14 100644 (file)
--- a/jjb-templates/sonar.yaml
+++ b/jjb-templates/sonar.yaml
@@ -28,7 +28,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'PROJECT_PATH'
 

diff --git a/jjb-templates/validate-autorelease.yaml b/jjb-templates/validate-autorelease.yaml
index 8ebc14e46bfaf89ceed3ead0fc6de4cd697232c0..6f014a45fcf68b6aa5b50a407ee494db436a5938 100644 (file)
--- a/jjb-templates/validate-autorelease.yaml
+++ b/jjb-templates/validate-autorelease.yaml
@@ -42,9 +42,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'PROJECT_PATH'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'PROJECT_PATH'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb-templates/verify.yaml b/jjb-templates/verify.yaml
index 34c5f1f70c1624bf69f9ada29e7d40439e609dd2..afe1078dac3cfd8900e966bcc4f9b86a6737ba23 100644 (file)
--- a/jjb-templates/verify.yaml
+++ b/jjb-templates/verify.yaml
@@ -34,6 +34,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:

diff --git a/jjb/aaa/aaa.cfg b/jjb/aaa/aaa.cfg
index c92ca5416df7fb758210c26a00415c2b57192549..9a1b2f3d88f7a9fb16f12dafc0960316eb2bdffb 100644 (file)
--- a/jjb/aaa/aaa.cfg
+++ b/jjb/aaa/aaa.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 5c3091975937336d6cba11ff33bee76c21537830..07f8d1dcfa2c043ca890e558c5ece9f9d23f07c1 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -83,6 +90,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -147,6 +156,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -436,7 +449,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -445,7 +458,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'aaa'
 
@@ -516,7 +529,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{aaa-settings}'
         global-settings: '{odl-global-settings}'
@@ -573,9 +586,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'aaa'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'aaa'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/alto/alto.cfg b/jjb/alto/alto.cfg
index 7e8a91ab3a322de6b6f67205b79431fa2da0d6ae..1ceda8e9d448c1d86c673645b69678811c8fc999 100644 (file)
--- a/jjb/alto/alto.cfg
+++ b/jjb/alto/alto.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml
index 1ffc79db49060525617eb659d75ee9cc330ba5fc..3c87cfedd0c8e44254d1540ad3c815e23e2e1bc4 100644 (file)
--- a/jjb/alto/alto.yaml
+++ b/jjb/alto/alto.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -77,6 +84,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -141,6 +150,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -430,7 +443,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -439,7 +452,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'alto'
 
@@ -510,7 +523,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{alto-settings}'
         global-settings: '{odl-global-settings}'
@@ -567,9 +580,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'alto'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'alto'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/armoury/armoury.cfg b/jjb/armoury/armoury.cfg
index fe1d9f2ff6182d9f631a645f608ea26ae89182a3..e5708497427ddd0a105db332c23e92150d4d27e6 100644 (file)
--- a/jjb/armoury/armoury.cfg
+++ b/jjb/armoury/armoury.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk8,openjdk7
 - beryllium:
     branch: master
     jdks: openjdk8,openjdk7

diff --git a/jjb/armoury/armoury.yaml b/jjb/armoury/armoury.yaml
index 7c632aa62f89d6c3b8dd20b7e57fd32feb439bb0..4b2f488892b31d87a4875665b5e163f1ce045629 100644 (file)
--- a/jjb/armoury/armoury.yaml
+++ b/jjb/armoury/armoury.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk8
+            jdks:
+                - openjdk8
+                - openjdk7
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk8
@@ -71,6 +78,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -135,6 +144,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -424,7 +437,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -433,7 +446,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'armoury'
 
@@ -504,7 +517,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{armoury-settings}'
         global-settings: '{odl-global-settings}'
@@ -561,9 +574,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'armoury'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'armoury'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/autorelease/include-raw-autorelease-release-versions.sh b/jjb/autorelease/include-raw-autorelease-release-versions.sh
index bbf90e22614231696a4b21a06d11de19955630ac..99c40872a5be5d4091caea858ef52d3fcf71788b 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-release-versions.sh
+++ b/jjb/autorelease/include-raw-autorelease-release-versions.sh
@@ -13,6 +13,9 @@
 # RELEASE_TAG=Helium-SR2  # Example
 # RELEASE_BRANCH=stable/helium  # Example
 
+# Directory to put git format-patches
+PATCH_DIR=`pwd`/patches
+
 if [ "$DATESTAMP" == "true" ]; then
    export RELEASE_TAG=$RELEASE_TAG-`date -u +v%Y%m%d%H%M`
 fi
@@ -25,9 +28,9 @@ git commit -am "Release $RELEASE_TAG"
 mkdir patches
 modules=`xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -m '//x:modules' -v '//x:module' pom.xml`
 for module in $modules; do
-    cd $module
-    git format-patch --stdout origin/$RELEASE_BRANCH > ../patches/$module.patch
-    cd ..
+    pushd $module
+    git format-patch --stdout origin/$RELEASE_BRANCH > $PATCH_DIR/${module//\//-}.patch
+    popd
 done
 
 ./scripts/fix-relativepaths.sh

diff --git a/jjb/bgpcep/bgpcep.cfg b/jjb/bgpcep/bgpcep.cfg
index 2b170df0ed257137984e1ad127d3609295ad8c0c..329719100373c2d177a3b850033b1884ef3a7270 100644 (file)
--- a/jjb/bgpcep/bgpcep.cfg
+++ b/jjb/bgpcep/bgpcep.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index a937b046cc05f04d5b2863dc0ba57f3aebe2b081..5f3bccae4620829107d9fdeee981a79cbec4acf7 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -84,6 +91,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -148,6 +157,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -437,7 +450,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -446,7 +459,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'bgpcep'
 
@@ -517,7 +530,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{bgpcep-settings}'
         global-settings: '{odl-global-settings}'
@@ -574,9 +587,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'bgpcep'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'bgpcep'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/capwap/capwap.cfg b/jjb/capwap/capwap.cfg
index 5becb24c7b5ac2830619a214af8d4cadf8bed36c..3f92fda089af78520e2919b4b25f62af8a95effe 100644 (file)
--- a/jjb/capwap/capwap.cfg
+++ b/jjb/capwap/capwap.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index 78d6b599e19063bec0c5dacdf114a3eddd40b0a1..d39b32776cb7f9de19a59c443f2bf3ad0bc2df09 100644 (file)
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -77,6 +84,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -141,6 +150,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -430,7 +443,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -439,7 +452,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'capwap'
 
@@ -510,7 +523,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{capwap-settings}'
         global-settings: '{odl-global-settings}'
@@ -567,9 +580,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'capwap'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'capwap'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/centinel/centinel.cfg b/jjb/centinel/centinel.cfg
index ae96f12ab8f1b0bb6fb70f2a960b9f67a2d582f6..8a429298dc7880296f2c32a76e296f6ccefc5e2a 100644 (file)
--- a/jjb/centinel/centinel.cfg
+++ b/jjb/centinel/centinel.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml
index 8dfaded019282ec2feaa8a31d928774cc263a028..1079a2950718d15847b84bf2a544a1ee8907fe51 100644 (file)
--- a/jjb/centinel/centinel.yaml
+++ b/jjb/centinel/centinel.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -71,6 +78,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -135,6 +144,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -424,7 +437,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -433,7 +446,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'centinel'
 
@@ -504,7 +517,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{centinel-settings}'
         global-settings: '{odl-global-settings}'
@@ -561,9 +574,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'centinel'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'centinel'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/controller/controller.cfg b/jjb/controller/controller.cfg
index 237183d725731870f63ae3a6fc4b12c5d6cb3eb3..236f40160afc1a50280c72e5e49f13bfd59543ac 100644 (file)
--- a/jjb/controller/controller.cfg
+++ b/jjb/controller/controller.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 3491e57d1f6823c19db3a2131d2dfe48bf4a55db..ee76f37045f35e07647828a267b21ffa10b9ac31 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -84,6 +91,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -148,6 +157,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -437,7 +450,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -446,7 +459,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'controller'
 
@@ -517,7 +530,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{controller-settings}'
         global-settings: '{odl-global-settings}'
@@ -574,9 +587,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'controller'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'controller'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
index 628ae5b9fe447b33014dfb714b582e2a08a2a3e6..06617fec04ed3196fefe6428041ecd9f03918e49 100644 (file)
--- a/jjb/coretutorials/coretutorials.yaml
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -76,6 +76,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -140,6 +142,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -438,7 +444,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'coretutorials'
 
@@ -509,7 +515,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{coretutorials-settings}'
         global-settings: '{odl-global-settings}'
@@ -566,9 +572,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'coretutorials'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'coretutorials'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/defense4all/defense4all.yaml b/jjb/defense4all/defense4all.yaml
index b33f22b0bd6bb72ca146e14bfd7fe51b57a4676f..8073a78849f33c27e904cf7a3f52284951a40f7b 100644 (file)
--- a/jjb/defense4all/defense4all.yaml
+++ b/jjb/defense4all/defense4all.yaml
@@ -82,6 +82,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -146,6 +148,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -444,7 +450,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'defense4all'
 
@@ -515,7 +521,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{defense4all-settings}'
         global-settings: '{odl-global-settings}'
@@ -572,9 +578,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'defense4all'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'defense4all'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/didm/didm.cfg b/jjb/didm/didm.cfg
index 785ed4f12af0453353068ab167cd70293f7ca27a..7639536ee0c132107e951583ac289c0788bb4c98 100644 (file)
--- a/jjb/didm/didm.cfg
+++ b/jjb/didm/didm.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml
index 7f99bb57d61da2c66da897821facabcf420f59b6..9e6ebd9d61eb537a796b21802cb21ca1418a815e 100644 (file)
--- a/jjb/didm/didm.yaml
+++ b/jjb/didm/didm.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -77,6 +84,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -141,6 +150,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -430,7 +443,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -439,7 +452,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'didm'
 
@@ -510,7 +523,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{didm-settings}'
         global-settings: '{odl-global-settings}'
@@ -567,9 +580,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'didm'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'didm'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/discovery/discovery.yaml b/jjb/discovery/discovery.yaml
index 24461749958535f72a413d8235bba1a3a52a2b02..ab084f28316d1a260caf182f55377c2434bb9c81 100644 (file)
--- a/jjb/discovery/discovery.yaml
+++ b/jjb/discovery/discovery.yaml
@@ -70,6 +70,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -134,6 +136,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -432,7 +438,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'discovery'
 
@@ -503,7 +509,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{discovery-settings}'
         global-settings: '{odl-global-settings}'
@@ -560,9 +566,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'discovery'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'discovery'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/dlux/dlux.cfg b/jjb/dlux/dlux.cfg
index 81bc06d8cc5df5b000574f09de4a8ea50f557164..8bc03162624ae6f836f09d52ad600101941a304a 100644 (file)
--- a/jjb/dlux/dlux.cfg
+++ b/jjb/dlux/dlux.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index 1fb01e86ce2625eecb0fc2fad46d4e52456d28c0..e2de21b5d5fcb9006e4000bb7dd33558de31c7be 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -83,6 +90,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -147,6 +156,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -436,7 +449,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -445,7 +458,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'dlux'
 
@@ -516,7 +529,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{dlux-settings}'
         global-settings: '{odl-global-settings}'
@@ -573,9 +586,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'dlux'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'dlux'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/docs/docs.cfg b/jjb/docs/docs.cfg
index 81bc06d8cc5df5b000574f09de4a8ea50f557164..8bc03162624ae6f836f09d52ad600101941a304a 100644 (file)
--- a/jjb/docs/docs.cfg
+++ b/jjb/docs/docs.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/docs/docs.yaml b/jjb/docs/docs.yaml
index 945d89df9f2965e45361b53edf0fd4d04469e8f2..9a1fec526de8b09a16b2975690d7c10989b94990 100644 (file)
--- a/jjb/docs/docs.yaml
+++ b/jjb/docs/docs.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -83,6 +90,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -147,6 +156,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -436,7 +449,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -445,7 +458,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'docs'
 
@@ -516,7 +529,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{docs-settings}'
         global-settings: '{odl-global-settings}'
@@ -573,9 +586,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'docs'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'docs'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/faas/faas.cfg b/jjb/faas/faas.cfg
index 916bcc46e4653ba67e3e945036c599ccd296fd58..8053a6653a086ddecdbdfc55e5924fb343ed08aa 100644 (file)
--- a/jjb/faas/faas.cfg
+++ b/jjb/faas/faas.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml
index f5ba8fb4fd56ae1fc0c953e259d26d2fe93ca866..b6499f64ae14906587813dbefbd6bd1906a636cf 100644 (file)
--- a/jjb/faas/faas.yaml
+++ b/jjb/faas/faas.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -71,6 +78,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -135,6 +144,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -424,7 +437,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -433,7 +446,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'faas'
 
@@ -504,7 +517,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{faas-settings}'
         global-settings: '{odl-global-settings}'
@@ -561,9 +574,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'faas'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'faas'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
index 011f02aea8342ba54ceaa6a2110006d4a58ba7b6..cad55f3a2672886943f4f20bef6e39c855d23e98 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
@@ -32,7 +32,7 @@
     install-features: 'odl-groupbasedpolicy-ofoverlay,odl-groupbasedpolicy-ui,odl-restconf-all'
 
     # Robot custom options
-    robot-options: ''
+    robot-options: '-v ODL_VERSION:{stream}'
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'groupbasedpolicy-distribution-{stream},

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
index f4140dfd94bcd1b737a1fb65a2b055e930f53836..c66cb5ed81927b2a0c92c159931f622d62ea1af6 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
@@ -27,7 +27,7 @@
     install-features: 'odl-groupbasedpolicy-ofoverlay,odl-groupbasedpolicy-ui,odl-restconf-all'
 
     # Robot custom options
-    robot-options: ''
+    robot-options: '-v ODL_VERSION:{stream}'
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'odlparent-distribution-{stream},neutron-distribution-{stream},ovsdb-distribution-{stream},controller-distribution-{stream},openflowplugin-distribution-{stream},yangtools-distribution-{stream},sfc-distribution-{stream},dlux-distribution-{stream}'

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.cfg b/jjb/groupbasedpolicy/groupbasedpolicy.cfg
index b5a4f54704404b4614b0f3d76ba2431ecfdb7e57..fcb7ba050cd82784a400e3ae28206072e4c626ec 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.cfg
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index a76e5d954eb8df2771fe29dc2a9aed9ecdbddfe8..1c033ebc3bcce27091de27ec8eb5d85b780bfad5 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -83,6 +90,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -147,6 +156,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -436,7 +449,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -445,7 +458,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'groupbasedpolicy'
 
@@ -516,7 +529,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{groupbasedpolicy-settings}'
         global-settings: '{odl-global-settings}'
@@ -573,9 +586,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'groupbasedpolicy'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'groupbasedpolicy'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/integration/include-raw-integration-get-slave-addresses.sh b/jjb/integration/include-raw-integration-get-slave-addresses.sh
index 804e10db73fa5f3be54c341d785351d5d11e567e..e498baab120d4d4fe564d0d643936c4cd4cc3908 100644 (file)
--- a/jjb/integration/include-raw-integration-get-slave-addresses.sh
+++ b/jjb/integration/include-raw-integration-get-slave-addresses.sh
@@ -8,7 +8,7 @@ IFS=',' read -ra ADDR <<< "${JCLOUDS_IPS}"
 for i in "${ADDR[@]}"
 do
     REMHOST=`ssh ${i} hostname`
-    if [ `echo ${REMHOST} | grep java` ]; then
+    if [ `echo ${REMHOST} | grep 'java\|devstack'` ]; then
         ODL_SYSTEM=( "${ODL_SYSTEM[@]}" "${i}" )
     else
         TOOLS_SYSTEM=( "${TOOLS_SYSTEM[@]}" "${i}" )

diff --git a/jjb/integration/include-raw-integration-install-robotframework.sh b/jjb/integration/include-raw-integration-install-robotframework.sh
index 78cae49c5a714d7711ddc4b11d11f54867f91dc0..f0ea3b049dc348a211b1d90c8f2ab990161f34c1 100644 (file)
--- a/jjb/integration/include-raw-integration-install-robotframework.sh
+++ b/jjb/integration/include-raw-integration-install-robotframework.sh
@@ -18,7 +18,7 @@ source ${ROBOT_VENV}/bin/activate
 pip install -q --upgrade pip
 pip --version
 pip install -q docker-py importlib requests scapy netifaces netaddr ipaddr
-pip install -q robotframework{,-{httplibrary,requests,sshlibrary}}
+pip install -q robotframework{,-{httplibrary,requests,sshlibrary,selenium2library}}
 # jsonpath is needed by current AAA idmlite suite
 pip install -q --allow-external jsonpath --allow-unverified jsonpath jsonpath
 

diff --git a/jjb/integration/include-raw-integration-multipatch-distribution-test.sh b/jjb/integration/include-raw-integration-multipatch-distribution-test.sh
index b84122c7a3db22d59ca9c6852d11ef5395ac3dbc..eddf2b52e5b9db3c3081dcacee47b6e0763f88e6 100644 (file)
--- a/jjb/integration/include-raw-integration-multipatch-distribution-test.sh
+++ b/jjb/integration/include-raw-integration-multipatch-distribution-test.sh
@@ -16,51 +16,68 @@ echo "<modelVersion>4.0.0</modelVersion>" >> $POM_FILE
 echo "<packaging>pom</packaging>" >> $POM_FILE
 echo "<modules>" >> $POM_FILE
 
+# Set up git committer name and email, needed for commit creation when cherry-picking.
+export EMAIL="sandbox@jenkins.opendaylight.org"
+# TODO: Is there a more appropriate e-mail?
+export GIT_COMMITTER_NAME="Multipatch Job"
+
+# TODO: Is "patches" still the correct word?
 IFS=',' read -ra PATCHES <<< "${PATCHES_TO_BUILD}"
 
-# for each patch, clone the project, and fetch/checkout the patch set.
-# each patch is found in the ${PATCHES_TO_BUILD} variable as a comma
-# separated list of project:changeset values
-# Example:  PATCHES_TO_BUILD=snmp:97/27997/1,tcpmd5:91/26391/3
+# For each patch, clone the project.
+# Optionally checkout a specific patch set.
+# Also optionally, cherry-pick series of patch sets.
+# Each patch is found in the ${PATCHES_TO_BUILD} variable
+# as a comma separated list of project[=checkout][:cherry-pick]* values
 #
-# TODO: this version will not handle multiple patches from the same project and will be
-#       done at a later time.  cherry-picking will be needed, with more complex logic
+# Example:  PATCHES_TO_BUILD='odlparent=45/30045/2,yangtools:53/26853/25,mdsal,controller=61/29761/5:45/29645/6,bgpcep:39/30239/1:59/30059/2'
 #
-distribution_status="not_patched"
-for i in "${PATCHES[@]}"
+distribution_status="not_included"
+for patch_code in "${PATCHES[@]}"
 do
-    echo "working on ${i}"
-    PROJECT=`echo ${i} | cut -d\: -f 1`
+    echo "working on ${patch_code}"
+    PROJECT=`echo ${patch_code} | cut -d\: -f 1 | cut -d\= -f 1`
     if [ "${PROJECT}" == "integration/distribution" ]; then
-        distribution_status="patched"
+        distribution_status="included"
     fi
     PROJECT_SHORTNAME="${PROJECT##*/}"  # http://stackoverflow.com/a/3162500
-    PATCH=`echo ${i} | cut -d\: -f 2`
-    echo "<module>${PROJECT_SHORTNAME}</module>" >> $POM_FILE
-    echo "cloning ${PROJECT} and checking out ${PATCH}"
-    git clone https://git.opendaylight.org/gerrit/p/${PROJECT}
+    echo "cloning project ${PROJECT}"
+    git clone "https://git.opendaylight.org/gerrit/p/${PROJECT}"
+    echo "<module>${PROJECT_SHORTNAME}</module>" >> ${POM_FILE}
     cd ${PROJECT_SHORTNAME}
-    git fetch https://git.opendaylight.org/gerrit/${PROJECT} refs/changes/${PATCH}
-    git checkout FETCH_HEAD
-    cd $BUILD_DIR
+    CHECKOUT=`echo ${patch_code} | cut -d\= -s -f 2 | cut -d\: -f 1`
+    if [ "x${CHECKOUT}" != "x" ]; then
+        echo "checking out ${CHECKOUT}"
+        git fetch "https://git.opendaylight.org/gerrit/${PROJECT}" "refs/changes/$CHECKOUT"
+        git checkout FETCH_HEAD
+    else
+        echo "checking out ${DISTRIBUTION_BRANCH_TO_BUILD}"
+        git checkout "${DISTRIBUTION_BRANCH_TO_BUILD}"
+    fi
+    PICK_SEGMENT=`echo "${patch_code}" | cut -d\: -s -f 2-`
+    IFS=':' read -ra PICKS <<< "${PICK_SEGMENT}"
+    for pick in "${PICKS[@]}"
+    do
+        echo "cherry-picking ${pick}"
+        git fetch "https://git.opendaylight.org/gerrit/${PROJECT}" "refs/changes/${pick}"
+        git cherry-pick --ff --keep-redundant-commits FETCH_HEAD
+    done
+    cd "${BUILD_DIR}"
 done
 
-# if distribution was not cloned above, we still need to get it
-if [ "${distribution_status}" == "not_patched" ]; then
-    git clone https://git.opendaylight.org/gerrit/p/integration/distribution
-    echo "<module>distribution</module>" >> $POM_FILE
-fi
-
-# finish pom file
-echo "</modules>" >> $POM_FILE
-echo "</project>" >> $POM_FILE
-
-# by default we can stay in master branch or checkout something else here
-if [ "${DISTRIBUTION_BRANCH_TO_BUILD}" != "master" ]; then
+if [ "${distribution_status}" == "not_included" ]; then
+    echo "adding integration/distribution"
+    # clone distribution and add it as a module in root pom
+    git clone "https://git.opendaylight.org/gerrit/p/integration/distribution"
     cd distribution
-    git checkout ${DISTRIBUTION_BRANCH_TO_BUILD}
+    git checkout "${DISTRIBUTION_BRANCH_TO_BUILD}"
+    cd "${BUILD_DIR}"
+    echo "<module>distribution</module>" >> ${POM_FILE}
 fi
 
+# finish pom file
+echo "</modules>" >> ${POM_FILE}
+echo "</project>" >> ${POM_FILE}
 
 # Extract the BUNDLEVERSION from the distribution pom.xml
 BUNDLEVERSION=`xpath $BUILD_DIR/distribution/pom.xml '/project/version/text()' 2> /dev/null`

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 99a6db416bef26a5a52f0115e94fbc188b479855..ba544ca79049ef30b7bf3e4e56dde64abeb7c198 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -114,6 +114,9 @@
                     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}'

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index e2f45d2cfc763fc5a43825798da2f91fbbc3b63a..9833f911e5b08aa9ca0791d382a13c428cba4cef 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -96,7 +96,7 @@
     publishers:
         - integration-robot:
             unstable-if: 0.0
-            pass-if: 0.0
+            pass-if: 100.0
         - archive:
             artifacts: 'karaf.log*'
         - email-notification:
@@ -276,7 +276,7 @@
     publishers:
         - integration-robot:
             unstable-if: 0.0
-            pass-if: 0.0
+            pass-if: 100.0
         - archive:
             artifacts: 'karaf.log*'
         - email-notification:
@@ -552,7 +552,7 @@
     publishers:
         - integration-robot:
             unstable-if: 0.0
-            pass-if: 0.0
+            pass-if: 100.0
         - archive:
             artifacts: '*karaf.log*'
         - email-notification:

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 95d3964f97998f369f3d86fc630dd114b0e3d3de..9b08b8b8431804f78126f0de688a4622c4bd558d 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -56,9 +56,7 @@
                 usc-csit-1node-channel-only-{stream},
                 usc-csit-1node-channel-all-{stream},
                 vpnservice-csit-1node-vpnservice-only-{stream},
-                vpnservice-csit-1node-vpnservice-all-{stream},
-                vtn-csit-1node-manager-only-{stream},
-                vtn-csit-1node-manager-all-{stream}
+                vpnservice-csit-1node-vpnservice-all-{stream}
 
         - stable-lithium:
             branch: 'stable/lithium'
@@ -259,7 +257,7 @@
     publishers:
         - integration-robot:
             unstable-if: 0.0
-            pass-if: 0.0
+            pass-if: 100.0
         - archive:
             artifacts: 'karaf.log*'
         - email-notification:
@@ -431,15 +429,19 @@
         - integration-multipatch-builder
         - inject:
             properties-file: 'bundle.txt'
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{yangtools-settings}'
+
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'patch_tester/pom.xml'
-        goals: 'clean install -f patch_tester/pom.xml -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-        settings: '{integration-settings}'
+        # TODO: Make Maven option configurable. Currently tests are not skipped, everything elase is.
+        goals: 'clean install -f patch_tester/pom.xml -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+        settings: '{yangtools-settings}'
         global-settings: '{odl-global-settings}'
-        ignore-upstream-changes: true
         post-step-run-condition: 'SUCCESS'
 
     postbuilders:

diff --git a/jjb/iotdm/iotdm.cfg b/jjb/iotdm/iotdm.cfg
index 0176c40e1064de0cfc322a63457ba5e4ebd7b010..bfa26c7a79e75cb46e0ceaed2badcfc3c0d5950b 100644 (file)
--- a/jjb/iotdm/iotdm.cfg
+++ b/jjb/iotdm/iotdm.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
index 36007cf429da2c6a87719cc1092bebf699455a3e..7e08819c79096df2ae14c74b374faf9a2e836bda 100644 (file)
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -78,6 +85,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -142,6 +151,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -431,7 +444,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -440,7 +453,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'iotdm'
 
@@ -511,7 +524,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{iotdm-settings}'
         global-settings: '{odl-global-settings}'
@@ -568,9 +581,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'iotdm'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'iotdm'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/l2switch/l2switch.cfg b/jjb/l2switch/l2switch.cfg
index 1575192d50c3dc1bcd027ae9481826cab25efac3..b2d0d427e7b6d65e48d5a13a76c71585508d02e8 100644 (file)
--- a/jjb/l2switch/l2switch.cfg
+++ b/jjb/l2switch/l2switch.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 919d55a005a05c287c9d50530671dc4ab148deef..dfce4940c7614c3aae88656987a6b0bb3863708b 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -83,6 +90,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -147,6 +156,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -436,7 +449,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -445,7 +458,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'l2switch'
 
@@ -516,7 +529,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{l2switch-settings}'
         global-settings: '{odl-global-settings}'
@@ -573,9 +586,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'l2switch'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'l2switch'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/lacp/lacp.cfg b/jjb/lacp/lacp.cfg
index 2f8e5b91d8a4e39e0d7457c4f6253c1f6b8794b4..3a335975b042bc636fa430c550cd299948228413 100644 (file)
--- a/jjb/lacp/lacp.cfg
+++ b/jjb/lacp/lacp.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index b4ea5806a6f0da4a58aa75bc4a8c8561d9dcf591..122cd33a5c92718c19524d37c51921152ee3cebf 100644 (file)
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -77,6 +84,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -141,6 +150,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -430,7 +443,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -439,7 +452,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'lacp'
 
@@ -510,7 +523,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{lacp-settings}'
         global-settings: '{odl-global-settings}'
@@ -567,9 +580,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'lacp'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'lacp'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/lispflowmapping/lispflowmapping.cfg b/jjb/lispflowmapping/lispflowmapping.cfg
index d6370749b2676e6f7cb2509da057e543ba96ec6e..b709b6c8a9af72c3a16810b112aa2a74fdcfb246 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.cfg
+++ b/jjb/lispflowmapping/lispflowmapping.cfg
@@ -1,5 +1,8 @@
-MVN_GOALS: clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+MVN_GOALS: clean install findbugs:findbugs javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index b0fb05005991381e3679d28304af4e968a746735..143fd0bd71148b1455bd05f6f94253d510824707 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -84,6 +91,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -111,7 +120,7 @@
         - maven-target:
             maven-version: '{mvn33}'
             pom: 'pom.xml'
-            goals: 'clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
+            goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
             java-opts:
                 - '-Xmx1024m -XX:MaxPermSize=256m'
             settings: '{lispflowmapping-settings}'
@@ -148,6 +157,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -176,7 +189,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge -Dstream={stream}'
+        goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge -Dstream={stream}'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: '{lispflowmapping-settings}'
         global-settings: '{odl-global-settings}'
@@ -275,7 +288,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: '{lispflowmapping-settings}'
         global-settings: '{odl-global-settings}'
@@ -403,7 +416,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: '{lispflowmapping-settings}'
         global-settings: '{odl-global-settings}'
@@ -437,7 +450,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -446,7 +459,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'lispflowmapping'
 
@@ -460,7 +473,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dsonar'
+        goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dsonar'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: '{lispflowmapping-settings}'
         global-settings: '{odl-global-settings}'
@@ -517,7 +530,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{lispflowmapping-settings}'
         global-settings: '{odl-global-settings}'
@@ -574,9 +587,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'lispflowmapping'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'lispflowmapping'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/mdsal/mdsal.cfg b/jjb/mdsal/mdsal.cfg
index 2f2b41a2c837e5bfe7bf1f038a703691f271d070..28ff7d0c5d8890dd8b74d12bfc5356f4712ff765 100644 (file)
--- a/jjb/mdsal/mdsal.cfg
+++ b/jjb/mdsal/mdsal.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 48ee3cb4bc95a80771957419dc71ec8a1860a34b..4c888a30a952d3f8c783909748dc4da4bde56a18 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -71,6 +78,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -135,6 +144,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -424,7 +437,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -433,7 +446,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'mdsal'
 
@@ -504,7 +517,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{mdsal-settings}'
         global-settings: '{odl-global-settings}'
@@ -561,9 +574,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'mdsal'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'mdsal'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/messaging4transport/messaging4transport.cfg b/jjb/messaging4transport/messaging4transport.cfg
index 1b5d748dddbdf9b09567f8ed002b0876daf56c72..d3e52f92c9ca62880618881bf9b7ccf707b2806d 100644 (file)
--- a/jjb/messaging4transport/messaging4transport.cfg
+++ b/jjb/messaging4transport/messaging4transport.cfg
@@ -1,5 +1,8 @@
 DEPENDENCIES: yangtools,aaa,controller,odlparent
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml
index 1cfcdd154adc9f9e2a91e92a25711e015290e41c..735159219c6203e0e373097f2ce88e30b9b9df9e 100644 (file)
--- a/jjb/messaging4transport/messaging4transport.yaml
+++ b/jjb/messaging4transport/messaging4transport.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -71,6 +78,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -135,6 +144,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -424,7 +437,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -433,7 +446,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'messaging4transport'
 
@@ -504,7 +517,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{messaging4transport-settings}'
         global-settings: '{odl-global-settings}'
@@ -561,9 +574,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'messaging4transport'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'messaging4transport'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml
new file mode 100644 (file)
index 0000000..5e759d0
--- /dev/null
+++ b/jjb/nemo/nemo-csit-engine.yaml
@@ -0,0 +1,31 @@
+- project:
+    name: nemo-csit-engine
+    jobs:
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
+
+    # The project name
+    project: 'nemo'
+
+    # The functionality under test
+    functionality: 'engine'
+
+    # Project branches
+    stream:
+        - beryllium:
+            branch: 'master'
+
+    install:
+        - only:
+            scope: 'only'
+        - all:
+            scope: 'all'
+
+    # Features to install
+    install-features: 'odl-restconf,odl-mdsal-apidocs,odl-nemo-engine-ui'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'odlparent-distribution-{stream},yangtools-distribution-{stream},controller-distribution-{stream},nemo-distribution-{stream}'

diff --git a/jjb/nemo/nemo.cfg b/jjb/nemo/nemo.cfg
index 916bcc46e4653ba67e3e945036c599ccd296fd58..8053a6653a086ddecdbdfc55e5924fb343ed08aa 100644 (file)
--- a/jjb/nemo/nemo.cfg
+++ b/jjb/nemo/nemo.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml
index a92f61dc7bad8afc81af05aceebeed05ab056cd1..f39bfbd5924481d58d1050a8894b652c824c75f8 100644 (file)
--- a/jjb/nemo/nemo.yaml
+++ b/jjb/nemo/nemo.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -71,6 +78,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -135,6 +144,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -424,7 +437,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -433,7 +446,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'nemo'
 
@@ -504,7 +517,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{nemo-settings}'
         global-settings: '{odl-global-settings}'
@@ -561,9 +574,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'nemo'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'nemo'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/netconf/netconf.cfg b/jjb/netconf/netconf.cfg
index a4b52c9fa29cd0fd98121462dd917fa45c215ed2..39d998ae286330870da4f9840f2ffc1c2ade64b2 100644 (file)
--- a/jjb/netconf/netconf.cfg
+++ b/jjb/netconf/netconf.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index df9ef96cc89ab22cf9ee718a25dba70592b14e5a..14ac71ab11d644c7a50853196bafc95c888b56ef 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -71,6 +78,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -135,6 +144,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -424,7 +437,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -433,7 +446,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'netconf'
 
@@ -504,7 +517,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{netconf-settings}'
         global-settings: '{odl-global-settings}'
@@ -561,9 +574,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'netconf'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'netconf'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/netide/netide-csit-basic.yaml b/jjb/netide/netide-csit-basic.yaml
index 9b536415f22fd83d01a83978b950553272f6a90f..23f3202acdac99f0fee6bfe35b889154a3860bfd 100644 (file)
--- a/jjb/netide/netide-csit-basic.yaml
+++ b/jjb/netide/netide-csit-basic.yaml
@@ -2,6 +2,7 @@
     name: netide-csit-basic
     jobs:
         - '{project}-csit-verify-1node-{functionality}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'netide'

diff --git a/jjb/netide/netide.cfg b/jjb/netide/netide.cfg
index 1c1a46a2011f1b7fbf59191a10cd0a3910ade4ed..684b5bf35875d60bfd444ff4536da66245a42f72 100644 (file)
--- a/jjb/netide/netide.cfg
+++ b/jjb/netide/netide.cfg
@@ -1,4 +1,7 @@
 STREAMS:\r
+- pre-boron:\r
+    branch: pre-boron\r
+    jdks: openjdk7,openjdk8\r
 - beryllium:\r
     branch: master\r
     jdks: openjdk7,openjdk8\r

diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml
index 853ecfe0ff82df09aae1902eed73660c124585cd..936c9bdf5906edb81afa80f8242e10b8ede171a6 100644 (file)
--- a/jjb/netide/netide.yaml
+++ b/jjb/netide/netide.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -71,6 +78,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -135,6 +144,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -424,7 +437,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -433,7 +446,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'netide'
 
@@ -504,7 +517,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{netide-settings}'
         global-settings: '{odl-global-settings}'
@@ -561,9 +574,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'netide'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'netide'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/neutron/neutron.cfg b/jjb/neutron/neutron.cfg
index 81908b1e0ec35cd198fa104bd4104e057e408f69..a27e70d0a16f3af5bf395f3cd1fb239cf9d9b06e 100644 (file)
--- a/jjb/neutron/neutron.cfg
+++ b/jjb/neutron/neutron.cfg
@@ -1,5 +1,8 @@
 DEPENDENCIES: odlparent,aaa
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk8
 - beryllium:
     branch: master
     jdks: openjdk8

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index 4de06a329327ccab92c736232ba8a860a2bc8990..192024f72ce12638a8988a65af132068c2cb1676 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -19,6 +19,12 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk8
+            jdks:
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk8
@@ -77,6 +83,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -141,6 +149,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -430,7 +442,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -439,7 +451,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'neutron'
 
@@ -510,7 +522,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{neutron-settings}'
         global-settings: '{odl-global-settings}'
@@ -567,9 +579,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'neutron'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'neutron'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/next/next.cfg b/jjb/next/next.cfg
index ae96f12ab8f1b0bb6fb70f2a960b9f67a2d582f6..8a429298dc7880296f2c32a76e296f6ccefc5e2a 100644 (file)
--- a/jjb/next/next.cfg
+++ b/jjb/next/next.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml
index fbdc65c8c471f52b06991d3c43f9fc7cc4a899f4..62829da3017e1e6cfdc10c444124388f73e756f6 100644 (file)
--- a/jjb/next/next.yaml
+++ b/jjb/next/next.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -71,6 +78,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -135,6 +144,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -424,7 +437,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -433,7 +446,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'next'
 
@@ -504,7 +517,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{next-settings}'
         global-settings: '{odl-global-settings}'
@@ -561,9 +574,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'next'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'next'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/nic/nic.cfg b/jjb/nic/nic.cfg
index bdfd27c3f974e9418c3873741ec1dfb15b4b70a4..5e266f237109fa7660894e0929a1a8644c528f8a 100644 (file)
--- a/jjb/nic/nic.cfg
+++ b/jjb/nic/nic.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml
index a16d20bb45fa88e172836511dc978f28a4a67f0c..acef183bbb5e5930e8bbc611ed2c3a948c93948f 100644 (file)
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -77,6 +84,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -141,6 +150,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -430,7 +443,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -439,7 +452,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'nic'
 
@@ -510,7 +523,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{nic-settings}'
         global-settings: '{odl-global-settings}'
@@ -567,9 +580,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'nic'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'nic'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/odlparent/odlparent.cfg b/jjb/odlparent/odlparent.cfg
index 81bc06d8cc5df5b000574f09de4a8ea50f557164..8bc03162624ae6f836f09d52ad600101941a304a 100644 (file)
--- a/jjb/odlparent/odlparent.cfg
+++ b/jjb/odlparent/odlparent.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index d40e9c790b727c0f780866464130897bdf6fca1a..a595172d86643b43b73261a12b2147c2204b288f 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -83,6 +90,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -147,6 +156,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -436,7 +449,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -445,7 +458,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'odlparent'
 
@@ -516,7 +529,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{odlparent-settings}'
         global-settings: '{odl-global-settings}'
@@ -573,9 +586,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'odlparent'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'odlparent'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/of-config/of-config.cfg b/jjb/of-config/of-config.cfg
index 15361094e4bd9011c124446b80ed2c8dbdf06a84..89188c877e33260d139e94946f9a695f723b7a2c 100644 (file)
--- a/jjb/of-config/of-config.cfg
+++ b/jjb/of-config/of-config.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index 8affda2c02e4f06803126780dcf8656d853fb6b5..0d59e92c206e52c57ff144508ae7c6b53e3a0649 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -71,6 +78,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -135,6 +144,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -424,7 +437,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -433,7 +446,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'of-config'
 
@@ -504,7 +517,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{of-config-settings}'
         global-settings: '{odl-global-settings}'
@@ -561,9 +574,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'of-config'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'of-config'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/ofextensions/circuitsw/circuitsw.cfg b/jjb/ofextensions/circuitsw/circuitsw.cfg
index 846849be119ff387464706db3dff1598141ffbd7..75047241961ea54086085286d89fe84d0586ca34 100644 (file)
--- a/jjb/ofextensions/circuitsw/circuitsw.cfg
+++ b/jjb/ofextensions/circuitsw/circuitsw.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml
index fb4ee62de1cb540e4f0cc6766d2ecdfe40ced541..56126ebbb31087cacbc538ec299b011947b0a7c4 100644 (file)
--- a/jjb/ofextensions/circuitsw/circuitsw.yaml
+++ b/jjb/ofextensions/circuitsw/circuitsw.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -71,6 +78,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -135,6 +144,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -424,7 +437,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -433,7 +446,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'ofextensions/circuitsw'
 
@@ -504,7 +517,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{ofextensions-circuitsw-settings}'
         global-settings: '{odl-global-settings}'
@@ -561,9 +574,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'ofextensions/circuitsw'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'ofextensions/circuitsw'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/openflowjava/openflowjava.cfg b/jjb/openflowjava/openflowjava.cfg
index 8f3575638c091a76fa3768bc0cced4f0ed8f1366..9e6d6c5c213b91fdeb2798f6d9deefb031ecec7b 100644 (file)
--- a/jjb/openflowjava/openflowjava.cfg
+++ b/jjb/openflowjava/openflowjava.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml
index fe4c0d6f682d745266f9daffacc3b84d135aa854..010b609e0e240957890e4f991e1c2405d16c506d 100644 (file)
--- a/jjb/openflowjava/openflowjava.yaml
+++ b/jjb/openflowjava/openflowjava.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -84,6 +91,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -148,6 +157,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -437,7 +450,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -446,7 +459,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'openflowjava'
 
@@ -517,7 +530,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{openflowjava-settings}'
         global-settings: '{odl-global-settings}'
@@ -574,9 +587,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'openflowjava'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'openflowjava'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/openflowplugin/openflowplugin.cfg b/jjb/openflowplugin/openflowplugin.cfg
index 5b4caaaedfbe517a4264f132bd98918c22c86894..8df58c0058bbd82c60b92cdf178452211e4367c2 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.cfg
+++ b/jjb/openflowplugin/openflowplugin.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index bcb2d1f1d6dc3b01462cd62daf2240ccd1fd0835..83077645c864f2485f77f3b873cf0de177970c73 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -84,6 +91,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -148,6 +157,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -439,7 +452,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -448,7 +461,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'openflowplugin'
 
@@ -519,7 +532,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{openflowplugin-settings}'
         global-settings: '{odl-global-settings}'
@@ -576,9 +589,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'openflowplugin'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'openflowplugin'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml b/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml
index ffdbe0b8e6fc4585c02c7fabadaa8ef351e4ca59..52cf7ace31f95c2b063aa47aaccc1c17575f37c4 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-southbound.yaml
+++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml
@@ -26,7 +26,7 @@
     mininet-vms: 2
 
     # Features to install
-    install-features: 'odl-ovsdb-openstack'
+    install-features: 'odl-ovsdb-southbound-impl-rest'
 
     # Robot custom options
     robot-options: ''

diff --git a/jjb/ovsdb/ovsdb-openstack-tempest.yaml b/jjb/ovsdb/ovsdb-openstack-tempest.yaml
new file mode 100644 (file)
index 0000000..89036b8
--- /dev/null
+++ b/jjb/ovsdb/ovsdb-openstack-tempest.yaml
@@ -0,0 +1,93 @@
+- project:
+    name: ovsdb-openstack-tempest
+    jobs:
+        - 'ovsdb-openstack-tempest-{openstack}-{odl}'
+
+    openstack:
+        - mitaka:
+            openstack-branch: 'master'
+        - liberty:
+            openstack-branch: 'stable/liberty'
+    # can add kilo if it's needed, but would result in two more hour long jobs
+
+    odl:
+        - beryllium:
+            odl-version: 'beryllium'
+        - lithium:
+            odl-version: 'lithium'
+
+- job-template:
+    name: 'ovsdb-openstack-tempest-{openstack}-{odl}'
+
+    project-type: freestyle
+    node: dynamic_robot
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration/test'
+        - integration-patch-refspec:
+            branch: 'master'
+        - string:
+            name: OPENSTACK_BRANCH
+            default: '{openstack-branch}'
+            description: 'Openstack branch to use with devstack'
+        - string:
+            name: ODL_VERSION
+            default: '{odl-version}'
+            description: 'OpenDaylight version to use with devstack + networking_odl project'
+        - string:
+            name: TEMPEST_REGEX
+            default: 'tempest.api.network'
+            description: 'Default grouping of tempest tests to run'
+
+    scm:
+        - integration-gerrit-scm:
+            credentials-id: '{ssh-credentials}'
+            basedir: 'test'
+            refspec: '$PATCHREFSPEC'
+            branch: 'master'
+
+    wrappers:
+          - build-timeout
+          - jclouds:
+              instances:
+                - rk-c7-devstack:
+                    cloud-name: 'Rackspace DFW - Devstack'
+                    count: '1'
+                    stop-on-terminate: False
+          - ssh-agent-credentials:
+              users:
+                  - '{ssh-credentials}'
+
+    # Trigger jobs (daily)
+    schedule: 'H H * * *'
+
+    builders:
+        - integration-install-robotframework
+        - inject:
+            properties-file: 'env.properties'
+        - integration-get-slave-addresses
+        - inject:
+            properties-file: 'slave_addresses.txt'
+        - shell: 'pybot -e exclude -v WORKSPACE:/tmp -v USER_HOME:$HOME -L TRACE -v DEVSTACK_SYSTEM_USER:$USER
+                        -v DEVSTACK_SYSTEM_IP:$ODL_SYSTEM_IP -v DEFAULT_LINUX_PROMPT:\]\>
+                        -v OPENSTACK_BRANCH:$OPENSTACK_BRANCH -v ODL_VERSION:$ODL_VERSION
+                        -v TEMPEST_REGEX:$TEMPEST_REGEX $WORKSPACE/test/csit/suites/ovsdb/Devstack_Tempest_Tests/
+                        || true'
+        - shell: 'scp $ODL_SYSTEM_IP:/opt/stack/logs/devstacklog.txt $WORKSPACE/'
+        - integration-cleanup-tmp
+
+    publishers:
+        - integration-robot:
+            unstable-if: 0.0
+            pass-if: 100.0
+        - archive:
+            artifacts: 'devstacklog.txt'
+        - email-notification:
+            email-prefix: '[ovsdb]'

diff --git a/jjb/ovsdb/ovsdb.cfg b/jjb/ovsdb/ovsdb.cfg
index 3dfa07f72bd2f578fbb2e6225777427830e785ab..47b563351b89c98976f09c3c7ba610d9a1651097 100644 (file)
--- a/jjb/ovsdb/ovsdb.cfg
+++ b/jjb/ovsdb/ovsdb.cfg
@@ -11,6 +11,9 @@ STREAMS:
 - routermanager:
     branch: topic/routermanager
     jdks: openjdk7
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 6ddfe91d8ac31b774c1831449840b1a42bf00976..ee9acdec067e8d2a20195e8c3103cc09df0b349c 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -42,6 +42,13 @@
             jdks:
                 - openjdk7
             disable_autorelease: True
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -106,6 +113,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -170,6 +179,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -479,7 +492,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{ovsdb-settings}'
         global-settings: '{odl-global-settings}'
@@ -536,9 +549,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'ovsdb'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'ovsdb'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/packetcable/packetcable.cfg b/jjb/packetcable/packetcable.cfg
index 9a57eb4be0e65260695d4fb62970d471a69a6d8a..a668b49a8fd6f87e74c12c51be6642710f2da47b 100644 (file)
--- a/jjb/packetcable/packetcable.cfg
+++ b/jjb/packetcable/packetcable.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml
index 5b57f27de329f5c5be59845632981f1a2e672ee1..3c976773c3807f747d0c1f934bede5b4207283e4 100644 (file)
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -83,6 +90,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -147,6 +156,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -436,7 +449,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -445,7 +458,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'packetcable'
 
@@ -516,7 +529,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{packetcable-settings}'
         global-settings: '{odl-global-settings}'
@@ -573,9 +586,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'packetcable'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'packetcable'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml
index a3749c2e0dbab015c3e5c2b33a2bfcadedbc591d..5f7baf50c51e8c4bd8ea6c91523bbbd8f858ec5c 100644 (file)
--- a/jjb/persistence/persistence.yaml
+++ b/jjb/persistence/persistence.yaml
@@ -78,6 +78,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -142,6 +144,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -440,7 +446,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'persistence'
 
@@ -511,7 +517,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{persistence-settings}'
         global-settings: '{odl-global-settings}'
@@ -568,9 +574,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'persistence'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'persistence'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 42f3bc1f4b3d84832b72cec47acca8bfdafe3243..23977b716026b6d37b1a48345970cf0993beef3d 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -15,7 +15,7 @@
     mvn30: 'Maven 3.0.5'
     mvn31: 'Maven 3.1.1'
     mvn32: 'Maven 3.2.5'
-    mvn33: 'Maven 3.3.3'
+    mvn33: 'Maven 3.3.9'
 
     # Config File Provider ID mapping
     odl-global-settings: 'org.jenkinsci.plugins.configfiles.maven.GlobalMavenSettingsConfig1414604295262'

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 39678b4fa65c3827d79f0a0807d1fb9c0a3fa840..742fb325da71e52b94094d10d9d341be2c9dac29 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -222,6 +222,7 @@
         - sonatype-clm:
             application-name: '{application-name}'
             scan-targets: '**/target/**'
+            module-excludes: '**/target/pax/**,**/target/assembly/**'
 
 - builder:
     name: releng-check-unicode

diff --git a/jjb/reservation/reservation.cfg b/jjb/reservation/reservation.cfg
index 4cd0da21e8bf5e463a7ff261cd82fcec386d6588..79c61e3f84229dabdbe72bdbd15f44ce87cb9a62 100644 (file)
--- a/jjb/reservation/reservation.cfg
+++ b/jjb/reservation/reservation.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml
index 4dd54105813c292312cca003428dcc36dad0e6d8..385a5f608a9233d664fe164ab8ce4e9952637c8c 100644 (file)
--- a/jjb/reservation/reservation.yaml
+++ b/jjb/reservation/reservation.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -77,6 +84,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -141,6 +150,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -430,7 +443,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -439,7 +452,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'reservation'
 
@@ -510,7 +523,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{reservation-settings}'
         global-settings: '{odl-global-settings}'
@@ -567,9 +580,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'reservation'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'reservation'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.cfg b/jjb/sdninterfaceapp/sdninterfaceapp.cfg
index fc7b4263efb4a9f278e19d04ed01b8ca9a898399..f775f1d5371f312a33020dbc3e6fa461fc8207c2 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp.cfg
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
index 1e7ff03314738d16fe67239d8ffded781ff772f3..039f19186fedc49176e82b39d421ddde8be48499 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -84,6 +91,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -148,6 +157,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -437,7 +450,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -446,7 +459,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'sdninterfaceapp'
 
@@ -517,7 +530,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{sdninterfaceapp-settings}'
         global-settings: '{odl-global-settings}'
@@ -574,9 +587,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'sdninterfaceapp'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'sdninterfaceapp'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/sfc/sfc.cfg b/jjb/sfc/sfc.cfg
index e283ebb273eaebd17f981d7242e3e8d39759396a..cd467b2535348a4787cde5fa09a5c5ba8ed7c9db 100644 (file)
--- a/jjb/sfc/sfc.cfg
+++ b/jjb/sfc/sfc.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index 7435ac93ca18215f9e11512b9a4e7c05801cb047..a88ecdce9788a42f2c6807394aeafea0374f8629 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -83,6 +90,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -147,6 +156,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -436,7 +449,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -445,7 +458,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'sfc'
 
@@ -516,7 +529,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{sfc-settings}'
         global-settings: '{odl-global-settings}'
@@ -573,9 +586,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'sfc'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'sfc'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/snbi/snbi.cfg b/jjb/snbi/snbi.cfg
index 81bc06d8cc5df5b000574f09de4a8ea50f557164..8bc03162624ae6f836f09d52ad600101941a304a 100644 (file)
--- a/jjb/snbi/snbi.cfg
+++ b/jjb/snbi/snbi.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml
index ca49d72065c033311a48104f16009f14134ee2f7..ff181edc3d8ad5f41a7e8fb3036be3b3e5f54db3 100644 (file)
--- a/jjb/snbi/snbi.yaml
+++ b/jjb/snbi/snbi.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -83,6 +90,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -147,6 +156,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -436,7 +449,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -445,7 +458,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'snbi'
 
@@ -516,7 +529,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{snbi-settings}'
         global-settings: '{odl-global-settings}'
@@ -573,9 +586,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'snbi'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'snbi'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/snmp/snmp.cfg b/jjb/snmp/snmp.cfg
index 18efd4d30e19fa9e2d4dd22c397b2577584a543b..d9fc66910209c8da1bed96a13dc831e6f1777ac3 100644 (file)
--- a/jjb/snmp/snmp.cfg
+++ b/jjb/snmp/snmp.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml
index 8c4a538bf820c3e3479c589ee4704a51c995fa7d..345cccb4d2ffe101766f126a40e0fb7da21ac855 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -78,6 +85,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -142,6 +151,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -431,7 +444,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -440,7 +453,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'snmp'
 
@@ -511,7 +524,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{snmp-settings}'
         global-settings: '{odl-global-settings}'
@@ -568,9 +581,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'snmp'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'snmp'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/snmp4sdn/snmp4sdn.cfg b/jjb/snmp4sdn/snmp4sdn.cfg
index 75874fdb102978743b42a793f78058c9539d9722..380e40be9b44f0ab909feb36351a7940a39f4145 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.cfg
+++ b/jjb/snmp4sdn/snmp4sdn.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index b5aff88c175a64aa60ac37dfbe39c47f0d45ea2a..a7d73a195d0924573841eef0b66fc523a6edd313 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -83,6 +90,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -147,6 +156,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -436,7 +449,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -445,7 +458,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'snmp4sdn'
 
@@ -516,7 +529,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{snmp4sdn-settings}'
         global-settings: '{odl-global-settings}'
@@ -573,9 +586,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'snmp4sdn'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'snmp4sdn'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/spectrometer/spectrometer-python.yaml b/jjb/spectrometer/spectrometer-python.yaml
new file mode 100644 (file)
index 0000000..179c081
--- /dev/null
+++ b/jjb/spectrometer/spectrometer-python.yaml
@@ -0,0 +1,67 @@
+- project:
+    name: spectrometer-python
+    jobs:
+        - 'spectrometer-verify-python-{stream}'
+
+    stream:
+        - beryllium:
+            branch: 'master'
+
+    project: 'spectrometer'
+
+- job-template:
+    name: 'spectrometer-verify-python-{stream}'
+
+    project-type: freestyle
+    node: dynamic_verify
+    concurrent: true
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    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: 'spectrometer'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
+
+    builders:
+        - shell: |
+            virtualenv $WORKSPACE/venv-tox
+            source $WORKSPACE/venv-tox/bin/activate
+            pip install tox argparse
+            tox --version
+            tox
+
+    publishers:
+        - email-notification:
+            email-prefix: '[spectrometer]'

diff --git a/jjb/sxp/sxp.cfg b/jjb/sxp/sxp.cfg
index a36b6747380a3ee32840259f251e08db618cc179..d24d1b946f1e4db32d5beeddf76ad911acce1647 100644 (file)
--- a/jjb/sxp/sxp.cfg
+++ b/jjb/sxp/sxp.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index 7af3ee3022eda2bc75ab291a2dda781f562192ea..c671c699e27a6efb96c2cc0052f5dcb4253085c8 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -83,6 +90,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -147,6 +156,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -436,7 +449,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -445,7 +458,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'sxp'
 
@@ -516,7 +529,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{sxp-settings}'
         global-settings: '{odl-global-settings}'
@@ -573,9 +586,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'sxp'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'sxp'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/tcpmd5/tcpmd5.cfg b/jjb/tcpmd5/tcpmd5.cfg
index 1198c183233f78974dce6129075dc204aad6ec35..bb8847f94b58917093e166f2fb4e879b779b090e 100644 (file)
--- a/jjb/tcpmd5/tcpmd5.cfg
+++ b/jjb/tcpmd5/tcpmd5.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/tcpmd5/tcpmd5.yaml b/jjb/tcpmd5/tcpmd5.yaml
index 76bac3c3c7233a60c5bffffdb01723db4ef540f1..933fc58d2118bdc98ea2848165aed05b9237a1bf 100644 (file)
--- a/jjb/tcpmd5/tcpmd5.yaml
+++ b/jjb/tcpmd5/tcpmd5.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -84,6 +91,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -148,6 +157,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -437,7 +450,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -446,7 +459,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'tcpmd5'
 
@@ -517,7 +530,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{tcpmd5-settings}'
         global-settings: '{odl-global-settings}'
@@ -574,9 +587,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'tcpmd5'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'tcpmd5'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/toolkit/toolkit.yaml b/jjb/toolkit/toolkit.yaml
index 33b39681978c2bd1d9e0b68131722a7b1ae64980..58913370fe36081a6f30194a1ba154bcc2413f40 100644 (file)
--- a/jjb/toolkit/toolkit.yaml
+++ b/jjb/toolkit/toolkit.yaml
@@ -70,6 +70,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -134,6 +136,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -432,7 +438,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'toolkit'
 
@@ -503,7 +509,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{toolkit-settings}'
         global-settings: '{odl-global-settings}'
@@ -560,9 +566,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'toolkit'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'toolkit'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/topoprocessing/topoprocessing.cfg b/jjb/topoprocessing/topoprocessing.cfg
index 4cce7d7e93ecbf0c8cc7ab0f6fd4c67fb26b4d37..2a0ce2fcedb8226fe71a449ada1b12b5740852d3 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.cfg
+++ b/jjb/topoprocessing/topoprocessing.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml
index f642ef58179c5eb4151b43c53fb6e6e63514935f..3462f234a5a0ac9c6a7ad0abd10073546df97c8d 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.yaml
+++ b/jjb/topoprocessing/topoprocessing.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -78,6 +85,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -142,6 +151,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -431,7 +444,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -440,7 +453,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'topoprocessing'
 
@@ -511,7 +524,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{topoprocessing-settings}'
         global-settings: '{odl-global-settings}'
@@ -568,9 +581,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'topoprocessing'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'topoprocessing'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/tsdr/tsdr.cfg b/jjb/tsdr/tsdr.cfg
index e4477f0032521d1f99f546af02a93fb96cd98771..7673fa8aad799bc0eacc2fab08fb108f1ee44bd2 100644 (file)
--- a/jjb/tsdr/tsdr.cfg
+++ b/jjb/tsdr/tsdr.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index fd66a237084fd80dac90239b1180d57e886f67bf..5559069dc196444dab5c9a9860457d0878dff7ca 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -77,6 +84,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -141,6 +150,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -430,7 +443,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -439,7 +452,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'tsdr'
 
@@ -510,7 +523,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{tsdr-settings}'
         global-settings: '{odl-global-settings}'
@@ -567,9 +580,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'tsdr'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'tsdr'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/ttp/ttp.cfg b/jjb/ttp/ttp.cfg
index 81bc06d8cc5df5b000574f09de4a8ea50f557164..8bc03162624ae6f836f09d52ad600101941a304a 100644 (file)
--- a/jjb/ttp/ttp.cfg
+++ b/jjb/ttp/ttp.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml
index d6d766d715a5b53ab9f21036b892b80e79c695b9..199d7be5d70ffc204ad03ed58284b462cd6e6a9d 100644 (file)
--- a/jjb/ttp/ttp.yaml
+++ b/jjb/ttp/ttp.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -83,6 +90,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -147,6 +156,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -436,7 +449,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -445,7 +458,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'ttp'
 
@@ -516,7 +529,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{ttp-settings}'
         global-settings: '{odl-global-settings}'
@@ -573,9 +586,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'ttp'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'ttp'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/unimgr/unimgr.cfg b/jjb/unimgr/unimgr.cfg
index 94a4e09d207367ae2716e8d2a440f3529994b03b..d453cedf5984d2848f1c4b0869a65670bfe6394a 100644 (file)
--- a/jjb/unimgr/unimgr.cfg
+++ b/jjb/unimgr/unimgr.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index 91d4c8d39b0ecfe2eafe7bbd976c154513011214..72e1ee910635a071ec62e9c8607e46bc520eb5fa 100644 (file)
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -71,6 +78,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -135,6 +144,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -424,7 +437,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -433,7 +446,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'unimgr'
 
@@ -504,7 +517,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{unimgr-settings}'
         global-settings: '{odl-global-settings}'
@@ -561,9 +574,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'unimgr'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'unimgr'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/usc/usc.cfg b/jjb/usc/usc.cfg
index 4455c9f851a41a9179fc74517bf778b05d6767ec..232f9a1993092310cfc62aa31ff440ce4e01c0df 100644 (file)
--- a/jjb/usc/usc.cfg
+++ b/jjb/usc/usc.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index 59055ab0a0332b0b68782ff8bdea16df8bb7e35f..d8eba9a7d545fdf874c650018c80039c7c3c7494 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -78,6 +85,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -142,6 +151,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -431,7 +444,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -440,7 +453,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'usc'
 
@@ -511,7 +524,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{usc-settings}'
         global-settings: '{odl-global-settings}'
@@ -568,9 +581,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'usc'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'usc'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/usecplugin/usecplugin.cfg b/jjb/usecplugin/usecplugin.cfg
index 89c43e8fd0c065d8b41b6f47294f5632278df593..a343f7a9d5ae7f168b63699a744159e96513bbde 100644 (file)
--- a/jjb/usecplugin/usecplugin.cfg
+++ b/jjb/usecplugin/usecplugin.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml
index 6f1edcfc5f4d362403be21ed0b2c69852145e70a..38495b4db327bfa23609fee2d2627c4420039939 100644 (file)
--- a/jjb/usecplugin/usecplugin.yaml
+++ b/jjb/usecplugin/usecplugin.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -71,6 +78,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -135,6 +144,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -424,7 +437,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -433,7 +446,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'usecplugin'
 
@@ -504,7 +517,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{usecplugin-settings}'
         global-settings: '{odl-global-settings}'
@@ -561,9 +574,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'usecplugin'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'usecplugin'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/vpnservice/vpnservice.cfg b/jjb/vpnservice/vpnservice.cfg
index 54f1cb5d77dda5f8d6d4b796df01dbc1a4bd9851..d4b99d8352e76c7284a8a55274258f1a63cb2c02 100644 (file)
--- a/jjb/vpnservice/vpnservice.cfg
+++ b/jjb/vpnservice/vpnservice.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/vpnservice/vpnservice.yaml b/jjb/vpnservice/vpnservice.yaml
index 90c61827fc13ba8f7e1b2be6adefc6ba44e907ab..69386e3722593b5e6b4e458587a0e01f654e8421 100644 (file)
--- a/jjb/vpnservice/vpnservice.yaml
+++ b/jjb/vpnservice/vpnservice.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -77,6 +84,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -141,6 +150,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -430,7 +443,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -439,7 +452,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'vpnservice'
 
@@ -510,7 +523,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{vpnservice-settings}'
         global-settings: '{odl-global-settings}'
@@ -567,9 +580,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'vpnservice'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'vpnservice'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/vtn/vtn.cfg b/jjb/vtn/vtn.cfg
index 977ab6a0984a73a87f0c68edf5abba39c976c268..7eaa89be0bb2d49b107a2b0f72a91bc7c8bd5731 100644 (file)
--- a/jjb/vtn/vtn.cfg
+++ b/jjb/vtn/vtn.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
@@ -11,4 +14,4 @@ STREAMS:
     jdks: openjdk7
 DEPENDENCIES: odlparent,controller,yangtools,openflowplugin,ovsdb,neutron
 MVN_GOALS: clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2 -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
-ARCHIVE_ARTIFACTS: manager/dist/*/target/*.zip, coordinator/dist/target/*.bz2, manager/northbound/target/site/wsdocs/**, manager/api/target/*-javadoc.jar, manager/api/target/apidocs/**
+ARCHIVE_ARTIFACTS: manager/dist/*/target/*.zip, coordinator/dist/target/*.bz2, manager/northbound/target/site/wsdocs/**, manager/api/target/*-javadoc.jar, manager/api/target/apidocs/**, manager/target/*-javadoc.jar, manager/target/apidocs/**, manager/model/target/site/models/**

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index 11484b9543a36bbd74a2d1814118dc424c74e795..5c993b1c4dc9a23f79b6de8b37b1dc3e5a4adfc1 100644 (file)
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -83,6 +90,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -147,6 +156,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -216,7 +229,7 @@
 
     publishers:
         - archive-artifacts:
-            artifacts: 'manager/dist/*/target/*.zip, coordinator/dist/target/*.bz2, manager/northbound/target/site/wsdocs/**, manager/api/target/*-javadoc.jar, manager/api/target/apidocs/**'
+            artifacts: 'manager/dist/*/target/*.zip, coordinator/dist/target/*.bz2, manager/northbound/target/site/wsdocs/**, manager/api/target/*-javadoc.jar, manager/api/target/apidocs/**, manager/target/*-javadoc.jar, manager/target/apidocs/**, manager/model/target/site/models/**'
         - email-notification:
             email-prefix: '[vtn]'
         - maven-deploy:
@@ -438,7 +451,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -447,7 +460,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'vtn'
 
@@ -518,7 +531,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{vtn-settings}'
         global-settings: '{odl-global-settings}'
@@ -575,9 +588,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'vtn'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'vtn'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/yang-push/yang-push.cfg b/jjb/yang-push/yang-push.cfg
index 916bcc46e4653ba67e3e945036c599ccd296fd58..8053a6653a086ddecdbdfc55e5924fb343ed08aa 100644 (file)
--- a/jjb/yang-push/yang-push.cfg
+++ b/jjb/yang-push/yang-push.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml
index a8d7d033cf3687dbbe347db418fe20f0f9fea075..1001c311e29251ffc4f91fccf52ab8d3c7123e33 100644 (file)
--- a/jjb/yang-push/yang-push.yaml
+++ b/jjb/yang-push/yang-push.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -71,6 +78,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -135,6 +144,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -424,7 +437,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -433,7 +446,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'yang-push'
 
@@ -504,7 +517,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{yang-push-settings}'
         global-settings: '{odl-global-settings}'
@@ -561,9 +574,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'yang-push'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'yang-push'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/yangtools/yangtools-verify.yaml b/jjb/yangtools/yangtools-verify.yaml
index 0754733852980e004804b3bed21cdd9fdfdd3f09..4dab955d050db602e16d2a8276486e58dfee30c2 100644 (file)
--- a/jjb/yangtools/yangtools-verify.yaml
+++ b/jjb/yangtools/yangtools-verify.yaml
@@ -17,6 +17,8 @@
             mvnver: '{mvn33}'
 
     stream:
+        - pre-boron:
+            branch: pre-boron
         - beryllium:
             branch: master
 

diff --git a/jjb/yangtools/yangtools.cfg b/jjb/yangtools/yangtools.cfg
index 5c9f8bb2287876b2cd96be09eaff838527ed9d80..110ba8d6a0b76bd7fdaf5eb420b01d067a2d5144 100644 (file)
--- a/jjb/yangtools/yangtools.cfg
+++ b/jjb/yangtools/yangtools.cfg
@@ -1,4 +1,7 @@
 STREAMS:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 67a40a43f613905c914fbf613eac05a595ccecd9..aa15d698c6cfbaef735130dde85ab55bb8826606 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -18,6 +18,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
@@ -72,6 +79,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -361,7 +372,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -370,7 +381,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'yangtools'
 
@@ -441,7 +452,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{yangtools-settings}'
         global-settings: '{odl-global-settings}'
@@ -498,9 +509,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'yangtools'
-            branch: '{branch}'
+        - 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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'yangtools'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/src/site/markdown/jenkins.markdown b/src/site/markdown/jenkins.markdown
index 12e136f229473e7bf26a0d925f1f1f6922407993..68f2152c49b0d1b19cba801cf77c4b8566ccf197 100644 (file)
--- a/src/site/markdown/jenkins.markdown
+++ b/src/site/markdown/jenkins.markdown
@@ -422,6 +422,18 @@ Some considerations when using this job:
   times by a system test knowable person, the integration group can help with
   that
 
+### Autorelease Validate Job
+
+Trigger: **revalidate**
+
+This job runs the PROJECT-validate-autorelease-BRANCH job which is used as a
+quick sanity test to ensure that a patch does not depend on features that do
+not exist in the current release.
+
+The **revalidate** trigger is useful in cases where a project's verify job
+passed however validate failed due to infra problems or intermittent issues.
+It will retrigger just the validate-autorelease job.
+
 ## <a name="jjb_basic_configuration">Basic Job Configuration</a>
 
 To create jobs based on the above templates you can use the example

diff --git a/vagrant/integration-robotframework/bootstrap.sh b/vagrant/integration-robotframework/bootstrap.sh
index 8a75d06066de4b00b0416b1ed2582f3834d9c036..53cd42651bfa25a5f119e504637589ebacd9d1a4 100644 (file)
--- a/vagrant/integration-robotframework/bootstrap.sh
+++ b/vagrant/integration-robotframework/bootstrap.sh
@@ -16,6 +16,14 @@ git clone -q https://github.com/ska-sa/udpreplay.git
 cd udpreplay
 make &> /dev/null && cp udpreplay /usr/local/bin
 
+## DLUX dependencies
+#  - Xvfb: Display manager in RAM
+#
+# Note: The end goal will be to test with multiple browser (Firefox, Chrome)
+#       Chrome need a other library named chromedriver so let start with
+#       one already supported with selenium.
+yum install -y -q firefox xorg-x11-server-Xvfb
+
 # To handle the prompt style that is expected all over the environment
 # with how use use robotframework we need to make sure that it is
 # consistent for any of the users that are created during dynamic spin

diff --git a/vagrant/ovsdb-devstack/Vagrantfile b/vagrant/ovsdb-devstack/Vagrantfile
index 790e7ce85b4d3a943f07a9b94f47432fb012835c..56bfdf6d68efe68ebf72f66904b930996d24fd1c 100644 (file)
--- a/vagrant/ovsdb-devstack/Vagrantfile
+++ b/vagrant/ovsdb-devstack/Vagrantfile
@@ -50,13 +50,33 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     end
   end
 
+  # Explicitlly set default shared folder and load lib folder
+  config.vm.synced_folder ".", "/vagrant"
+  config.vm.synced_folder "../lib/", "/vagrant/lib"
+
   # run our bootstrapping for the ovsdb-devstack system
   config.vm.provision 'shell', path: 'bootstrap.sh'
 
+
+  #################
+  # LF NETWORKING #
+  #################
+
+  if ENV['LFNETWORK']
+    # reconfigure the network setup to support our special private setup
+    config.vm.provision 'shell', path: '../lib/lf-networking/configure_lf_infra.sh',
+      args: ENV['RSSUBDOMAIN']
+  end
+
+
+  #################
+  # FINAL CLEANUP #
+  #################
+
   # set RSRESEAL to... anything if you want to snap an image of this box
   # not setting the environment variable will cause the system to come
   # up fully and not be in a resealable state
   if ENV['RSRESEAL']
-    config.vm.provision 'shell', path: 'system_reseal.sh'
+    config.vm.provision 'shell', path: '../lib/system_reseal.sh'
   end
 end

diff --git a/vagrant/ovsdb-devstack/system_reseal.sh b/vagrant/ovsdb-devstack/system_reseal.sh
deleted file mode 100644 (file)
index 07a0531..0000000
--- a/vagrant/ovsdb-devstack/system_reseal.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-# vim: sw=2 ts=2 sts=2 et :
-
-if [ -f /.autorelabel ]; then
-  echo "**********************************************"
-  echo "* SYSTEM REQUIRES RELABELING SKIPPING RESEAL *"
-  echo "*     PLEASE RESTART SYSTEM AND RERUN        *"
-  echo "*           PROVISIONING SCRIPTS             *"
-  echo "**********************************************"
-  exit 1;
-fi
-
-# clean-up from any prior cloud-init networking
-rm -rf /etc/sysconfig/network-scripts/{ifcfg,route}-eth*
-
-rm -rf /etc/Pegasus/*.cnf /etc/Pegasus/*.crt /etc/Pegasus/*.csr /etc/Pegasus/*.pem /etc/Pegasus/*.srl /root/anaconda-ks.cfg /root/anaconda-post.log /root/initial-setup-ks.cfg /root/install.log /root/install.log.syslog /var/cache/fontconfig/* /var/cache/gdm/* /var/cache/man/* /var/lib/AccountService/users/* /var/lib/fprint/* /var/lib/logrotate.status /var/log/*.log* /var/log/BackupPC/LOG /var/log/ConsoleKit/* /var/log/anaconda.syslog /var/log/anaconda/* /var/log/apache2/*_log /var/log/apache2/*_log-* /var/log/apt/* /var/log/aptitude* /var/log/audit/* /var/log/btmp* /var/log/ceph/*.log /var/log/chrony/*.log /var/log/cron* /var/log/cups/*_log /var/log/debug* /var/log/dmesg* /var/log/exim4/* /var/log/faillog* /var/log/gdm/* /var/log/glusterfs/*glusterd.vol.log /var/log/glusterfs/glusterfs.log /var/log/httpd/*log /var/log/installer/* /var/log/jetty/jetty-console.log /var/log/journal/* /var/log/lastlog* /var/log/libvirt/libvirtd.log /var/log/libvirt/lxc/*.log /var/log/libvirt/qemu/*.log /var/log/libvirt/uml/*.log /var/log/lightdm/* /var/log/mail/* /var/log/maillog* /var/log/messages* /var/log/ntp /var/log/ntpstats/* /var/log/ppp/connect-errors /var/log/rhsm/* /var/log/sa/* /var/log/secure* /var/log/setroubleshoot/*.log /var/log/spooler* /var/log/squid/*.log /var/log/syslog* /var/log/tallylog* /var/log/tuned/tuned.log /var/log/wtmp* /var/named/data/named.run
-
-rm -rf ~/.viminfo /etc/ssh/ssh*key*
-
-# kill any cloud-init related bits
-rm -rf /var/lib/cloud/*
-
-if [ -e /usr/bin/facter ]
-then
-  if [ `/usr/bin/facter operatingsystem` = 'Ubuntu' ]
-  then
-    rm -rf /etc/hostname* /etc/hosts /etc/network/interfaces /etc/network/interfaces.*.bak~
-    cat <<EOINT >> /etc/network/interfaces
-# Used by ifup(8) and ifdown(8). See the interfaces(5) manpage or
-# /usr/share/doc/ifupdown/examples for more information.
-# The loopback network interface
-auto lo
-iface lo inet loopback
-EOINT
-  fi
-fi
-
-echo "********************************************"
-echo "*   PLEASE SNAPSHOT IMAGE AT THIS TIME     *"
-echo "********************************************"