Merge "Add -Djenkins parameter to all CI jobs"
authorLuis Gomez <ecelgp@gmail.com>
Wed, 16 Dec 2015 01:56:04 +0000 (01:56 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Wed, 16 Dec 2015 01:56:04 +0000 (01:56 +0000)
105 files changed:
jenkins-scripts/builder.sh
jjb/aaa/aaa.cfg
jjb/aaa/aaa.yaml
jjb/alto/alto.cfg
jjb/alto/alto.yaml
jjb/armoury/armoury.cfg
jjb/armoury/armoury.yaml
jjb/autorelease/autorelease-templates.yaml
jjb/bgpcep/bgpcep.cfg
jjb/bgpcep/bgpcep.yaml
jjb/capwap/capwap.cfg
jjb/capwap/capwap.yaml
jjb/centinel/centinel.cfg
jjb/centinel/centinel.yaml
jjb/controller/controller.cfg
jjb/controller/controller.yaml
jjb/didm/didm.cfg
jjb/didm/didm.yaml
jjb/dlux/dlux.cfg
jjb/dlux/dlux.yaml
jjb/docs/docs.cfg
jjb/docs/docs.yaml
jjb/faas/faas.cfg
jjb/faas/faas.yaml
jjb/groupbasedpolicy/groupbasedpolicy.cfg
jjb/groupbasedpolicy/groupbasedpolicy.yaml
jjb/integration/integration-distribution-jobs.yaml
jjb/integration/integration-macros.yaml
jjb/iotdm/iotdm.cfg
jjb/iotdm/iotdm.yaml
jjb/l2switch/l2switch.cfg
jjb/l2switch/l2switch.yaml
jjb/lacp/lacp.cfg
jjb/lacp/lacp.yaml
jjb/lispflowmapping/lispflowmapping.cfg
jjb/lispflowmapping/lispflowmapping.yaml
jjb/mdsal/mdsal.cfg
jjb/mdsal/mdsal.yaml
jjb/messaging4transport/messaging4transport.cfg
jjb/messaging4transport/messaging4transport.yaml
jjb/nemo/nemo.cfg
jjb/nemo/nemo.yaml
jjb/netconf/netconf.cfg
jjb/netconf/netconf.yaml
jjb/netide/netide.cfg
jjb/netide/netide.yaml
jjb/neutron/neutron.cfg
jjb/neutron/neutron.yaml
jjb/next/next.cfg
jjb/next/next.yaml
jjb/nic/nic.cfg
jjb/nic/nic.yaml
jjb/odlparent/odlparent.cfg
jjb/odlparent/odlparent.yaml
jjb/of-config/of-config.cfg
jjb/of-config/of-config.yaml
jjb/ofextensions/circuitsw/circuitsw.cfg
jjb/ofextensions/circuitsw/circuitsw.yaml
jjb/openflowjava/openflowjava.cfg
jjb/openflowjava/openflowjava.yaml
jjb/openflowplugin/openflowplugin.cfg
jjb/openflowplugin/openflowplugin.yaml
jjb/ovsdb/ovsdb.cfg
jjb/ovsdb/ovsdb.yaml
jjb/packetcable/packetcable.cfg
jjb/packetcable/packetcable.yaml
jjb/reservation/reservation.cfg
jjb/reservation/reservation.yaml
jjb/sdninterfaceapp/sdninterfaceapp.cfg
jjb/sdninterfaceapp/sdninterfaceapp.yaml
jjb/sfc/sfc.cfg
jjb/sfc/sfc.yaml
jjb/snbi/snbi.cfg
jjb/snbi/snbi.yaml
jjb/snmp/snmp.cfg
jjb/snmp/snmp.yaml
jjb/snmp4sdn/snmp4sdn.cfg
jjb/snmp4sdn/snmp4sdn.yaml
jjb/sxp/sxp.cfg
jjb/sxp/sxp.yaml
jjb/tcpmd5/tcpmd5.cfg
jjb/tcpmd5/tcpmd5.yaml
jjb/topoprocessing/topoprocessing.cfg
jjb/topoprocessing/topoprocessing.yaml
jjb/tsdr/tsdr.cfg
jjb/tsdr/tsdr.yaml
jjb/ttp/ttp.cfg
jjb/ttp/ttp.yaml
jjb/unimgr/unimgr.cfg
jjb/unimgr/unimgr.yaml
jjb/usc/usc.cfg
jjb/usc/usc.yaml
jjb/usecplugin/usecplugin.cfg
jjb/usecplugin/usecplugin.yaml
jjb/vpnservice/vpnservice.cfg
jjb/vpnservice/vpnservice.yaml
jjb/vtn/vtn.cfg
jjb/vtn/vtn.yaml
jjb/yang-push/yang-push.cfg
jjb/yang-push/yang-push.yaml
jjb/yangtools/yangtools.cfg
jjb/yangtools/yangtools.yaml
src/site/markdown/jenkins.markdown
vagrant/ubuntu-mininet-ovs-2.3/Vagrantfile [new file with mode: 0644]
vagrant/ubuntu-mininet-ovs-2.3/bootstrap.sh [new file with mode: 0644]

index 5092374c572ea7b9cde8c69458b2b13abe5ea8ff..ea7c7b583d44ec456bacc9670cec5224c7c762d7 100755 (executable)
@@ -3,6 +3,9 @@
 yum clean all
 yum install -y python-virtualenv xmlstarlet
 
+# sshpass for the current deploy test to be runable immediatelly after build
+yum install -y sshpass
+
 # add in mono components for VTN
 yum install -y yum-utils
 #The following is needed for the new code in vtn project.
index 9a1b2f3d88f7a9fb16f12dafc0960316eb2bdffb..cbd3ee27fb8596e10426c5e11cef69ce001c0414 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7
index 857d4d1de4542b24623abc181b484b00e45ddc01..91e23959011f6ccd57a9d40e51788c24e76540ca 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 1ceda8e9d448c1d86c673645b69678811c8fc999..185b32b634686e828a1b840f6084a0891841e97f 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7
index 34325d568ef1d022d74e6f7c216d961d87654dbf..c108d980e9d357f84dac1629ef21ccd924f0292f 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index e5708497427ddd0a105db332c23e92150d4d27e6..27e89fa60516793acaed04050c9d10f3a96bcd87 100644 (file)
@@ -1,10 +1,10 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk8,openjdk7
 - beryllium:
     branch: master
     jdks: openjdk8,openjdk7
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk8,openjdk7
 MVN_OPTS: -Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true
 DEPENDENCIES: odlparent,yangtools,controller,mdsal
index 1195420d68f70034b0ceb023d466b7dee7137be7..031cb38d44d4edafd24e744165b79954c2451662 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk8
             jdks:
                 - openjdk8
                 - openjdk7
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk8
             jdks:
                 - openjdk8
                 - openjdk7
-            disable_autorelease: False
+            disable_autorelease: True
 
     project: 'armoury'
 
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 72958958e10ecbd9e37e43634ca38cdc5613089c..e5c30d28aa04239c5efcba6539fc586746c9d7e7 100644 (file)
     prebuilders:
         - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
+        - autorelease-cfp:
+            autorelease-settings: '{autorelease-settings}'
+            odl-global-settings: '{odl-global-settings}'
         - autorelease-generate-taglist
         - autorelease-generate-release-patches
 
         post-step-run-condition: UNSTABLE
 
     postbuilders:
-        - autorelease-cfp:
-            autorelease-settings: '{autorelease-settings}'
-            odl-global-settings: '{odl-global-settings}'
         - autorelease-maven-deploy
         - shell: "./scripts/list-project-dependencies.sh"
         - autorelease-get-integration-test-variables
index 329719100373c2d177a3b850033b1884ef3a7270..0f79755ad962d64253b7f6d3739f30e7edc55b35 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8
index 7ee850daa5249f977640a5dc90c50c6fcfb3fb9d..fc38788039e3c1c1bf5374ef8fb766add4d12138 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index f95ff82e3690ed540e3389465a50739885f2ec35..c1d6dbb7cab01293825e73f246029a9ca3f1399a 100644 (file)
@@ -1,10 +1,10 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7
index c1871c7466a4c2e1a819c19e592b423b37cd80fe..ffc22ccec02d8acbccb49b5e1af9c4edad79b40c 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
             disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 8a429298dc7880296f2c32a76e296f6ccefc5e2a..beeb4c1549d9c25f1ff258a4c19cf4fe6fa7774a 100644 (file)
@@ -1,9 +1,9 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 DEPENDENCIES: odlparent,controller,yangtools
index 285daa85d941886ef04f171aba7727f4c3daa981..955ab5f05678c9b08ab383e44dc85ee384b84156 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
 
     project: 'centinel'
 
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 236f40160afc1a50280c72e5e49f13bfd59543ac..3fd75b10993702f89daddc981fb219b41d2f8d8a 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8
index 1f0bc1f92d4dc9d5496b4618b94c2e8c7f1397f3..5412b46a9bbdb0441a4249369b275d1b5cab1fd2 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 7639536ee0c132107e951583ac289c0788bb4c98..c07856ed27d0da4746a12518592f1c9e111b1499 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7
index a7615590a9b0b7dd28527748dcad36dfeaa8ba9b..8e301cdf730c2b8c95b12cbb538da74004870acf 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 8bc03162624ae6f836f09d52ad600101941a304a..b7e79a5d1f87c13ddf4083b4410337955551241d 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7
index 0b5345a9419bbc1694376c43ea5f2dd9ac9e906f..300e29895c0b7ee9ec464462d8790a761f2d2577 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 8bc03162624ae6f836f09d52ad600101941a304a..b7e79a5d1f87c13ddf4083b4410337955551241d 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7
index 506a2d9390a7af3fa1f2e99a5ca010df9034ef7e..09f289c62348f05aa88557cb6008549968b90333 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 8053a6653a086ddecdbdfc55e5924fb343ed08aa..90638fa4762324da9db277266611ff8e9b7e6ea5 100644 (file)
@@ -1,9 +1,9 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 DEPENDENCIES: controller,yangtools,odlparent
index 0bce8132eec6548b6cf9fd3bdbcdea8311ee29cc..76df043850a2a3ce425826009f6b9e6652a7b648 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
 
     project: 'faas'
 
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index fcb7ba050cd82784a400e3ae28206072e4c626ec..533e14d873c7fc9c096788a5980bfb54c6059e91 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7
index 99acac307147fe920935dc53bf325f76cc8e5ca5..0ae2b6c8c2c768258090f5cb93119ec9018e5959 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 29f70c716f4558db408502e042f2480714c05d2c..97fed31c6f248302afcde064d70d9735ff937b8e 100644 (file)
     name: 'integration-distribution-deploy-{stream}'
 
     project-type: freestyle
-    node: dynamic_controller
+    node: dynamic_verify
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
     name: 'integration-distribution-offline-{stream}'
 
     project-type: freestyle
-    node: dynamic_controller
+    node: dynamic_verify
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
     publishers:
         - email-notification:
             email-prefix: '[$GERRIT_PROJECT]'
-
index 8775f275217b71832ef0d13f0a66d39f48b0c6bb..cef6c7b383b1a5a12d038ffd26a9a08f7d0c4db0 100644 (file)
     name: integration-rebase-gerrit-patch
     builders:
         - shell:
-            !include-raw include-raw-integration-rebase-gerrit-patch.sh
+            !include-raw:
+                - include-raw-integration-rebase-gerrit-patch.sh
 
 ##############
 # Publishers #
index bfa26c7a79e75cb46e0ceaed2badcfc3c0d5950b..467677d519a743e42f5e3b545e5290d5110aef56 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8
index a1b07d3994d3f62876a09f418f6892fb189a3f0e..ac8263ee17a4714ae0449518888d90965280afd0 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index b2d0d427e7b6d65e48d5a13a76c71585508d02e8..469b8c174553c4e186d0af716cc1467c829ec036 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7
index 0c01c9b2eb86be6fcf1bc7ce890f7cbf3bce0120..fc3be1102198d5481ebdfab9b5d81863b8886b34 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 3a335975b042bc636fa430c550cd299948228413..a8ad7be4925fa39d895020d7ce1f1720e29402ad 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7
index bbc2d0769c83264b4baf712d1d9e60a0608d5bc0..b1f692198b8ed00d2487397182c19f610751cc12 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index b709b6c8a9af72c3a16810b112aa2a74fdcfb246..3ad0f2be412dada0255a5be3630d3d1bb72aab9c 100644 (file)
@@ -1,12 +1,12 @@
 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
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8
index b3e13a9b7efac5bec30b9d7b667827879210f953..41901a752079edb3fffc774d9424881d6ceab4a0 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 28ff7d0c5d8890dd8b74d12bfc5356f4712ff765..4ff8636d2a28466d7d757b17463e331c5f5d052f 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmaven.compile.fork=true clean install -Dintegrationtests
 MVN_OPTS: -Xmx2048m -XX:MaxPermSize=1024m
 DEPENDENCIES: odlparent,yangtools
index 6fb91dcc46cd29fdace68f500543c62fad1c51ba..21e5decf6b38eb3620f62cbef28e4372ef787a29 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
 
     project: 'mdsal'
 
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index d3e52f92c9ca62880618881bf9b7ccf707b2806d..e0cb5077c6e11423d4a653cd3431a66a4cf130a0 100644 (file)
@@ -1,9 +1,9 @@
 DEPENDENCIES: yangtools,aaa,controller,odlparent
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
index 6c8a413ecb032dbc3589eea3788bf3d86fdddd30..8e16c5da0f88da09a46e628c9ff6c453a55a80cc 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
 
     project: 'messaging4transport'
 
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 8053a6653a086ddecdbdfc55e5924fb343ed08aa..90638fa4762324da9db277266611ff8e9b7e6ea5 100644 (file)
@@ -1,9 +1,9 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 DEPENDENCIES: controller,yangtools,odlparent
index b26bb8efc1115e04139f22337a770f892158e139..53ca414ec6b72b0ddb8edd14ee8892ee68ae7dfa 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
 
     project: 'nemo'
 
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 39d998ae286330870da4f9840f2ffc1c2ade64b2..fc49545de55a33ce45198d73ac7804b640ade0fc 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests
 MVN_OPTS: -Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true
 DEPENDENCIES: aaa,controller,odlparent,yangtools
index 6d38271d69a6ad923814c3171201791142e1fb09..73e68327eca7e064f085be4163ee2177a0d6d571 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
 
     project: 'netconf'
 
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 684b5bf35875d60bfd444ff4536da66245a42f72..0e09d32d46e1779fbc77bc09ded8b7ffee889f64 100644 (file)
@@ -1,10 +1,10 @@
 STREAMS:\r
-- pre-boron:\r
-    branch: pre-boron\r
-    jdks: openjdk7,openjdk8\r
 - beryllium:\r
     branch: master\r
     jdks: openjdk7,openjdk8\r
     autorelease: true\r
+- pre-boron:\r
+    branch: pre-boron\r
+    jdks: openjdk7,openjdk8\r
 MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m\r
 DEPENDENCIES: odlparent,yangtools,controller,openflowjava\r
index 6f597d5c347f9f96633bf4023be608383364e055..7a4caec667c4c5e520e4f32774fc9d84900c823f 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
 
     project: 'netide'
 
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index a27e70d0a16f3af5bf395f3cd1fb239cf9d9b06e..aaaa3978c0ffc35a6ace94dcd000e1a0a1bd7835 100644 (file)
@@ -1,12 +1,12 @@
 DEPENDENCIES: odlparent,aaa
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk8
 - beryllium:
     branch: master
     jdks: openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8
index 48a6242b85684c657fb6d67a370ef62534e091b4..5c59d17e7f26bdd8e8f7442c0b77ff2aec5a591e 100644 (file)
     # 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
             jdks:
                 - openjdk8
             disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk8
+            jdks:
+                - openjdk8
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 8a429298dc7880296f2c32a76e296f6ccefc5e2a..beeb4c1549d9c25f1ff258a4c19cf4fe6fa7774a 100644 (file)
@@ -1,9 +1,9 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 DEPENDENCIES: odlparent,controller,yangtools
index dd09921250787377aa3dffe11135e4c109fbb23c..7b538f101a2e387d2b034147d6b6f58185bc6833 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
 
     project: 'next'
 
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 5e266f237109fa7660894e0929a1a8644c528f8a..f5a103313ee9e16b2446e1dbb74e6a87c98300d0 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7
index 2d1a39923f43ab9eb5177a6e75b498e87f34a828..37a5a932817ae66756e5c0454f686153f8118f68 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 8bc03162624ae6f836f09d52ad600101941a304a..b7e79a5d1f87c13ddf4083b4410337955551241d 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7
index fda78a342f8f4897f9fa5530dd32f1dcfc8e1327..68acefcbbd36c89664606f82ab70bda55541d3fd 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 89188c877e33260d139e94946f9a695f723b7a2c..7b2c9d81517c116b5c46e6e7a8b31050aefbebe2 100644 (file)
@@ -1,9 +1,9 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 DEPENDENCIES: controller,yangtools,odlparent,netconf
index 96fcd8d4147c5f78a3de769b4fa8cca67a9b7878..38d7707bef2b9f31573c545e309d82d767a6d52f 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
 
     project: 'of-config'
 
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 75047241961ea54086085286d89fe84d0586ca34..f27b7731111f2888b76791efb0551e8f38b0271f 100644 (file)
@@ -1,8 +1,8 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 DEPENDENCIES: yangtools,controller,openflowplugin
index 4a299f962a6befdd5131d85182e31fa283a6f615..5ef352bf143bd540ee6bc54cb8973c2c32ef534b 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
             disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 9e6d6c5c213b91fdeb2798f6d9deefb031ecec7b..8f75acb62e8f2eb0d26e5fa5167ca7708b10a977 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8
index 31c0668c4babaa711f103b92b5af210d51f599d8..ef10bdb87cbf1c6c4825c6fc09cde476ab53e53e 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 8df58c0058bbd82c60b92cdf178452211e4367c2..cde1e4ce512f8fb9cd173c86a3b100c932f7e6c9 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8
index fbe373202b90218cb6ecc4a9c4a05446c737c79e..e304105f3106040e6c06ee393e868a2dadafdeed 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 864a1fe74b62476971092f0ae99b4d9987cd5b7e..3eb97ef2df508ec52d8187b80f9c20b9fcfdbaee 100644 (file)
@@ -1,4 +1,8 @@
 STREAMS:
+- beryllium:
+    branch: master
+    jdks: openjdk7,openjdk8
+    autorelease: true
 - clustering-netvirt-master:
     branch: topic/master/net-virt-clustering
     jdks: openjdk7
@@ -8,10 +12,6 @@ STREAMS:
 - pre-boron:
     branch: pre-boron
     jdks: openjdk7,openjdk8
-- beryllium:
-    branch: master
-    jdks: openjdk7,openjdk8
-    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7
index 156085496fda7776af9e6d789adc8f50426b3738..14046968588422bc0f9e32ef4b1f79e15ec029e9 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - clustering-netvirt-lithium:
-            branch: 'topic/lithium/net-virt-clustering'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            disable_autorelease: True
+                - openjdk8
+            disable_autorelease: False
         - clustering-netvirt-master:
             branch: 'topic/master/net-virt-clustering'
             jdk: openjdk7
             jdks:
                 - openjdk7
             disable_autorelease: True
-        - neutron-yang-migration:
-            branch: 'topic/master/neutron-yang-migration'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-            disable_autorelease: True
         - routermanager:
             branch: 'topic/routermanager'
             jdk: openjdk7
                 - openjdk7
                 - openjdk8
             disable_autorelease: True
-        - beryllium:
-            branch: 'master'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
-            disable_autorelease: False
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
index a668b49a8fd6f87e74c12c51be6642710f2da47b..633f6d5441508499ee2a4226ace103f66b60988c 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7
index 3240d24b0fb78c80bfacc8bacb99886f3771d5e1..5596439ae526045d60c2adc8f42378cfbd9afa69 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 79c61e3f84229dabdbe72bdbd15f44ce87cb9a62..b8ef2c800f8d655c96a8356662117cadd82c03a0 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7
index 3ca9d2273f9a8ab5c97305df43262a7a6b655ba9..fea9ac802189b3a58612ca9848f25048a584d4bd 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index f775f1d5371f312a33020dbc3e6fa461fc8207c2..6142ff99cca4f64b7f819bb8b22c87a8baff919e 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8
index b9e5e0bc04907eb5887742f13e746ceee332146d..06280081b56b9c87fd8bbdad8dc504099cff79fb 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index cd467b2535348a4787cde5fa09a5c5ba8ed7c9db..1a95bafafa9fffc1df0fdea978d6aac6ecb6d777 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7
index db565e791a61c7d5e5603a6af3b9c0b5bfd710f3..798e8aa67bc81b1bee94f99ac4ea9e7ee078f03b 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 8bc03162624ae6f836f09d52ad600101941a304a..b7e79a5d1f87c13ddf4083b4410337955551241d 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7
index 4cc8683536a1602812e404cb019b761cc37b26a7..eb76e666cc8150b2e3676d4ff96a166560540180 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index d9fc66910209c8da1bed96a13dc831e6f1777ac3..4d4eb61a8af6927943f50fbb34ca4647bcc2d030 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8
index 2dd82b45e3bc11719ba749d66e59fd7369924265..2bec450ad911d82549dfe3446cd79c57a54485a9 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 380e40be9b44f0ab909feb36351a7940a39f4145..0521834bc069479bb09ce403fb79e765ba7d73fb 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7
index 46f2463ed6f3c93671d709a9c7b6129b1ec2f9f3..53ba38d6020049695291940ff4a65f361a8302ef 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index d24d1b946f1e4db32d5beeddf76ad911acce1647..1d41cea5bface79c83e0959fbfa75cfcc5d16e9e 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7
index 80b088c2c772b21c786ac2519d41b56051a4da29..6559b38dc6a21e08b83fc306c9a3ea7539e0ed47 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index bb8847f94b58917093e166f2fb4e879b779b090e..b962bcda3b1e56eb7ced367f932ee563a080d679 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8
index b5ffe624f59d55c80caf5a5f1a09e8ac38395be5..44d4b065889ac4485a4e62986757272e85231f4a 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 2a0ce2fcedb8226fe71a449ada1b12b5740852d3..b52890e6c9fa9f4cbbf7673313b9fa7adb80e0af 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8
index 4e6b3df8697a1be096044388c29c0d0ef5200839..b4feeda586a901b7efe7175fa2604f0d0927ee32 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 7673fa8aad799bc0eacc2fab08fb108f1ee44bd2..f43f8264c602c4daec60417e5af00b49882d3fbd 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7
index 54fd6787188402604c54dc72f7e84df2bd96ac59..aab7f9bf4d30ef1d11181561b1aaf113aefaf47c 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 8bc03162624ae6f836f09d52ad600101941a304a..b7e79a5d1f87c13ddf4083b4410337955551241d 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7
index cb4316efa0dd48ab05e9766a96a2bb5b33b84f4e..7c8483c555d5bc8db1f06a7dfc5972c039bed6a7 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index d453cedf5984d2848f1c4b0869a65670bfe6394a..70b07512d90b34c85ce25cc8d916fb1ddf011ef0 100644 (file)
@@ -1,9 +1,9 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 DEPENDENCIES: odlparent,yangtools,controller,ovsdb
index 835c7be84c193694e17f80bea7245cf91e9bf9c8..59b99413d2810b348b58a48eaee2c084ee2453bd 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
 
     project: 'unimgr'
 
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 232f9a1993092310cfc62aa31ff440ce4e01c0df..c9f11b823bc59d7d11adb1e68f750d9e5a977a73 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk8,openjdk7
index 4c748a904006fda63917cebbc7e51808fc46a64a..73885eb16dbf99a9e14325d63308b69df17e1953 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk8
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index a343f7a9d5ae7f168b63699a744159e96513bbde..ef4b316a269e053477e7af999f61be55a88b552e 100644 (file)
@@ -1,9 +1,9 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 DEPENDENCIES: openflowplugin,odlparent,controller,yangtools
index e24f49bffe459ddc790d8178701d4fb1d1f5abe9..1729ed33ef0f8b213ec0f164ff8c76f66c08f345 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
 
     project: 'usecplugin'
 
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index d4b99d8352e76c7284a8a55274258f1a63cb2c02..675f645044d402ac3893485ea6315a5733424332 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7
index 4873822354177abcdbd33c43f150986d59263f4a..478ff596f5ec98099cfb6efe9ba27728012b587f 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 402c07859687a3d872373f88140fa427608b2007..e94fb565bbcfee1ab9e94861f274bd96b1d6a27d 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7
index 3e4fb1998ac221bf0dd9e59d6820770e7d26525a..b50e65300aa28842303309613fa07b687a0ce193 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 8053a6653a086ddecdbdfc55e5924fb343ed08aa..90638fa4762324da9db277266611ff8e9b7e6ea5 100644 (file)
@@ -1,9 +1,9 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 DEPENDENCIES: controller,yangtools,odlparent
index 8767f0bd2afbbefc270596e31b9cb5763c32a620..1ebd5ee3b95f63a8b60afb53ac57156ed0964b2a 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
 
     project: 'yang-push'
 
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 110ba8d6a0b76bd7fdaf5eb420b01d067a2d5144..a5ec29a55712bc279f6b4824018a04af00d08cdb 100644 (file)
@@ -1,11 +1,11 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8
index 5a0507db3f421d1a4bba6fbcbe7d1dfd58df3e98..0c24be2cd898bd4446f0f897f3d5a139e8ced982 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - beryllium:
-            branch: 'master'
+            disable_autorelease: False
+        - pre-boron:
+            branch: 'pre-boron'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'pre-boron'
+            branch: 'master'
 
     wrappers:
         - build-timeout
index 68f2152c49b0d1b19cba801cf77c4b8566ccf197..4bfdb1c8423a0ceed3abe262ad14d0eb6092bd5b 100644 (file)
@@ -1,37 +1,41 @@
-The [Release Engineering project](https://wiki.opendaylight.org/view/RelEng:Main "Releng:Main")
-consolidates the Jenkins jobs from project-specific VMs to a single Jenkins
-server. Each OpenDaylight project will have a tab on the RelEng Jenkins
-server. The system utilizes
-[Jenkins Job Builder](http://ci.openstack.org/jenkins-job-builder/ "JJB")
-\(JJB\) for the creation and management of the Jenkins jobs.
+The [Release Engineering project][0] consolidates the Jenkins jobs from
+project-specific VMs to a single Jenkins server. Each OpenDaylight project
+has a tab for their jobs on the [RelEng Jenkins server][3]. The system utilizes
+[Jenkins Job Builder][11] \(JJB\) for the creation and management of the
+Jenkins jobs.
 
 Sections:
 
 * [Jenkins Master](#jenkins_master)
 * [Build Slaves](#build_slaves)
 * [Creating Jenkins Jobs](#creating_jenkins_jobs)
-    * [Jenkins Job Builder Installation](#jjb_install)
+    * [Getting Jenkins Job Builder](#jjb)
+        * [Installing Jenkins Job Builder](#jjb_install)
+            * [Virtual Environments](#jjb_install_venv)
+            * [Installing JJB using pip](#jjb_install_pip)
+            * [Installing JJB Manually](#jjb_install_manual)
+        * [Jenkins Job Builder Docker Image](#jjb_install_docker)
     * [Jenkins Job Templates](#jjb_templates)
     * [Jenkins Job Basic Configuration](#jjb_basic_configuration)
     * [Jenkins Job Maven Properties](#jjb_maven_properties)
 * [Jenkins Sandbox](#jenkins_sandbox)
+    * [Configuration](#sandbox_config)
+    * [Manual Method](#jjb_use_manual)
+    * [Docker Method](#jjb_use_docker)
 
 # <a name="jenkins_master">Jenkins Master</a>
 
-https://jenkins.opendaylight.org/releng/
-
-The Jenkins Master server is the new home for all project Jenkins jobs.  All
+The [Jenkins master server][3] is the home for all project's Jenkins jobs. All
 maintenance and configuration of these jobs must be done via JJB through the
-RelEng repo ([https://git.opendaylight.org/gerrit/gitweb?p=releng%2Fbuilder.git;a=summary RelEng/Builder gitweb]).
-Project contributors can no longer edit the Jenkins jobs directly on the
-server.
+[RelEng repo][4]. Project contributors can no longer edit the Jenkins jobs
+directly on the server.
 
 # <a name="build_slaves">Build Slaves</a>
 
 The Jenkins jobs are run on build slaves (executors) which are created on an
-as-needed basis.  If no idle build slaves are available a new VM is brought
+as-needed basis. If no idle build slaves are available a new VM is brought
 up. This process can take up to 2 minutes. Once the build slave has finished a
-job, it will remain online for 45 minutes before shutting down.  Subsequent
+job, it will remain online for 45 minutes before shutting down. Subsequent
 jobs will use an idle build slave if available.
 
 Our Jenkins master supports many types of dynamic build slaves. If you are
@@ -41,47 +45,43 @@ Slave Template Names are needed for jobs that take advantage of multiple
 slaves as they must be specifically called out by template name instead of
 label.
 
-## Adding new components to the slaves
+## Adding New Components to the Slaves
 
 If your project needs something added to one of the slaves used during build
-and test you can help us get things added in faster by doing one of the
-following:
-
-* Submit a patch to releng/builder for the
-  [Jenkins Spinup script](https://git.opendaylight.org/gerrit/gitweb?p=releng/builder.git;a=tree;f=jenkins-scripts;h=69252dd61ece511bd2018039b40e7836a8d49d21;hb=HEAD)
-  that configures your new piece of software.
+and test you can help us get things added faster by doing one of the following:
 
-* Submit a patch to releng/builder for the
-  [Vagrant template's bootstrap.sh](https://git.opendaylight.org/gerrit/gitweb?p=releng/builder.git;a=tree;f=vagrant;h=409a2915d48bbdeea9edc811e1661ae17ca28280;hb=HEAD)
+* Submit a patch to RelEng/Builder for the [Jenkins spinup script][5] that
+  configures your new piece of software.
+* Submit a patch to RelEng/Builder for the [Vagrant template's bootstrap.sh][6]
   that configures your new piece of software.
 
 Going the first route will be faster in the short term as we can inspect the
 changes and make test modifications in the sandbox to verify that it works.
 
 The second route, however, is better for the community as a whole as it will
-allow others that utilize our vagrant startups to replicate our systems more
+allow others that utilize our Vagrant setups to replicate our systems more
 closely. It is, however, more time consuming as an image snapshot needs to be
-created based on the updated vagrant definition before it can be attached to
+created based on the updated Vagrant definition before it can be attached to
 the sandbox for validation testing.
 
 In either case, the changes must be validated in the sandbox with tests to
-make sure that we don't break current jobs but also that the new software
-features are operating as intended. Once this is done the changes will be
-merged and the updates applied to the releng Jenkins production silo.
-
-Please note that the combination of the Vagrant slave snapshot and the Jenkins
-Spinup script is what defines a given slave. That means for instance that a
-slave that is defined using the releng/builder/vagrant/basic-java-node Vagrant
-and a Jenkins Spinup script of releng/builder/jenkins-script/controller.sh
-(as the dynamic_controller slave is) is the full definition of the realized
-slave. Jenkins starts a slave using the snapshot created that has been saved
-from when the vagrant was last run and once the instance is online it then
-checks out the releng/builder repo and executes two scripts. The first is the
-basic_settings.sh which is a baseline for all of the slaves and the second is
-the specialization script that does any syste updates, new software installs
-or extra environment tweaks that don't make sense in a snapshot. After all of
-these scripts have executed Jenkins will finally attach the slave as an actual
-slave and start handling jobs on it.
+make sure that we don't break current jobs and that the new software features
+are operating as intended. Once this is done the changes will be merged and
+the updates applied to the RelEng Jenkins production silo.
+
+Please note that the combination of a Vagrant slave snapshot and a Jenkins
+spinup script is what defines a given slave. For instance, a slave may be
+defined by the [`releng/builder/vagrant/basic-java-node/`][8] Vagrant definition
+and the [`releng/builder/jenkins-script/controller.sh`][9] Jenkins spinup script
+(as the dynamic\_controller slave is). The pair provides the full definition of
+the realized slave. Jenkins starts a slave using the last-spun Vagrant snapshot
+for the specified definition. Once the base Vagrant instance is online Jenkins
+checks out the RelEng/Builder repo on it and executes two scripts. The first is
+[`basic_settings.sh`][10], which is a baseline for all of the slaves. The second is
+the specialized spinup script, which handles any system updates, new software
+installs or extra environment tweaks that don't make sense in a snapshot. After
+all of these scripts have executed Jenkins will finally attach the slave as an
+actual slave and start handling jobs on it.
 
 ### Pool: Rackspace - Docker
 
@@ -95,7 +95,7 @@ slave and start handling jobs on it.
   <tr>
     <td colspan="4">
       A Fedora 20 system that is configured with OpenJDK 1.7 (aka Java7) and
-      docker. This system was originally custom built for the test needs of
+      Docker. This system was originally custom built for the test needs of
       the OVSDB project but other projects have expressed interest in using
       it.
     </td>
@@ -263,83 +263,176 @@ slave and start handling jobs on it.
 
 # <a name="creating_jenkins_jobs">Creating Jenkins Jobs</a>
 
-Jenkins Job Builder takes simple descriptions of Jenkins jobs in YAML format, and uses them to configure Jenkins.
+Jenkins Job Builder takes simple descriptions of Jenkins jobs in YAML format
+and uses them to configure Jenkins.
 
-* [Jenkins Job Builder](http://ci.openstack.org/jenkins-job-builder/) \(JJB\)
-  documentation
+* [Jenkins Job Builder][11] \(JJB\) documentation
+* [RelEng/Builder Gerrit][12]
+* [RelEng/Builder Git repository][13]
 
-OpenDaylight releng/builder gerrit project
+## <a name="jjb">Getting Jenkins Job Builder</a>
 
-* [releng/builder](https://git.opendaylight.org/gerrit/#/admin/projects/releng/builder)
-  Git repo
+OpenDaylight uses Jenkins Job Builder to translate our in-repo YAML job
+configuration into job descriptions suitable for consumption by Jenkins.
+When testing new Jenkins Jobs in the [sandbox](#jenkins_sandbox), you'll
+need to use the `jenkins-jobs` executable to translate a set of jobs into
+their XML descriptions and upload them to the sandbox Jenkins server.
 
-## <a name="jjb_install">Jenkins Job Builder Installation</a>
+We document [installing](#jjb_install) `jenkins-jobs` below. We also provide
+a [pre-built Docker image](#jjb_docker) with `jenkins-jobs` already installed.
 
-### Using Docker
-[Docker](https://www.docker.com/whatisdocker/) is an open platform used to
-create virtualized Linux containers for shipping self-contained applications.
-Docker leverages LinuX Containers \(LXC\) running on the same operating system
-as the host machine, whereas a traditional VM runs an operating system over
-the host.
+### <a name="jjb_install">Installing Jenkins Job Builder</a>
 
-    docker pull zxiiro/jjb-docker
-    docker run --rm -v ${PWD}:/jjb jjb-docker
+For users who aren't already experienced with Docker or otherwise don't want
+to use our [pre-built JJB Docker image](#jjb_docker), installing JJB into a
+virtual environment is an equally good option.
 
-The Dockerfile that created that image is
-[here](https://github.com/zxiiro/jjb-docker/blob/master/Dockerfile).
-By default it will run:
+We recommend using [pip](#jjb_install_pip) to assist with JJB installs, but we
+also document [installing from a git repository manually](#jjb_install_manual).
+For both, we [recommend][17] using [virtual environments](#jjb_install_venv)
+to isolate JJB and its dependencies.
 
-    jenkins-jobs test .
+The [`builder/jjb/requirements.txt`][33] file contains the currently
+recommended JJB version. Because JJB is fairly unstable, it may be necessary
+to debug things by installing different versions. This is documented for both
+[pip-assisted](#jjb_install_pip) and [manual](#jjb_install_manual) installs.
+
+#### <a name="jjb_install_venv">Virtual Environments</a>
+
+For both [pip-assisted](#jjb_install_pip) and [manual](#jjb_install_manual) JJB
+installs, we [recommend using virtual environments][17] to manage JJB and its
+Python dependencies. The [Virtualenvwrapper][30] tool can help you do so.
+
+There are good docs for [installing Virtualenvwrapper][31]. On Linux systems
+with pip (typical), they amount to:
+
+    sudo pip install virtualenvwrapper
+
+A virtual environment is simply a directory that you install Python programs
+into and then append to the front of your path, causing those copies to be
+found before any system-wide versions.
+
+Create a new virtual environment for JJB.
+
+    # Virtaulenvwrapper uses this dir for virtual environments
+    $ echo $WORKON_HOME
+    /home/daniel/.virtualenvs
+    # Make a new virtual environment
+    $ mkvirtualenv jjb
+    # A new venv dir was created
+    (jjb)$ ls -rc $WORKON_HOME | tail -n 1
+    jjb
+    # The new venv was added to the front of this shell's path
+    (jjb)$ echo $PATH
+    /home/daniel/.virtualenvs/jjb/bin:<my normal path>
+    # Software installed to venv, like pip, is found before system-wide copies
+    (jjb)$ command -v pip
+    /home/daniel/.virtualenvs/jjb/bin/pip
+
+With your virtual environment active, you should install JJB. Your install will
+be isolated to that virtual environment's directory and only visible when the
+virtual environment is active.
+
+You can easily leave and return to your venv. Make sure you activate it before
+each use of JJB.
+
+    (jjb)$ deactivate
+    $ command -v jenkins-jobs
+    # No jenkins-jobs executable found
+    $ workon jjb
+    (jjb)$ command -v jenkins-jobs
+    $WORKON_HOME/jjb/bin/jenkins-jobs
+
+#### <a name="jjb_install_pip">Installing JJB using pip</a>
+
+The recommended way to install JJB is via pip.
+
+Clone the latest version of the [`releng/builder`][4] repo.
+
+    $ git clone https://git.opendaylight.org/gerrit/p/releng/builder.git
+
+Before actually installing JJB and its dependencies, make sure you've [created
+and activated](#jjb_install_venv) a virtual environment for JJB.
+
+    $ mkvirtualenv jjb
+
+When in doubt, the best version of JJB to attempt to use is the version
+specified in the [`builder/jjb/requirements.txt`][33] file.
+
+    # From the root of the releng/builder repo
+    (jjb)$ pip install -r jjb/requirements.txt
+
+To change the version of JJB specified by [`builder/jjb/requirements.txt`][33]
+to install from the latest commit to the master branch of JJB's git repository:
+
+    $ cat jjb/requirements.txt
+    -e git+https://git.openstack.org/openstack-infra/jenkins-job-builder#egg=jenkins-job-builder
+
+To install from a tag, like 1.3.0:
+
+    $ cat jjb/requirements.txt
+    -e git+https://git.openstack.org/openstack-infra/jenkins-job-builder@1.3.0#egg=jenkins-job-builder
 
-Using the volume mount "-v" parameter you need to mount a directory containing
-your YAML files as well as a configured jenkins.ini file if you wish to upload
-your jobs to the Sandbox.
+#### <a name="jjb_install_manual">Installing JJB Manually</a>
 
-### Manual install
+This section documents installing JJB from its manually cloned repository.
 
-Jenkins Jobs in the releng silo use Jenkins Job Builder so if you need to test
-your Jenkins job against the Sandbox you will need to install JJB.
+Note that [installing via pip](#jjb_install_pip) is typically simpler.
 
-The templates below depend on a modified JJB version to add support for some
-missing features needed by our Jenkins instance. You can download JJB from
-OpenStack:
+Checkout the version of JJB's source you'd like to build.
 
-    git clone https://git.openstack.org/openstack-infra/jenkins-job-builder
+For example, using master:
 
-Before installing JJB make sure following python modules are installed (see
-requirements.txt):
+    $ git clone https://git.openstack.org/openstack-infra/jenkins-job-builder
 
-* argparse
-* ordereddict
-* six>=1.5.2
-* PyYAML
-* python-jenkins>=0.4.1
-* pbr>=0.8.2,<1.0
+Using a tag, like 1.3.0:
 
-Follow steps in README.rst to install JJB:
+    $ git clone https://git.openstack.org/openstack-infra/jenkins-job-builder
+    $ cd jenkins-job-builder
+    $ git checkout tags/1.3.0
 
-   sudo python setup.py install
+Before actually installing JJB and its dependencies, make sure you've [created
+and activated](#jjb_install_venv) a virtual environment for JJB.
 
-Notes for Mac: [instructions here](https://github.com/openstack-infra/jenkins-job-builder).
-The <tt>sudo python setup.py install</tt> seems to work better than the
-version using brew and pip.
+    $ mkvirtualenv jjb
 
-Note: Some Linux distributions already contain a JJB package, usually with
-version too low to work correctly with Releng templates. You may need to
-uninstall the corresponding Linux package (or find another workaround) before
-proceeding with steps from *README.rst*.
+You can then use [JJB's `requirements.txt`][20] file to install its
+dependences.
 
-Update: Here is a link to e-mail with suggestions on how to install and
-upgrade JJB properly:
-https://lists.opendaylight.org/pipermail/integration-dev/2015-April/003016.html
+    # In the cloned JJB repo, with the desired version of the code checked out
+    (jjb)$ pip install -r requirements.txt
 
-Update: There was an issue with certain JJB versions. Workaround:
-https://lists.opendaylight.org/pipermail/integration-dev/2015-October/005000.html
+Finally, install JJB.
+
+    # In the cloned JJB repo, with the desired version of the code checked out
+    (jjb)$ python setup.py install
+
+Note that we're not using `sudo` to install as root, since we want to make
+use of the venv we've configured for our current user.
+
+### <a name="jjb_install_docker">JJB Docker Image</a>
+
+[Docker][14] is an open platform used to create virtualized Linux containers
+for shipping self-contained applications. Docker leverages LinuX Containers
+\(LXC\) running on the same operating system as the host machine, whereas a
+traditional VM runs an operating system over the host.
+
+    docker pull zxiiro/jjb-docker
+    docker run --rm -v ${PWD}:/jjb jjb-docker
+
+[This Dockerfile][15] created the [zxiiro/jjb-docker image][29]. By default it
+will run:
+
+    jenkins-jobs test .
+
+You'll need to use the `-v/--volume=[]` parameter to mount a directory
+containing your YAML files, as well as a configured `jenkins.ini` file if you
+wish to upload your jobs to the [sandbox](#jenkins_sandbox).
 
 ## <a name="jjb_templates">Jenkins Job Templates</a>
 
-The ODL Releng project provides 4 job templates which can be used to
-define basic jobs.
+The OpenDaylight [RelEng/Builder][21] project provides [JJB job templates][2]
+that can be used to define basic jobs.
 
 ### Verify Job Template
 
@@ -359,8 +452,7 @@ The Merge job template is similar to the Verify Job Template except it will
 trigger once a Gerrit patch is merged into the repo. It also automatically
 runs the Maven goals **source:jar** and **javadoc:jar**.
 
-This job will upload artifacts to https://nexus.opendaylight.org on
-completion.
+This job will upload artifacts to [OpenDaylight's Nexus][22] on completion.
 
 Merge jobs can be retriggered in Gerrit by leaving a comment that says
 **remerge**.
@@ -375,13 +467,12 @@ day.
 
 Trigger: **run-sonar**
 
-This job runs Sonar analysis and reports the results to
-[OpenDaylight's Sonar dashboard(https://sonar.opendaylight.org).
+This job runs Sonar analysis and reports the results to [OpenDaylight's Sonar
+dashboard][23].
 
-**Note:** Running the "run-sonar" trigger will cause Jenkins to remove it's
-existing vote if it's already -1 or +1'd a comment. You will need to re-run
-your verify job (recheck) after running this to get Jenkins to put back the
-correct vote.
+**Note:** Running the "run-sonar" trigger will cause Jenkins to remove its
+existing vote if it's already -1'd or +1'd a comment. You will need to re-run
+your verify job (recheck) after running this to get Jenkins to re-vote.
 
 The Sonar Job Template creates a job which will run against the master branch,
 or if BRANCHES are specified in the CFG file it will create a job for the
@@ -389,11 +480,11 @@ or if BRANCHES are specified in the CFG file it will create a job for the
 
 ### Integration Job Template
 
-The Integration Job Template create a job which runs when a project that your
+The Integration Job Template creates a job which runs when a project that your
 project depends on is successfully built. This job type is basically the same
-as a verify job except that it triggers from other jenkins jobs instead of via
-Gerrit review update. The dependencies are listed in your project.cfg file
-under the **DEPENDENCIES** variable.
+as a verify job except that it triggers from other Jenkins jobs instead of via
+Gerrit review updates. The dependencies that triger integration jobs are listed
+in your project.cfg file under the **DEPENDENCIES** variable.
 
 If no dependencies are listed then this job type is disabled by default.
 
@@ -402,10 +493,11 @@ If no dependencies are listed then this job type is disabled by default.
 Trigger: **test-integration**
 
 This job runs a full integration test suite against your patch and reports
-back the results to Gerrit. This job is maintained by the integration project
-and you just need to leave a comment with trigger keyword above to activate it
+back the results to Gerrit. Leave a comment with trigger keyword above to activate it
 for a particular patch.
 
+This job is maintained by the [Integration/Test][1] project.
+
 **Note:** Running the "test-integration" trigger will cause Jenkins to remove
 it's existing vote if it's already -1 or +1'd a comment. You will need to
 re-run your verify job (recheck) after running this to get Jenkins to put back
@@ -413,14 +505,14 @@ the correct vote.
 
 Some considerations when using this job:
 
-* The patch test verification takes some time (~ 2 hours) + consumes a lot of
-  resources so it is not meant to be used for every patch
-* The system test for master patches will fail most of the times because both
+* The patch test verification takes some time (~2 hours) + consumes a lot of
+  resources so it is not meant to be used for every patch.
+* The system tests for master patches will fail most of the times because both
   code and test are unstable during the release cycle (should be good by the
-  end of the cycle)
-* Because of the above, patch test results has to be interpreted most of the
-  times by a system test knowable person, the integration group can help with
-  that
+  end of the cycle).
+* Because of the above, patch test results typically have to be interpreted by
+  system test experts. The [Integration/Test][1] project can help with that.
+
 
 ### Autorelease Validate Job
 
@@ -436,83 +528,67 @@ 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
-template which will create 6 jobs (verify, merge, and daily jobs for both
-master and stable/helium branch).
-
-Run the following steps from the repo (i.e. releng/builder) root to create
-initial job config. This script will produce a file in
-jjb/\<project\>/\<project\>.yaml containing your project's base template.
-
-    python scripts/jjb-init-project.py <project-name>
-
-    # Example
-    python scripts/jjb-init-project.py aaa
-
-    # Note: The optional options below require you to remove the 1st line
-    #       comment in the produced template file otherwise the auto
-    #       update script will overwrite the customization next time it
-    #       is run. See Auto Update Job Templates section below for more
-    #       details.
-    #
-    # Optionally pass the following options:
-    #
-    # -s / --streams        : List of release streams you want to create jobs for. The
-    #                         first in the list will be used for the Sonar job.
-    #                         (defaults to "beryllium")
-    # -p / --pom            : Path to pom.xml to use in Maven build (defaults to pom.xml)
-    # -g / --mvn-goals      : With your job's Maven Goals necessary to build
-    #                         (defaults to "clean install")
-    #          Example      : -g "clean install"
-    #
-    # -o / --mvn-opts       : With your job's Maven Options necessary to build
-    #                         (defaults to empty)
-    #          Example      : -o "-Xmx1024m"
-    #
-    # -d / --dependencies   : A comma-seperated (no spaces) list of projects
-    #                         your project depends on.
-    #                         This is used to create an integration job that
-    #                         will trigger when a dependent project-merge job
-    #                         is built successfully.
-    #          Example      : aaa,controller,yangtools
-    #
-    # -t / --templates      : Job templates to use
-    #                         (defaults: verify,merge,daily,integration,sonar)
-    #
-    #          Example      : verify,merge,daily,integration
-    #
-    # -a / --archive-artifacts  : Comma-seperated list of patterns of artifacts
-    #                             to archive on build completion.
-    #                             See: http://ant.apache.org/manual/Types/fileset.html
-    #
-    #          Example      : *.log,*.patches
-
-If all your project requires is the basic verify, merge, and
-daily jobs then using the job template should be all you need to
-configure for your jobs.
-
-### Auto Update Job Templates
-
-The first line of the job YAML file produced by the script will contain
-the words # REMOVE THIS LINE IF... leaving this line will allow the
-releng/builder autoupdate script to maintain this file for your project
-should the base template ever change. It is a good idea to leave this
-line if you do not plan to create any complex jobs outside of the
-provided template.
-
-However if your project needs more control over your jobs or if you have
-any additional configuration outside of the standard configuration
-provided by the template then this line should be removed.
-
-#### Tuning templates
-
-Additionally the auto-updater does allow some small tweaks to the template
-so that you can take advantage of the template while at the same time
-tuning small aspects of your jobs. To take advantage of this simply create
-a file in your project's jjb directory called **project.cfg** with the
-following contents and tune as necessary. If there is a parameter you do
-NOT want to tune simply remove the parameter or comment out the line with a
-"#"" sign.
+To create jobs based on existing [templates](#jjb_templates), use the
+[`jjb-init-project.py`][24] helper script. When run from the root of
+[RelEng/Builder's repo][13], it will produce a file in
+`jjb/<project>/<project>.yaml` containing your project's base template.
+
+    $ python scripts/jjb-init-project.py --help
+    usage: jjb-init-project.py [-h] [-c CONF] [-d DEPENDENCIES] [-t TEMPLATES]
+                               [-s STREAMS] [-p POM] [-g MVN_GOALS] [-o MVN_OPTS]
+                               [-a ARCHIVE_ARTIFACTS]
+                               project
+
+    positional arguments:
+      project               project
+
+    optional arguments:
+      -h, --help            show this help message and exit
+      -c CONF, --conf CONF  Config file
+      -d DEPENDENCIES, --dependencies DEPENDENCIES
+                            Project dependencies A comma-seperated (no spaces)
+                            list of projects your project depends on. This is used
+                            to create an integration job that will trigger when a
+                            dependent project-merge job is built successfully.
+                            Example: aaa,controller,yangtools
+      -t TEMPLATES, --templates TEMPLATES
+                            Job templates to use
+      -s STREAMS, --streams STREAMS
+                            Release streams to fill with default options
+      -p POM, --pom POM     Path to pom.xml to use in Maven build (Default:
+                            pom.xml
+      -g MVN_GOALS, --mvn-goals MVN_GOALS
+                            Maven Goals
+      -o MVN_OPTS, --mvn-opts MVN_OPTS
+                            Maven Options
+      -a ARCHIVE_ARTIFACTS, --archive-artifacts ARCHIVE_ARTIFACTS
+                            Comma-seperated list of patterns of artifacts to
+                            archive on build completion. See:
+                            http://ant.apache.org/manual/Types/fileset.html
+
+If all your project requires is the basic verify, merge, and daily jobs then
+using the job template should be all you need to configure for your jobs.
+
+### Auto-Update Job Templates
+
+The first line of the job YAML file produced by the [init script][24] will
+contain the words `# REMOVE THIS LINE IF...`. Leaving this line will allow the
+RelEng/Builder [auto-update script][25] to maintain this file for your project,
+should the base templates ever change. It is a good idea to leave this line if
+you do not plan to create any complex jobs outside of the provided template.
+
+However, if your project needs more control over your jobs or if you have any
+additional configuration outside of the standard configuration provided by the
+template, then this line should be removed.
+
+#### Tuning Templates
+
+Allowing the auto-updated to manage your templates doesn't prevent you from
+doing some configuration changes. Parameters can be passed to templates via
+a `<project>.cfg` in your `builder/jjb/<project>` directory. An example is
+provided below, others can be found in the repos of other projects. Tune as
+necessary. Unnecessary paramaters can be removed or commented out with a "#"
+sign.
 
     JOB_TEMPLATES: verify,merge,sonar
     STREAMS:
@@ -529,11 +605,11 @@ NOT want to tune simply remove the parameter or comment out the line with a
     DEPENDENCIES: aaa,controller,yangtools
     ARCHIVE_ARTIFACTS: *.logs, *.patches
 
-Note: BRANCHES is a list of branches you want JJB to generate jobs for, the
-first branch will be the branch that reports Sonar analysis. Each branch must
-additionally define a "jdks:" section listing the jdks the verify jobs should
-run tests against for the branch; additionally the first jdk listed will be
-used as the default jdk for non-verify type jobs.
+Note: [STREAMS][26] is a list of branches you want JJB to generate jobs for.
+The first branch will be the branch that reports Sonar analysis. Each branch
+must define a "jdks:" section listing the JDKs the verify jobs should run tests
+against for the branch. The first JDK listed will be used as the default JDK
+for non-verify type jobs.
 
 Note: Projects that are participating in the simultanious release should set
 "autorelease: true" under the streams they are participating in autorelease
@@ -542,7 +618,7 @@ identify if Gerrit patches might break autorelease or not.
 
 #### Advanced
 
-It is also possible to take advantage of both the auto updater and creating
+It is also possible to take advantage of both the auto-updater and creating
 your own jobs. To do this, create a YAML file in your project's sub-directory
 with any name other than \<project\>.yaml. The auto-update script will only
 search for files with the name \<project\>.yaml. The normal \<project\>.yaml
@@ -566,80 +642,153 @@ wish to run in your project.
 
 # <a name="jenkins_sandbox">Jenkins Sandbox</a>
 
-[https://jenkins.opendaylight.org/sandbox](https://jenkins.opendaylight.org/sandbox/)
+The [sandbox instance][27]'s purpose is to allow projects to test their JJB
+setups before merging their code over to the RelEng master silo. It is
+configured similarly to the master instance, although it cannot publish
+artifacts or vote in Gerrit.
+
+If your project requires access to the sandbox please open an OpenDaylight
+Helpdesk ticket (<helpdesk@opendaylight.org>) and provide your ODL ID.
 
-The Sandbox instance's purpose is to allow projects to test their JJB setups
-before merging their code over to the Releng Master silo. It is configured
-similarly to the Master instance above however it cannot publish or vote in
-Gerrit.
+## Notes Regarding the Sandbox
 
-If your project requires access to the Sandbox please open a Help Desk ticket
-and provide us with your ODL ID.
+* Jobs are automatically deleted every Saturday at 08:00 UTC
+* Committers can login and configure Jenkins jobs in the sandbox directly
+  (unlike with the master silo)
+* Sandbox configuration mirrors the master silo when possible
+* Sandbox jobs can NOT upload artifacts to Nexus
+* Sandbox jobs can NOT vote on Gerrit
 
-## Notes regarding the Sandbox
+## <a name="sandbox_config">Configuration</a>
 
-* Jobs automatically deleted Saturday @ 08:00 UTC (12:00 AM PST / 01:00 AM PDT)
-* Committers can login and configure Jenkins jobs directly here (unlike on the
-master silo)
-* Configuration mirrors the master silo when possible
-* Can NOT upload artifacts to Nexus
-* Can NOT vote on Gerrit
+Make sure you have Jenkins Job Builder [properly installed](#jjb_install).
 
-## Using the Sandbox
+If you do not already have access, open an OpenDaylight Helpdesk ticket
+(<helpdesk@opendaylight.org>) to request access to ODL's sandbox instance.
+[Integration/Test][1] committers have access by default.
 
-Before starting using the sandbox make sure you have Jenkins Job Builder
-properly installed in your setup. Refer Jenkins Job Builder Installation
-section of this guide.
+JJB reads user-specific configuration from a [`jenkins.ini` file][7]. An
+example is provided at [`builder/jenkins.ini.example`][28].
 
-If you do not already have access, open a helpdesk ticket to request access to
-the sandbox instance (Integration committers will have access by default).
+    # If you don't have RelEng/Builder's repo, clone it
+    $ git clone https://git.opendaylight.org/gerrit/p/releng/builder.git
+    # Make a copy of the example JJB config file (in the builder/ directory)
+    $ cp jenkins.ini.example jenkins.ini
+    # Edit jenkins.ini with your username, API token and ODL's sandbox URL
+    $ cat jenkins.ini
+    <snip>
+    [jenkins]
+    user=<your ODL username>
+    password=<your ODL Jenkins sandbox API token>
+    url=https://jenkins.opendaylight.org/sandbox
+    <snip>
 
-1. Clone a copy of the releng/builder repo from https://git.opendaylight.org/gerrit/#/admin/projects/releng/builder
-2. cp jenkins.ini.example jenkins.ini
-3. Edit the jenkins.ini file at the root of the repo
-    * Set your ODL username and password (make sure to uncomment the lines)
-    * Set the URL to https://jenkins.opendaylight.org/sandbox
+To get your API token, [login to the Jenkins **sandbox** instance][32] (_not
+the main master Jenkins instance, different tokens_), go to your user page (by
+clicking on your username, for example), click "Configure" and then "Show API
+Token".
 
-It is good practice to test that your JJB files are valid before pushing using
-the test command. If you see no Exceptions or Failures after running the
-following command your templates should be good for pushing.
+## <a name="jjb_use_manual">Manual Method</a>
 
-The last parameter is the name of the job you want to push to Jenkins so if
-your job template name is **{project}-csit-3node-periodic-{functionality}-{install}-{stream}**
-you will need to expand manually the variables {project}, {functionality},
-{install}, and {stream} to the exact job you want created in the Sandbox for
-example **openflowplugin-csit-1node-periodic-longevity-only-beryllium**. Please
-do not push ALL jobs to the Sandbox and only jobs you actually intend to test.
+If you [installed JJB locally into a virtual environment](#jjb_install),
+you should now activate that virtual environment to access the `jenkins-jobs`
+executable.
 
-**Note:** the below command examples are being executed from the root of the
-builder repo, and assume the "jenkins.ini" file is located there.
+    $ workon jjb
+    (jjb)$
+
+You'll want to work from the root of the RelEng/Builder repo, and you should
+have your `jenkins.ini` file [properly configured](#sandbox_config).
+
+### <a name="jjb_manual_test">Testing Jobs</a>
+
+It's good practice to use the `test` command to validate your JJB files before
+pushing them.
 
     jenkins-jobs --conf jenkins.ini test jjb/ <job-name>
-    jenkins-jobs --conf jenkins.ini test jjb/ openflowplugin-csit-periodic-1node-cds-longevity-only-master
 
-Expect to see an XML file describing the build job in \</maven2-moduleset\> tags
-on STOUT. If you dont see any XML check that you have assigned values to the
-parameters between {} in the YAML files. For example {project}
+If the job you'd like to test is a template with variables in its name, it
+must be manually expanded before use. For example, the commonly used template
+`{project}-csit-verify-1node-{functionality}` might expand to
+`ovsdb-csit-verify-1node-netvirt`.
 
-Once this is complete you can push your JJB jobs to the sandbox with the
-command:
+    jenkins-jobs --conf jenkins.ini test jjb/ ovsdb-csit-verify-1node-netvirt
 
-    jenkins-jobs --conf jenkins.ini update jjb/ <job-name>
-    jenkins-jobs --conf jenkins.ini update jjb/ openflowplugin-csit-periodic-1node-cds-longevity-only-beryllium
+Successful tests output the XML description of the Jenkins job described by
+the specified JJB job name.
+
+### <a name="jjb_manual_push">Pushing Jobs</a>
+
+Once you've [configured your `jenkins.ini`](#sandbox_config) and [verified your
+JJB jobs](#jjb_manual_test) produce valid XML descriptions of Jenkins jobs you
+can push them to the Jenkins sandbox.
+
+> _**Important Note:** When pushing with `jenkins-jobs`, a log message with
+> the number of jobs you're pushing will be issued, typically to stdout.
+> **If the number is greater than 1** (or the number of jobs you passed to
+> the command to push) then you are pushing too many jobs and should **`ctrl+c`
+> to cancel the upload**. Else you will flood the system with jobs._
 
-**Important Note:** When pushing with jenkins-jobs command it will print out a
-message similar to the one below to inform you how many jobs JJB is pushing
-online. If the number is greater than 1 (or the number of jobs you passed to
-the command to push) then you are pushing too many jobs and should **ctrl+c**
-to cancel the upload.
+>       INFO:jenkins_jobs.builder:Number of jobs generated:  1
 
-    INFO:jenkins_jobs.builder:Number of jobs generated:  1
+> _**Failing to provide the final `<job-name>` param will push all jobs!**_
 
-If using Docker:
+    # Don't push all jobs by omitting the final param! (ctrl+c to abort)
+    jenkins-jobs --conf jenkins.ini update jjb/ <job-name>
+
+## <a name="jjb_use_docker">Docker Method</a>
+
+If [using Docker](#jjb_install_docker):
 
     # To test
     docker run --rm -v ${PWD}:/jjb zxiiro/jjb-docker
 
+> _**Important Note:** When pushing with `jenkins-jobs`, a log message with
+> the number of jobs you're pushing will be issued, typically to stdout.
+> **If the number is greater than 1** (or the number of jobs you passed to
+> the command to push) then you are pushing too many jobs and should **`ctrl+c`
+> to cancel the upload**. Else you will flood the system with jobs._
+
+>       INFO:jenkins_jobs.builder:Number of jobs generated:  1
+
+> _**Failing to provide the final `<job-name>` param will push all jobs!**_
+
     # To upload jobs to the sandbox
     # Please ensure that you include a configured jenkins.ini in your volume mount
+    # Making sure not to push more jobs than expected, ctrl+c to abort
     docker run --rm -v ${PWD}:/jjb zxiiro/jjb-docker jenkins-jobs --conf jenkins.ini update . openflowplugin-csit-periodic-1node-cds-longevity-only-master
+
+[0]: https://wiki.opendaylight.org/view/RelEng:Main "ODL RelEng parent project wiki"
+[1]: https://wiki.opendaylight.org/view/Integration/Test "ODL Integration/Test wiki"
+[2]: https://git.opendaylight.org/gerrit/gitweb?p=releng/builder.git;a=tree;f=jenkins-scripts;h=371193b89f418de2ca0ffcb78be4a2d8046701ae;hb=refs/heads/master "JJB Templates Directory"
+[3]: https://jenkins.opendaylight.org/releng "RelEng Jenkins"
+[4]: https://git.opendaylight.org/gerrit/gitweb?p=releng%2Fbuilder.git;a=summary "RelEng/Builder gitweb"
+[5]: https://git.opendaylight.org/gerrit/gitweb?p=releng/builder.git;a=tree;f=jenkins-scripts;h=69252dd61ece511bd2018039b40e7836a8d49d21;hb=HEAD "Directory of Jenkins slave spinup scripts"
+[6]: https://git.opendaylight.org/gerrit/gitweb?p=releng/builder.git;a=tree;f=vagrant;h=409a2915d48bbdeea9edc811e1661ae17ca28280;hb=HEAD "Directory of Jenkins slave Vagrant definitions"
+[7]: http://docs.openstack.org/infra/jenkins-job-builder/execution.html#configuration-file "JJB config file docs"
+[8]: https://git.opendaylight.org/gerrit/gitweb?p=releng/builder.git;a=tree;f=vagrant/basic-java-node;h=7197b26b747deba38c08f30a569c233fd9636d72;hb=HEAD "Example Jenkins slave Vagrant defition"
+[9]: https://git.opendaylight.org/gerrit/gitweb?p=releng/builder.git;a=blob;f=jenkins-scripts/controller.sh;h=893a04118a9bd9c55ae2a4a6af833fa089e0e0b4;hb=HEAD "Jenkins spinup script specialized for a slave"
+[10]: https://git.opendaylight.org/gerrit/gitweb?p=releng/builder.git;a=blob;f=jenkins-scripts/basic_settings.sh;h=9f6d2a89948d0a25a8a4a24102630ada494e8623;hb=HEAD "Jenkins spinup script common to all slaves"
+[11]: http://ci.openstack.org/jenkins-job-builder/ "JJB docs"
+[12]: https://git.opendaylight.org/gerrit/#/admin/projects/releng/builder "ODL RelEng/Builder Gerrit"
+[13]: https://git.opendaylight.org/gerrit/gitweb?p=releng/builder.git;a=summary "ODL RelEng/Builder repo"
+[14]: https://www.docker.com/whatisdocker/ "Docker docs"
+[15]: https://github.com/zxiiro/jjb-docker/blob/master/Dockerfile "Custom ODL JJB Dockerfile"
+[16]: https://github.com/openstack-infra/jenkins-job-builder "JJB repo"
+[17]: https://lists.opendaylight.org/pipermail/integration-dev/2015-April/003016.html "Recommendation to use venvs"
+[18]: https://virtualenv.readthedocs.org/en/latest/ "Virtualenv docs"
+[19]: http://virtualenv.readthedocs.org/en/latest/installation.html "Virtualenv install docs"
+[20]: https://github.com/openstack-infra/jenkins-job-builder/blob/master/requirements.txt "JJB Python dependencies"
+[21]: https://wiki.opendaylight.org/view/RelEng/Builder "ODL RelEng/Builder wiki"
+[22]: https://nexus.opendaylight.org "OpenDaylight's Nexus portal"
+[23]: https://sonar.opendaylight.org "OpenDaylight's Sonar portal"
+[24]: https://git.opendaylight.org/gerrit/gitweb?p=releng/builder.git;a=blob;f=scripts/jjb-init-project.py;h=2133475a4ff9e1f4b18cc288654a4dc050bf808f;hb=refs/heads/master "JJB project config init helper script"
+[25]: https://git.opendaylight.org/gerrit/gitweb?p=releng/builder.git;a=blob;f=scripts/jjb-autoupdate-project.py;h=56769bdb7ad5149404f4f50923f4d10af98d8248;hb=refs/heads/master "JJB project config auto-update helper script"
+[26]: https://lists.opendaylight.org/pipermail/release/2015-July/003139.html "STREAMS vs BRANCHES design background"
+[27]: https://jenkins.opendaylight.org/sandbox/ "OpenDaylight JJB Sandbox"
+[28]: https://git.opendaylight.org/gerrit/gitweb?p=releng/builder.git;a=blob;f=jenkins.ini.example;h=c8486f89af99741f4706c23cd6717df9b417ae10;hb=refs/heads/master "JJB sandbox user config example"
+[29]: https://hub.docker.com/r/zxiiro/jjb-docker/ "Custom JJB Docker image"
+[30]: https://virtualenvwrapper.readthedocs.org/en/latest/ "Virtualenvwrapper docs"
+[31]: https://virtualenvwrapper.readthedocs.org/en/latest/install.html "Virtualenvwrapper install docs"
+[32]: https://jenkins.opendaylight.org/sandbox/login "ODL Jenkins sandbox login"
+[33]: https://git.opendaylight.org/gerrit/gitweb?p=releng/builder.git;a=blob;f=jjb/requirements.txt;h=0a4df2c2a575eb10d3abddb0fb2f4d048645e378;hb=refs/heads/master "ODL JJB requirements.txt file"
diff --git a/vagrant/ubuntu-mininet-ovs-2.3/Vagrantfile b/vagrant/ubuntu-mininet-ovs-2.3/Vagrantfile
new file mode 100644 (file)
index 0000000..54b001f
--- /dev/null
@@ -0,0 +1,80 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby sw=2 ts=2 sts=2 et :
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  # root off of the rackspace provider dummy box
+  config.vm.box = "dummy"
+
+  # rackspace systems, even with cloud-init
+  # don't seem to have the cloud int user ${osname} (or similar)
+  # getting the ssh key for some reason, root does for sure
+  # so use that
+  config.ssh.username = 'root'
+
+  # Only baseline image should have config.ssh.pty = true
+  # Ensure we disable it.
+  config.ssh.pty = false
+
+  # make sure to set the following in your
+  # ~/.vagrant.d/boxes/dummy/0/rackspace/Vagrantfile
+  # rs.username
+  # rs.api_key
+  # rs.rackspace_region
+  #
+  # If you are not using an SSH token / smartcard also set this
+  # rs.key_name
+  # config.ssh.private_key_path -- set this outside the rackspace block
+  #         in your base box
+  config.vm.provider :rackspace do |rs|
+    # create these base builds always on the smallest system possible
+    rs.flavor = 'general1-1'
+
+    # allow for switching to ORD cloud but default to DFW
+    if (ENV['RSREGION'] == 'ord')
+      rs.rackspace_region = :ord
+    else
+      rs.rackspace_region = :dfw
+    end
+
+    # Default the Ubuntu 14.04 - Vagrant ready image unless overriden by a RSIMAGE
+    # environment variable
+    if ENV['RSIMAGE']
+      rs.image = ENV['RSIMAGE']
+    else
+      rs.image = 'Ubuntu 14.04 - Vagrant ready'
+    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 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: '../lib/system_reseal.sh'
+  end
+end
diff --git a/vagrant/ubuntu-mininet-ovs-2.3/bootstrap.sh b/vagrant/ubuntu-mininet-ovs-2.3/bootstrap.sh
new file mode 100644 (file)
index 0000000..2003384
--- /dev/null
@@ -0,0 +1,71 @@
+#!/bin/bash
+
+# vim: sw=4 ts=4 sts=4 et tw=72 :
+
+echo "---> Updating operating system"
+apt-get update -qq
+DEBIAN_FRONTEND=noninteractive apt-get upgrade -y --force-yes -qq \
+    -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold"
+
+# 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
+# ups
+echo 'PS1="[\u@\h \W]> "' >> /etc/skel/.bashrc
+
+# Install OpenVSwitch 2.3.1
+add-apt-repository -y ppa:vshn/openvswitch
+apt-get update -qq
+apt-get install -y --force-yes -qq openvswitch-switch
+
+# Install CPqD
+apt-get install -y --force-yes -qq build-essential cmake flex
+apt-get install -y --force-yes -qq libpcre++-dev libxerces-c-dev libpcap-dev libboost-all-dev
+
+cd /tmp
+wget -nc http://de.archive.ubuntu.com/ubuntu/pool/main/b/bison/bison_2.5.dfsg-2.1_amd64.deb \
+         http://de.archive.ubuntu.com/ubuntu/pool/main/b/bison/libbison-dev_2.5.dfsg-2.1_amd64.deb
+
+dpkg -i bison_2.5.dfsg-2.1_amd64.deb libbison-dev_2.5.dfsg-2.1_amd64.deb
+rm bison_2.5.dfsg-2.1_amd64.deb libbison-dev_2.5.dfsg-2.1_amd64.deb
+
+wget -nc http://www.nbee.org/download/nbeesrc-jan-10-2013.zip
+unzip nbeesrc-jan-10-2013.zip
+cd nbeesrc-jan-10-2013/src
+cmake .
+make
+cp ../bin/libn*.so /usr/local/lib
+ldconfig
+cp -R ../include/* /usr/include/
+cd ../..
+
+git clone https://github.com/CPqD/ofsoftswitch13.git
+cd ofsoftswitch13
+./boot.sh
+./configure
+make
+make install
+cd ..
+
+# Install mininet 2.2.1
+git clone git://github.com/mininet/mininet
+cd mininet
+git checkout -b 2.2.1 2.2.1
+cd ..
+mininet/util/install.sh -nf
+
+# cbench installation for running openflow performance tests
+
+OF_DIR=$HOME/openflow  # Directory that contains OpenFlow code
+OFLOPS_DIR=$HOME/oflops  # Directory that contains oflops repo
+
+apt-get install -y --force-yes -qq libsnmp-dev libpcap-dev libconfig-dev
+
+git clone git://gitosis.stanford.edu/openflow.git $OF_DIR
+git clone https://github.com/andi-bigswitch/oflops.git $OFLOPS_DIR
+
+cd $OFLOPS_DIR
+./boot.sh
+./configure --with-openflow-src-dir=$OF_DIR
+make
+make install