From: Luis Gomez Date: Wed, 16 Dec 2015 01:56:04 +0000 (+0000) Subject: Merge "Add -Djenkins parameter to all CI jobs" X-Git-Tag: release/beryllium~255 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=7868bf4121e27a345f4bd887935e06b4c7269b5f;hp=0d741f999a2b25d833e65caff21d7f88c6b0ada7;p=releng%2Fbuilder.git Merge "Add -Djenkins parameter to all CI jobs" --- diff --git a/jenkins-scripts/builder.sh b/jenkins-scripts/builder.sh index 5092374c5..ea7c7b583 100755 --- a/jenkins-scripts/builder.sh +++ b/jenkins-scripts/builder.sh @@ -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. diff --git a/jjb/aaa/aaa.cfg b/jjb/aaa/aaa.cfg index 9a1b2f3d8..cbd3ee27f 100644 --- a/jjb/aaa/aaa.cfg +++ b/jjb/aaa/aaa.cfg @@ -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 diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index 857d4d1de..91e239590 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -19,20 +19,20 @@ # 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 @@ -449,7 +449,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/alto/alto.cfg b/jjb/alto/alto.cfg index 1ceda8e9d..185b32b63 100644 --- a/jjb/alto/alto.cfg +++ b/jjb/alto/alto.cfg @@ -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 diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml index 34325d568..c108d980e 100644 --- a/jjb/alto/alto.yaml +++ b/jjb/alto/alto.yaml @@ -19,20 +19,20 @@ # 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 @@ -443,7 +443,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/armoury/armoury.cfg b/jjb/armoury/armoury.cfg index e57084974..27e89fa60 100644 --- a/jjb/armoury/armoury.cfg +++ b/jjb/armoury/armoury.cfg @@ -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 diff --git a/jjb/armoury/armoury.yaml b/jjb/armoury/armoury.yaml index 1195420d6..031cb38d4 100644 --- a/jjb/armoury/armoury.yaml +++ b/jjb/armoury/armoury.yaml @@ -19,20 +19,20 @@ # 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' @@ -437,7 +437,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index 72958958e..e5c30d28a 100644 --- a/jjb/autorelease/autorelease-templates.yaml +++ b/jjb/autorelease/autorelease-templates.yaml @@ -121,6 +121,9 @@ 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 @@ -135,9 +138,6 @@ 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 diff --git a/jjb/bgpcep/bgpcep.cfg b/jjb/bgpcep/bgpcep.cfg index 329719100..0f79755ad 100644 --- a/jjb/bgpcep/bgpcep.cfg +++ b/jjb/bgpcep/bgpcep.cfg @@ -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 diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index 7ee850daa..fc3878803 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -19,20 +19,20 @@ # 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 @@ -450,7 +450,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/capwap/capwap.cfg b/jjb/capwap/capwap.cfg index f95ff82e3..c1d6dbb7c 100644 --- a/jjb/capwap/capwap.cfg +++ b/jjb/capwap/capwap.cfg @@ -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 diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml index c1871c746..ffc22ccec 100644 --- a/jjb/capwap/capwap.yaml +++ b/jjb/capwap/capwap.yaml @@ -19,15 +19,15 @@ # 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 @@ -443,7 +443,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/centinel/centinel.cfg b/jjb/centinel/centinel.cfg index 8a429298d..beeb4c154 100644 --- a/jjb/centinel/centinel.cfg +++ b/jjb/centinel/centinel.cfg @@ -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 diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml index 285daa85d..955ab5f05 100644 --- a/jjb/centinel/centinel.yaml +++ b/jjb/centinel/centinel.yaml @@ -19,20 +19,20 @@ # 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' @@ -437,7 +437,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/controller/controller.cfg b/jjb/controller/controller.cfg index 236f40160..3fd75b109 100644 --- a/jjb/controller/controller.cfg +++ b/jjb/controller/controller.cfg @@ -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 diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index 1f0bc1f92..5412b46a9 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -19,20 +19,20 @@ # 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 @@ -450,7 +450,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/didm/didm.cfg b/jjb/didm/didm.cfg index 7639536ee..c07856ed2 100644 --- a/jjb/didm/didm.cfg +++ b/jjb/didm/didm.cfg @@ -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 diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml index a7615590a..8e301cdf7 100644 --- a/jjb/didm/didm.yaml +++ b/jjb/didm/didm.yaml @@ -19,20 +19,20 @@ # 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 @@ -443,7 +443,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/dlux/dlux.cfg b/jjb/dlux/dlux.cfg index 8bc031626..b7e79a5d1 100644 --- a/jjb/dlux/dlux.cfg +++ b/jjb/dlux/dlux.cfg @@ -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 diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml index 0b5345a94..300e29895 100644 --- a/jjb/dlux/dlux.yaml +++ b/jjb/dlux/dlux.yaml @@ -19,20 +19,20 @@ # 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 @@ -449,7 +449,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/docs/docs.cfg b/jjb/docs/docs.cfg index 8bc031626..b7e79a5d1 100644 --- a/jjb/docs/docs.cfg +++ b/jjb/docs/docs.cfg @@ -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 diff --git a/jjb/docs/docs.yaml b/jjb/docs/docs.yaml index 506a2d939..09f289c62 100644 --- a/jjb/docs/docs.yaml +++ b/jjb/docs/docs.yaml @@ -19,20 +19,20 @@ # 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 @@ -449,7 +449,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/faas/faas.cfg b/jjb/faas/faas.cfg index 8053a6653..90638fa47 100644 --- a/jjb/faas/faas.cfg +++ b/jjb/faas/faas.cfg @@ -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 diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml index 0bce8132e..76df04385 100644 --- a/jjb/faas/faas.yaml +++ b/jjb/faas/faas.yaml @@ -19,20 +19,20 @@ # 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' @@ -437,7 +437,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.cfg b/jjb/groupbasedpolicy/groupbasedpolicy.cfg index fcb7ba050..533e14d87 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.cfg +++ b/jjb/groupbasedpolicy/groupbasedpolicy.cfg @@ -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 diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index 99acac307..0ae2b6c8c 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -19,20 +19,20 @@ # 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 @@ -449,7 +449,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml index 29f70c716..97fed31c6 100644 --- a/jjb/integration/integration-distribution-jobs.yaml +++ b/jjb/integration/integration-distribution-jobs.yaml @@ -150,7 +150,7 @@ name: 'integration-distribution-deploy-{stream}' project-type: freestyle - node: dynamic_controller + node: dynamic_verify logrotate: daysToKeep: '{build-days-to-keep}' @@ -197,7 +197,7 @@ name: 'integration-distribution-offline-{stream}' project-type: freestyle - node: dynamic_controller + node: dynamic_verify logrotate: daysToKeep: '{build-days-to-keep}' @@ -329,4 +329,3 @@ publishers: - email-notification: email-prefix: '[$GERRIT_PROJECT]' - diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index 8775f2752..cef6c7b38 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -334,7 +334,8 @@ 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 # diff --git a/jjb/iotdm/iotdm.cfg b/jjb/iotdm/iotdm.cfg index bfa26c7a7..467677d51 100644 --- a/jjb/iotdm/iotdm.cfg +++ b/jjb/iotdm/iotdm.cfg @@ -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 diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml index a1b07d399..ac8263ee1 100644 --- a/jjb/iotdm/iotdm.yaml +++ b/jjb/iotdm/iotdm.yaml @@ -19,20 +19,20 @@ # 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 @@ -444,7 +444,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/l2switch/l2switch.cfg b/jjb/l2switch/l2switch.cfg index b2d0d427e..469b8c174 100644 --- a/jjb/l2switch/l2switch.cfg +++ b/jjb/l2switch/l2switch.cfg @@ -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 diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index 0c01c9b2e..fc3be1102 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -19,20 +19,20 @@ # 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 @@ -449,7 +449,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/lacp/lacp.cfg b/jjb/lacp/lacp.cfg index 3a335975b..a8ad7be49 100644 --- a/jjb/lacp/lacp.cfg +++ b/jjb/lacp/lacp.cfg @@ -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 diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml index bbc2d0769..b1f692198 100644 --- a/jjb/lacp/lacp.yaml +++ b/jjb/lacp/lacp.yaml @@ -19,20 +19,20 @@ # 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 @@ -443,7 +443,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/lispflowmapping/lispflowmapping.cfg b/jjb/lispflowmapping/lispflowmapping.cfg index b709b6c8a..3ad0f2be4 100644 --- a/jjb/lispflowmapping/lispflowmapping.cfg +++ b/jjb/lispflowmapping/lispflowmapping.cfg @@ -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 diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index b3e13a9b7..41901a752 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -19,20 +19,20 @@ # 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 @@ -450,7 +450,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/mdsal/mdsal.cfg b/jjb/mdsal/mdsal.cfg index 28ff7d0c5..4ff8636d2 100644 --- a/jjb/mdsal/mdsal.cfg +++ b/jjb/mdsal/mdsal.cfg @@ -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 diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml index 6fb91dcc4..21e5decf6 100644 --- a/jjb/mdsal/mdsal.yaml +++ b/jjb/mdsal/mdsal.yaml @@ -19,20 +19,20 @@ # 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' @@ -437,7 +437,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/messaging4transport/messaging4transport.cfg b/jjb/messaging4transport/messaging4transport.cfg index d3e52f92c..e0cb5077c 100644 --- a/jjb/messaging4transport/messaging4transport.cfg +++ b/jjb/messaging4transport/messaging4transport.cfg @@ -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 diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml index 6c8a413ec..8e16c5da0 100644 --- a/jjb/messaging4transport/messaging4transport.yaml +++ b/jjb/messaging4transport/messaging4transport.yaml @@ -19,20 +19,20 @@ # 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' @@ -437,7 +437,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/nemo/nemo.cfg b/jjb/nemo/nemo.cfg index 8053a6653..90638fa47 100644 --- a/jjb/nemo/nemo.cfg +++ b/jjb/nemo/nemo.cfg @@ -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 diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index b26bb8efc..53ca414ec 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -19,20 +19,20 @@ # 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' @@ -437,7 +437,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/netconf/netconf.cfg b/jjb/netconf/netconf.cfg index 39d998ae2..fc49545de 100644 --- a/jjb/netconf/netconf.cfg +++ b/jjb/netconf/netconf.cfg @@ -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 diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index 6d38271d6..73e68327e 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -19,20 +19,20 @@ # 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' @@ -437,7 +437,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/netide/netide.cfg b/jjb/netide/netide.cfg index 684b5bf35..0e09d32d4 100644 --- a/jjb/netide/netide.cfg +++ b/jjb/netide/netide.cfg @@ -1,10 +1,10 @@ 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_OPTS: -Xmx1024m -XX:MaxPermSize=256m DEPENDENCIES: odlparent,yangtools,controller,openflowjava diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml index 6f597d5c3..7a4caec66 100644 --- a/jjb/netide/netide.yaml +++ b/jjb/netide/netide.yaml @@ -19,20 +19,20 @@ # 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' @@ -437,7 +437,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/neutron/neutron.cfg b/jjb/neutron/neutron.cfg index a27e70d0a..aaaa3978c 100644 --- a/jjb/neutron/neutron.cfg +++ b/jjb/neutron/neutron.cfg @@ -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 diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index 48a6242b8..5c59d17e7 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -19,18 +19,18 @@ # 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 @@ -442,7 +442,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/next/next.cfg b/jjb/next/next.cfg index 8a429298d..beeb4c154 100644 --- a/jjb/next/next.cfg +++ b/jjb/next/next.cfg @@ -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 diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml index dd0992125..7b538f101 100644 --- a/jjb/next/next.yaml +++ b/jjb/next/next.yaml @@ -19,20 +19,20 @@ # 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' @@ -437,7 +437,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/nic/nic.cfg b/jjb/nic/nic.cfg index 5e266f237..f5a103313 100644 --- a/jjb/nic/nic.cfg +++ b/jjb/nic/nic.cfg @@ -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 diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml index 2d1a39923..37a5a9328 100644 --- a/jjb/nic/nic.yaml +++ b/jjb/nic/nic.yaml @@ -19,20 +19,20 @@ # 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 @@ -443,7 +443,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/odlparent/odlparent.cfg b/jjb/odlparent/odlparent.cfg index 8bc031626..b7e79a5d1 100644 --- a/jjb/odlparent/odlparent.cfg +++ b/jjb/odlparent/odlparent.cfg @@ -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 diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml index fda78a342..68acefcbb 100644 --- a/jjb/odlparent/odlparent.yaml +++ b/jjb/odlparent/odlparent.yaml @@ -19,20 +19,20 @@ # 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 @@ -449,7 +449,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/of-config/of-config.cfg b/jjb/of-config/of-config.cfg index 89188c877..7b2c9d815 100644 --- a/jjb/of-config/of-config.cfg +++ b/jjb/of-config/of-config.cfg @@ -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 diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml index 96fcd8d41..38d7707be 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -19,20 +19,20 @@ # 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' @@ -437,7 +437,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/ofextensions/circuitsw/circuitsw.cfg b/jjb/ofextensions/circuitsw/circuitsw.cfg index 750472419..f27b77311 100644 --- a/jjb/ofextensions/circuitsw/circuitsw.cfg +++ b/jjb/ofextensions/circuitsw/circuitsw.cfg @@ -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 diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml index 4a299f962..5ef352bf1 100644 --- a/jjb/ofextensions/circuitsw/circuitsw.yaml +++ b/jjb/ofextensions/circuitsw/circuitsw.yaml @@ -19,15 +19,15 @@ # 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 @@ -437,7 +437,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/openflowjava/openflowjava.cfg b/jjb/openflowjava/openflowjava.cfg index 9e6d6c5c2..8f75acb62 100644 --- a/jjb/openflowjava/openflowjava.cfg +++ b/jjb/openflowjava/openflowjava.cfg @@ -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 diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml index 31c0668c4..ef10bdb87 100644 --- a/jjb/openflowjava/openflowjava.yaml +++ b/jjb/openflowjava/openflowjava.yaml @@ -19,20 +19,20 @@ # 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 @@ -450,7 +450,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/openflowplugin/openflowplugin.cfg b/jjb/openflowplugin/openflowplugin.cfg index 8df58c005..cde1e4ce5 100644 --- a/jjb/openflowplugin/openflowplugin.cfg +++ b/jjb/openflowplugin/openflowplugin.cfg @@ -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 diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index fbe373202..e304105f3 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -19,20 +19,20 @@ # 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 @@ -452,7 +452,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/ovsdb/ovsdb.cfg b/jjb/ovsdb/ovsdb.cfg index 864a1fe74..3eb97ef2d 100644 --- a/jjb/ovsdb/ovsdb.cfg +++ b/jjb/ovsdb/ovsdb.cfg @@ -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 diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index 156085496..140469685 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -18,24 +18,19 @@ # 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 @@ -49,13 +44,6 @@ - openjdk7 - openjdk8 disable_autorelease: True - - beryllium: - branch: 'master' - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - disable_autorelease: False - stable-lithium: branch: 'stable/lithium' jdk: openjdk7 diff --git a/jjb/packetcable/packetcable.cfg b/jjb/packetcable/packetcable.cfg index a668b49a8..633f6d544 100644 --- a/jjb/packetcable/packetcable.cfg +++ b/jjb/packetcable/packetcable.cfg @@ -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 diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index 3240d24b0..5596439ae 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -19,20 +19,20 @@ # 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 @@ -449,7 +449,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/reservation/reservation.cfg b/jjb/reservation/reservation.cfg index 79c61e3f8..b8ef2c800 100644 --- a/jjb/reservation/reservation.cfg +++ b/jjb/reservation/reservation.cfg @@ -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 diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml index 3ca9d2273..fea9ac802 100644 --- a/jjb/reservation/reservation.yaml +++ b/jjb/reservation/reservation.yaml @@ -19,20 +19,20 @@ # 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 @@ -443,7 +443,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.cfg b/jjb/sdninterfaceapp/sdninterfaceapp.cfg index f775f1d53..6142ff99c 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp.cfg +++ b/jjb/sdninterfaceapp/sdninterfaceapp.cfg @@ -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 diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml index b9e5e0bc0..06280081b 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml @@ -19,20 +19,20 @@ # 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 @@ -450,7 +450,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/sfc/sfc.cfg b/jjb/sfc/sfc.cfg index cd467b253..1a95bafaf 100644 --- a/jjb/sfc/sfc.cfg +++ b/jjb/sfc/sfc.cfg @@ -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 diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index db565e791..798e8aa67 100644 --- a/jjb/sfc/sfc.yaml +++ b/jjb/sfc/sfc.yaml @@ -19,20 +19,20 @@ # 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 @@ -449,7 +449,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/snbi/snbi.cfg b/jjb/snbi/snbi.cfg index 8bc031626..b7e79a5d1 100644 --- a/jjb/snbi/snbi.cfg +++ b/jjb/snbi/snbi.cfg @@ -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 diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml index 4cc868353..eb76e666c 100644 --- a/jjb/snbi/snbi.yaml +++ b/jjb/snbi/snbi.yaml @@ -19,20 +19,20 @@ # 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 @@ -449,7 +449,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/snmp/snmp.cfg b/jjb/snmp/snmp.cfg index d9fc66910..4d4eb61a8 100644 --- a/jjb/snmp/snmp.cfg +++ b/jjb/snmp/snmp.cfg @@ -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 diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml index 2dd82b45e..2bec450ad 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -19,20 +19,20 @@ # 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 @@ -444,7 +444,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/snmp4sdn/snmp4sdn.cfg b/jjb/snmp4sdn/snmp4sdn.cfg index 380e40be9..0521834bc 100644 --- a/jjb/snmp4sdn/snmp4sdn.cfg +++ b/jjb/snmp4sdn/snmp4sdn.cfg @@ -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 diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml index 46f2463ed..53ba38d60 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -19,20 +19,20 @@ # 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 @@ -449,7 +449,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/sxp/sxp.cfg b/jjb/sxp/sxp.cfg index d24d1b946..1d41cea5b 100644 --- a/jjb/sxp/sxp.cfg +++ b/jjb/sxp/sxp.cfg @@ -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 diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index 80b088c2c..6559b38dc 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -19,20 +19,20 @@ # 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 @@ -449,7 +449,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/tcpmd5/tcpmd5.cfg b/jjb/tcpmd5/tcpmd5.cfg index bb8847f94..b962bcda3 100644 --- a/jjb/tcpmd5/tcpmd5.cfg +++ b/jjb/tcpmd5/tcpmd5.cfg @@ -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 diff --git a/jjb/tcpmd5/tcpmd5.yaml b/jjb/tcpmd5/tcpmd5.yaml index b5ffe624f..44d4b0658 100644 --- a/jjb/tcpmd5/tcpmd5.yaml +++ b/jjb/tcpmd5/tcpmd5.yaml @@ -19,20 +19,20 @@ # 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 @@ -450,7 +450,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/topoprocessing/topoprocessing.cfg b/jjb/topoprocessing/topoprocessing.cfg index 2a0ce2fce..b52890e6c 100644 --- a/jjb/topoprocessing/topoprocessing.cfg +++ b/jjb/topoprocessing/topoprocessing.cfg @@ -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 diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml index 4e6b3df86..b4feeda58 100644 --- a/jjb/topoprocessing/topoprocessing.yaml +++ b/jjb/topoprocessing/topoprocessing.yaml @@ -19,20 +19,20 @@ # 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 @@ -444,7 +444,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/tsdr/tsdr.cfg b/jjb/tsdr/tsdr.cfg index 7673fa8aa..f43f8264c 100644 --- a/jjb/tsdr/tsdr.cfg +++ b/jjb/tsdr/tsdr.cfg @@ -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 diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index 54fd67871..aab7f9bf4 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -19,20 +19,20 @@ # 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 @@ -443,7 +443,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/ttp/ttp.cfg b/jjb/ttp/ttp.cfg index 8bc031626..b7e79a5d1 100644 --- a/jjb/ttp/ttp.cfg +++ b/jjb/ttp/ttp.cfg @@ -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 diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml index cb4316efa..7c8483c55 100644 --- a/jjb/ttp/ttp.yaml +++ b/jjb/ttp/ttp.yaml @@ -19,20 +19,20 @@ # 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 @@ -449,7 +449,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/unimgr/unimgr.cfg b/jjb/unimgr/unimgr.cfg index d453cedf5..70b07512d 100644 --- a/jjb/unimgr/unimgr.cfg +++ b/jjb/unimgr/unimgr.cfg @@ -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 diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml index 835c7be84..59b99413d 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -19,20 +19,20 @@ # 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' @@ -437,7 +437,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/usc/usc.cfg b/jjb/usc/usc.cfg index 232f9a199..c9f11b823 100644 --- a/jjb/usc/usc.cfg +++ b/jjb/usc/usc.cfg @@ -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 diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index 4c748a904..73885eb16 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -19,20 +19,20 @@ # 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 @@ -444,7 +444,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/usecplugin/usecplugin.cfg b/jjb/usecplugin/usecplugin.cfg index a343f7a9d..ef4b316a2 100644 --- a/jjb/usecplugin/usecplugin.cfg +++ b/jjb/usecplugin/usecplugin.cfg @@ -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 diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml index e24f49bff..1729ed33e 100644 --- a/jjb/usecplugin/usecplugin.yaml +++ b/jjb/usecplugin/usecplugin.yaml @@ -19,20 +19,20 @@ # 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' @@ -437,7 +437,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/vpnservice/vpnservice.cfg b/jjb/vpnservice/vpnservice.cfg index d4b99d835..675f64504 100644 --- a/jjb/vpnservice/vpnservice.cfg +++ b/jjb/vpnservice/vpnservice.cfg @@ -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 diff --git a/jjb/vpnservice/vpnservice.yaml b/jjb/vpnservice/vpnservice.yaml index 487382235..478ff596f 100644 --- a/jjb/vpnservice/vpnservice.yaml +++ b/jjb/vpnservice/vpnservice.yaml @@ -19,20 +19,20 @@ # 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 @@ -443,7 +443,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/vtn/vtn.cfg b/jjb/vtn/vtn.cfg index 402c07859..e94fb565b 100644 --- a/jjb/vtn/vtn.cfg +++ b/jjb/vtn/vtn.cfg @@ -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 diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml index 3e4fb1998..b50e65300 100644 --- a/jjb/vtn/vtn.yaml +++ b/jjb/vtn/vtn.yaml @@ -19,20 +19,20 @@ # 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 @@ -451,7 +451,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/yang-push/yang-push.cfg b/jjb/yang-push/yang-push.cfg index 8053a6653..90638fa47 100644 --- a/jjb/yang-push/yang-push.cfg +++ b/jjb/yang-push/yang-push.cfg @@ -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 diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml index 8767f0bd2..1ebd5ee3b 100644 --- a/jjb/yang-push/yang-push.yaml +++ b/jjb/yang-push/yang-push.yaml @@ -19,20 +19,20 @@ # 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' @@ -437,7 +437,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/jjb/yangtools/yangtools.cfg b/jjb/yangtools/yangtools.cfg index 110ba8d6a..a5ec29a55 100644 --- a/jjb/yangtools/yangtools.cfg +++ b/jjb/yangtools/yangtools.cfg @@ -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 diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml index 5a0507db3..0c24be2cd 100644 --- a/jjb/yangtools/yangtools.yaml +++ b/jjb/yangtools/yangtools.yaml @@ -18,20 +18,20 @@ # 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 @@ -372,7 +372,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'pre-boron' + branch: 'master' wrappers: - build-timeout diff --git a/src/site/markdown/jenkins.markdown b/src/site/markdown/jenkins.markdown index 68f2152c4..4bfdb1c84 100644 --- a/src/site/markdown/jenkins.markdown +++ b/src/site/markdown/jenkins.markdown @@ -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) # Jenkins Master -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. # Build Slaves 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. 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. @@ -263,83 +263,176 @@ slave and start handling jobs on it. # Creating Jenkins Jobs -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 +## Getting Jenkins Job Builder -* [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. -## Jenkins Job Builder Installation +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. +### Installing Jenkins Job Builder - 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. + +#### Virtual Environments + +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: + # 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 + +#### Installing JJB using pip + +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. +#### Installing JJB Manually -### 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 sudo python setup.py install 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. + +### JJB Docker Image + +[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). ## Jenkins Job Templates -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. ## Basic Job Configuration -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/\/\.yaml containing your project's base template. - - python scripts/jjb-init-project.py - - # 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//.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 `.cfg` in your `builder/jjb/` 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 \.yaml. The auto-update script will only search for files with the name \.yaml. The normal \.yaml @@ -566,80 +642,153 @@ wish to run in your project. # Jenkins Sandbox -[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 () 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 +## Configuration -* 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 +() 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 + + [jenkins] + user= + password= + url=https://jenkins.opendaylight.org/sandbox + -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. +## Manual Method -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). + +### Testing Jobs + +It's good practice to use the `test` command to validate your JJB files before +pushing them. jenkins-jobs --conf jenkins.ini test jjb/ - 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 \ 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/ - 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. + +### Pushing Jobs + +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 `` 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/ + +## Docker Method + +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 `` 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 index 000000000..54b001f3f --- /dev/null +++ b/vagrant/ubuntu-mininet-ovs-2.3/Vagrantfile @@ -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 index 000000000..2003384b3 --- /dev/null +++ b/vagrant/ubuntu-mininet-ovs-2.3/bootstrap.sh @@ -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