Merge "Remove project cfg files as they are no longer used"

diff --git a/CONTRIBUTING.markdown b/CONTRIBUTING.markdown
index 9c3b5119f11ff718b8808b86fa964921a2e6f06a..cdfd6a61021b2138f6b38519ff6726c35dba0c3d 100644 (file)
--- a/CONTRIBUTING.markdown
+++ b/CONTRIBUTING.markdown
@@ -1,7 +1,7 @@
 # Contributing to releng/builder
 
 Thank you for your interest in the OpenDaylight project. This is a project repo
-for one of many OpenDaylight projects [1].
+for one of many [OpenDaylight projects][1].
 
 ## How to contribute
 
@@ -12,7 +12,7 @@ submit code to this project.
 
 ## Reporting a Bug
 
-OpenDaylight uses Bugzilla [5] as our issue tracking system and any feature
+OpenDaylight uses [Bugzilla][5] as our issue tracking system and any feature
 requests or bugs should be filed there under the relevant subproject. This
 project is listed under the releng subproject.
 
@@ -20,10 +20,10 @@ project is listed under the releng subproject.
 
 OpenDaylight uses several forms of public communication channels for project
 discussions and planning. Details on how to communicate can be found on our
-wiki here [5].
+[Communications wiki][5].
 
-[1] <https://wiki.opendaylight.org/view/Project_list>
-[2] <https://git.opendaylight.org/gerrit/#/admin/projects/releng/builder>
-[3] <https://wiki.opendaylight.org/view/Submit_a_Patch>
-[4] <https://bugs.opendaylight.org>
-[5] <https://wiki.opendaylight.org/view/Communication>
+[1]: https://wiki.opendaylight.org/view/Project_list
+[2]: https://git.opendaylight.org/gerrit/#/admin/projects/releng/builder
+[3]: https://wiki.opendaylight.org/view/Submit_a_Patch
+[4]: https://bugs.opendaylight.org
+[5]: https://wiki.opendaylight.org/view/Communication

diff --git a/README.markdown b/README.markdown
index 823516f2e081d4b6e4b83d6c5c66760aefa17973..a11c736feed167eb871afaed356c0f77d57b9e12 100644 (file)
--- a/README.markdown
+++ b/README.markdown
@@ -1,4 +1,3 @@
-Documentation for the Releng Builder repo can be found on our site page.
+Documentation for Releng/Builder can be found on our [readthedocs][1] site.
 
-* Main: https://nexus.opendaylight.org/content/sites/site/org.opendaylight.releng.builder/master/
-* Jenkins: https://nexus.opendaylight.org/content/sites/site/org.opendaylight.releng.builder/master/jenkins.html
+[1]: http://docs.opendaylight.org/en/latest/submodules/releng/builder/docs/index.html

diff --git a/jenkins-scripts/robot.sh b/jenkins-scripts/robot.sh
index 064af6e5cfa84647a5d383ee1c5203ccec9ebef7..ecb371cf38610cbb6ec0e81af310e07b04aab642 100755 (executable)
--- a/jenkins-scripts/robot.sh
+++ b/jenkins-scripts/robot.sh
@@ -7,23 +7,12 @@ jenkins     ALL = NOPASSWD: /usr/bin/sshuttle, /usr/bin/kill, /usr/sbin/iptables
 EOF
 
 yum clean all
-yum install -y -q unzip python-netaddr sshuttle @development
-yum remove -y robotframework-{sshlibrary,requests}
+yum install -y -q python-netaddr
 
-# These development packages are needed for successful installation of robotframework-sshlibrary (done elsewhere)
-yum install -y -q libffi-devel openssl-devel
-
-## Install netcat & docker-py
-yum install -y -q nc python-docker-py
-
-# Install dependencies for matplotlib library used in longevity framework
-yum install -y yum-utils
-yum-builddep -y python-matplotlib
+## Install docker-py
+yum install -y -q python-docker-py
 
 # make sure the firewall is stopped
 service iptables stop
 
-# install crudini command line tool for editing config files
-yum install -y crudini
-
 # vim: sw=2 ts=2 sts=2 et :

diff --git a/jenkins-scripts/system_type.sh b/jenkins-scripts/system_type.sh
index 6fa6626b8b380ec822f60ed76efa23b04ed34d49..75ed826619aeb9436af4b4b0fe9961c791bfef38 100755 (executable)
--- a/jenkins-scripts/system_type.sh
+++ b/jenkins-scripts/system_type.sh
@@ -18,7 +18,7 @@ for i in "autorelease,autorelease" \
          "java-builder,builder" \
          "devstack,devstack" \
          "docker,docker" \
-         "gbp-trusty,ubuntu-docker-ovs" \
+         "ubuntu-trusty-gbp,ubuntu-docker-ovs" \
          "matrix,matrix" \
          "robot,robot" \
          "ubuntu-trusty-mininet,mininet-ubuntu"

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 86fb09c3924c598f3eac47b21150164dae0cc3c4..dcf830bfe6cbd36c5af59f989a3cf2391d772814 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -2,15 +2,15 @@
 - project:
     name: aaa
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -39,10 +39,10 @@
             disable_distribution_check: True
 
     project: 'aaa'
+    project-name: 'aaa'
     mvn-settings: 'aaa-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
-

diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml
index 533bd018a96dfff7a867a1244aad7e2ded490622..19cdfa94ac1d41ee829fc80f4a20c81ca9578bee 100644 (file)
--- a/jjb/alto/alto.yaml
+++ b/jjb/alto/alto.yaml
@@ -2,15 +2,15 @@
 - project:
     name: alto
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -39,6 +39,7 @@
             disable_distribution_check: True
 
     project: 'alto'
+    project-name: 'alto'
     mvn-settings: 'alto-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/armoury/armoury.yaml b/jjb/armoury/armoury.yaml
index 0f6aec251841ab54cd6214268e4ed6413a98d3c4..59deaee0229e7671626f7c1546b920cbfa6bb0e4 100644 (file)
--- a/jjb/armoury/armoury.yaml
+++ b/jjb/armoury/armoury.yaml
@@ -2,15 +2,15 @@
 - project:
     name: armoury
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -33,6 +33,7 @@
             disable_distribution_check: False
 
     project: 'armoury'
+    project-name: 'armoury'
     mvn-settings: 'armoury-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'

diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml
index 40e656462ad5c1e56b36ec3e8fd62c95b939e75f..c9fc98c9008b6819e7547271182202914c6f294a 100644 (file)
--- a/jjb/atrium/atrium.yaml
+++ b/jjb/atrium/atrium.yaml
@@ -2,15 +2,15 @@
 - project:
     name: atrium
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -24,6 +24,7 @@
             disable_distribution_check: False
 
     project: 'atrium'
+    project-name: 'atrium'
     mvn-settings: 'atrium-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml
index 467c3399aaa5642098b8d24d97a82a5f5b112d2d..7761c8683d4e86afdb02b1ea6552c175b43eaff7 100644 (file)
--- a/jjb/autorelease/autorelease-version-management.yaml
+++ b/jjb/autorelease/autorelease-version-management.yaml
@@ -1,9 +1,10 @@
 - project:
     name: autorelease-version-management
     jobs:
-        - '{name}-verify-python-{stream}'
+        - '{project-name}-verify-python-{stream}'
 
     project: releng/autorelease
+    project-name: autorelease-version-management
     toxdir: 'scripts/version_management'
 
     stream:

diff --git a/jjb/bgpcep/bgpcep-pcepy.yaml b/jjb/bgpcep/bgpcep-pcepy.yaml
index 4cf2abe27b99faff0a2577a8f96c11b90fc3080f..2bda04a88743ee99f3c10cd3849d6990fe069ec4 100644 (file)
--- a/jjb/bgpcep/bgpcep-pcepy.yaml
+++ b/jjb/bgpcep/bgpcep-pcepy.yaml
@@ -1,7 +1,7 @@
 - project:
     name: bgpcep-pcepy
     jobs:
-        - '{name}-verify-python-{stream}'
+        - '{project-name}-verify-python-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -15,3 +15,4 @@
 
     toxdir: 'pcep/pcepy'
     project: 'bgpcep'
+    project-name: 'bgpcep'

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index c1717047d660ae48f5acac8ad63c3655caf2e4b6..34bad69d8241c9b19a6f9af045799ab0dc92928a 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -2,15 +2,15 @@
 - project:
     name: bgpcep
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -40,6 +40,7 @@
             disable_distribution_check: True
 
     project: 'bgpcep'
+    project-name: 'bgpcep'
     mvn-settings: 'bgpcep-settings'
     mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -47,4 +48,3 @@
     email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
     archive-artifacts: ''
     build-node: centos7-java-builder-4c-8g
-

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index 573554f793e3d29a6d247133830721f47a8fddfb..e329dc2186b5562af31919467b7c56175772ab0a 100644 (file)
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -2,15 +2,15 @@
 - project:
     name: capwap
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -39,6 +39,7 @@
             disable_distribution_check: True
 
     project: 'capwap'
+    project-name: 'capwap'
     mvn-settings: 'capwap-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml
index a807485e122203c3e3b98e7cd5a19a3b012291ed..9087fe6ba669f0e0a6d16ed7af8204a6ecf66a1a 100644 (file)
--- a/jjb/cardinal/cardinal.yaml
+++ b/jjb/cardinal/cardinal.yaml
@@ -2,15 +2,15 @@
 - project:
     name: cardinal
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -24,6 +24,7 @@
             disable_distribution_check: False
 
     project: 'cardinal'
+    project-name: 'cardinal'
     mvn-settings: 'cardinal-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml
index deee3bb3eb0abc4589fa8c5efb356a0da943fca2..1848f4de15e1a48fe8d834dc7204b0beaa788a1f 100644 (file)
--- a/jjb/centinel/centinel.yaml
+++ b/jjb/centinel/centinel.yaml
@@ -2,15 +2,15 @@
 - project:
     name: centinel
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -32,6 +32,7 @@
             disable_distribution_check: False
 
     project: 'centinel'
+    project-name: 'centinel'
     mvn-settings: 'centinel-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 4897e51ebe9dc598ba4f41b3386f9419f2ffb7f8..d0db9b967b83b7b2a5d1cd2fb44b806f6d405881 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -2,15 +2,15 @@
 - project:
     name: controller
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -40,10 +40,10 @@
             disable_distribution_check: True
 
     project: 'controller'
+    project-name: 'controller'
     mvn-settings: 'controller-settings'
     mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
     archive-artifacts: ''
-

diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
index f65ddffe86cef58764f508b54b445f70a5dc3f90..41dfab80d7901db81aa45c43537c1f71dd04e148 100644 (file)
--- a/jjb/coretutorials/coretutorials.yaml
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -2,15 +2,15 @@
 - project:
     name: coretutorials
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -38,6 +38,7 @@
             disable_distribution_check: True
 
     project: 'coretutorials'
+    project-name: 'coretutorials'
     mvn-settings: 'coretutorials-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml
index 9d34068f72e970126f07fb5197634f3ba5dde7b5..de5eedd809917a74b286767118d61df265c3b2d9 100644 (file)
--- a/jjb/didm/didm.yaml
+++ b/jjb/didm/didm.yaml
@@ -2,15 +2,15 @@
 - project:
     name: didm
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -39,6 +39,7 @@
             disable_distribution_check: True
 
     project: 'didm'
+    project-name: 'didm'
     mvn-settings: 'didm-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/discovery/discovery.yaml b/jjb/discovery/discovery.yaml
index 19f0f8e923bbd6666308aa73d201866fba3482af..740974b4fd783359acd6b29691cfbc3efb6d1dc7 100644 (file)
--- a/jjb/discovery/discovery.yaml
+++ b/jjb/discovery/discovery.yaml
@@ -2,15 +2,15 @@
 - project:
     name: discovery
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -31,6 +31,7 @@
             disable_distribution_check: False
 
     project: 'discovery'
+    project-name: 'discovery'
     mvn-settings: 'discovery-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index 00c347a671f58341a67f1143a6c1d40c09475c11..7af8fae0d30d28015e791c4ec1e416352223b08b 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -2,15 +2,15 @@
 - project:
     name: dlux
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -39,10 +39,10 @@
             disable_distribution_check: True
 
     project: 'dlux'
+    project-name: 'dlux'
     mvn-settings: 'dlux-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[dlux] [odlparent]'
     archive-artifacts: ''
-

diff --git a/jjb/docs/docs.yaml b/jjb/docs/docs.yaml
index 649e33f76ec992aaebc31b79fa8a910f3921eddd..4bacef7adbebaf8983e5094eaebb8eb4f848d34c 100644 (file)
--- a/jjb/docs/docs.yaml
+++ b/jjb/docs/docs.yaml
@@ -2,15 +2,15 @@
 - project:
     name: docs
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -39,10 +39,10 @@
             disable_distribution_check: True
 
     project: 'docs'
+    project-name: 'docs'
     mvn-settings: 'docs-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[docs] [odlparent]'
     archive-artifacts: ''
-

diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml
index 71741bb4d56576b6d8f7d0454505bb2776422779..25ca0336e248f093f5c0ac452a4d2467de4abbf6 100644 (file)
--- a/jjb/faas/faas.yaml
+++ b/jjb/faas/faas.yaml
@@ -2,15 +2,15 @@
 - project:
     name: faas
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -32,6 +32,7 @@
             disable_distribution_check: False
 
     project: 'faas'
+    project-name: 'faas'
     mvn-settings: 'faas-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index 6660d50b5980f2fb8deccc5eab8d9abddbbd15f1..4f63a973d37c1d40a7f9ee6ae9d5bb2cadf2bd86 100644 (file)
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -2,15 +2,15 @@
 - project:
     name: genius
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -24,10 +24,10 @@
             disable_distribution_check: False
 
     project: 'genius'
+    project-name: 'genius'
     mvn-settings: 'genius-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream},openflowplugin-merge-{stream},neutron-merge-{stream}'
     email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
     archive-artifacts: ''
-

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index 70138b94e129d2e65fa9add063fa46a3691e4eac..54a5a5882b0da0c06607a1e6e1159966473de1f8 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -2,15 +2,15 @@
 - project:
     name: groupbasedpolicy
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -39,6 +39,7 @@
             disable_distribution_check: True
 
     project: 'groupbasedpolicy'
+    project-name: 'groupbasedpolicy'
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean install findbugs:findbugs -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml
index eab84aa58ae237e7241535c7db8cd350608af719..9e84cdbc2a1907b49ec5a97220832bb533eafc03 100644 (file)
--- a/jjb/honeycomb/vbd/vbd.yaml
+++ b/jjb/honeycomb/vbd/vbd.yaml
@@ -2,15 +2,15 @@
 - project:
     name: vbd
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -24,6 +24,7 @@
             disable_distribution_check: False
 
     project: 'honeycomb/vbd'
+    project-name: 'vbd'
     mvn-settings: 'honeycomb-vbd-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index 6b2c932788913f87515bcd2e58e04eaa5508210f..23fe48ee5b32e19263eaa80b31adf8e119d00e5f 100644 (file)
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -2,15 +2,15 @@
 - project:
     name: infrautils
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -24,10 +24,10 @@
             disable_distribution_check: False
 
     project: 'infrautils'
+    project-name: 'infrautils'
     mvn-settings: 'infrautils-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[infrautils] [odlparent]'
     archive-artifacts: ''
-

diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml
index ab5cbbf626328c963245b077b4cb83bc09009100..fb485683f8ff6eedc9e012d1a3178cc1897d076f 100644 (file)
--- a/jjb/integration/distribution/distribution.yaml
+++ b/jjb/integration/distribution/distribution.yaml
@@ -2,9 +2,9 @@
 - project:
     name: distribution
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -26,6 +26,7 @@
             disable_distribution_check: False
 
     project: 'integration/distribution'
+    project-name: 'distribution'
     mvn-settings: 'integration-distribution-settings'
     mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml
index 3a545608ba6c502a858a9efc428a505b1c5fe782..528c7becb83ec44eaa21f6bcd5ad501af0b9b469 100644 (file)
--- a/jjb/integration/integration-distribution-jobs.yaml
+++ b/jjb/integration/integration-distribution-jobs.yaml
@@ -2,13 +2,14 @@
 - project:
     name: integration-distribution
     jobs:
-        - '{name}-verify-python-{stream}'
+        - '{project-name}-verify-python-{stream}'
         - 'integration-distribution-verify-{stream}'
         - 'integration-distribution-merge-{stream}'
         - 'integration-distribution-deploy-{stream}'
         - 'integration-distribution-offline-{stream}'
 
     project: integration/distribution
+    project-name: integration-distribution
 
     stream:
         - boron:

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index f586efe0cc5162dc43e22644877d54a92162abe3..327257c3f42a3f426946632cc738d505d74fbc4e 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -1,13 +1,14 @@
 - project:
     name: integration-test
     jobs:
-        - '{name}-verify-python-{stream}'
+        - '{project-name}-verify-python-{stream}'
         - 'integration-csit-verify-1node-library'
         - 'integration-distribution-test-{stream}'
         - 'integration-patch-test-{stream}'
         - 'integration-multipatch-test-{stream}'
 
     project: integration/test
+    project-name: integration-test
 
     stream:
         - boron:
@@ -368,7 +369,7 @@
         - maven-target:
             maven-version: '{mvn33}'
             pom: '$GERRIT_PROJECT/pom.xml'
-            goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
+            goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Pq -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
             java-opts:
                 - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
             settings: 'integration-settings'
@@ -448,7 +449,7 @@
         maven-name: '{mvn33}'
         root-pom: 'patch_tester/pom.xml'
         # TODO: Make Maven options configurable. Currently tests are not skipped, everything else is.
-        goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -f patch_tester/pom.xml -V -B -Djenkins -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
+        goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -f patch_tester/pom.xml -V -B -Pq -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
         maven-opts: '-Xmx7168m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
         settings: 'yangtools-settings'
         settings-type: cfp

diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
index 9989c476ab3b0d60601e504d578fcf896db5447f..662e882b01f49c4739066a6ebd985da18aa6865b 100644 (file)
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -2,15 +2,15 @@
 - project:
     name: iotdm
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -40,6 +40,7 @@
             disable_distribution_check: True
 
     project: 'iotdm'
+    project-name: 'iotdm'
     mvn-settings: 'iotdm-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 3e127c2384e143040b55097c50ba0539063cf606..a3dbc37e7a0b323f1d06bd1b534dfaf515b97a95 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -2,15 +2,15 @@
 - project:
     name: l2switch
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -39,10 +39,10 @@
             disable_distribution_check: True
 
     project: 'l2switch'
+    project-name: 'l2switch'
     mvn-settings: 'l2switch-settings'
     mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},openflowjava-merge-{stream},openflowplugin-merge-{stream}'
     email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
     archive-artifacts: ''
-

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index 656883c159748e8153e3b45db86994e9952de6a6..d7a28374e57f7023deaf7bd9e38138bf8f134089 100644 (file)
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -2,15 +2,15 @@
 - project:
     name: lacp
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -39,6 +39,7 @@
             disable_distribution_check: True
 
     project: 'lacp'
+    project-name: 'lacp'
     mvn-settings: 'lacp-settings'
     mvn-goals: 'clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index c8c7f4e6a6c415283b5839356492b48d25f880ae..c11899821bff07dff67f06d568f6075d15b29eb2 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -2,15 +2,15 @@
 - project:
     name: lispflowmapping
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -40,10 +40,11 @@
             disable_distribution_check: True
 
     project: 'lispflowmapping'
+    project-name: 'lispflowmapping'
     mvn-settings: 'lispflowmapping-settings'
     mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
     dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
     email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
     archive-artifacts: ''
-
+    build-node: centos7-java-builder-4c-8g

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 900cc80760786e8e85073bfbf35823f68f8a406d..130f7c6197cf73c29870216b0fea899f4b3c8687 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -2,15 +2,15 @@
 - project:
     name: mdsal
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -32,10 +32,10 @@
             disable_distribution_check: False
 
     project: 'mdsal'
+    project-name: 'mdsal'
     mvn-settings: 'mdsal-settings'
     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-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[mdsal] [odlparent] [yangtools]'
     archive-artifacts: ''
-

diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml
index fb2b9d4be7fc5baaa5199036028adf7124774a82..f40b0d05d7f30ff36d2c479ec1bbc6e8b70c5d1e 100644 (file)
--- a/jjb/messaging4transport/messaging4transport.yaml
+++ b/jjb/messaging4transport/messaging4transport.yaml
@@ -2,15 +2,15 @@
 - project:
     name: messaging4transport
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -32,6 +32,7 @@
             disable_distribution_check: False
 
     project: 'messaging4transport'
+    project-name: 'messaging4transport'
     mvn-settings: 'messaging4transport-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml
index cbbd383bac8e427656d58710bbd6d7b52f1d8acb..0b3ab901e3e94a683d104e01f1b0e7cc0e87b8a5 100644 (file)
--- a/jjb/natapp/natapp.yaml
+++ b/jjb/natapp/natapp.yaml
@@ -2,15 +2,15 @@
 - project:
     name: natapp
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -24,6 +24,7 @@
             disable_distribution_check: False
 
     project: 'natapp'
+    project-name: 'natapp'
     mvn-settings: 'natapp-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml
index cc359dedf17ea84b2cdda4b1ab090507f8f3a99a..a0217157eee7062cc240fc530d5b960a39e363eb 100644 (file)
--- a/jjb/nemo/nemo.yaml
+++ b/jjb/nemo/nemo.yaml
@@ -2,15 +2,15 @@
 - project:
     name: nemo
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -32,6 +32,7 @@
             disable_distribution_check: False
 
     project: 'nemo'
+    project-name: 'nemo'
     mvn-settings: 'nemo-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index 1330226b7fba28c38a79d26025ffe7d519177126..6042928aedbed459778ca3d44326e5630d68481b 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -2,15 +2,15 @@
 - project:
     name: netconf
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -32,10 +32,10 @@
             disable_distribution_check: False
 
     project: 'netconf'
+    project-name: 'netconf'
     mvn-settings: 'netconf-settings'
     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-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
     archive-artifacts: ''
-

diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml
index ca65bdd2ff60098ebabe9a4c0cc63620d33f3c36..618c135eff1783f09a47b10ec129b835ba7cae20 100644 (file)
--- a/jjb/netide/netide.yaml
+++ b/jjb/netide/netide.yaml
@@ -2,15 +2,15 @@
 - project:
     name: netide
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -32,6 +32,7 @@
             disable_distribution_check: False
 
     project: 'netide'
+    project-name: 'netide'
     mvn-settings: 'netide-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml b/jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml
index 03fed3d1ed514252438bdf421cfcb01b150bed5e..73a3b271c92973bb46dc2df11ea755caefd26bbe 100644 (file)
--- a/jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml
@@ -24,7 +24,7 @@
 
     openstack-vms: 3
 
-    install-features: 'odl-netvirt-vpnservice-openstack'
+    install-features: 'odl-netvirt-openstack'
 
     schedule: 'H H * * *'
 

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index 5d1bbe3ca1d8e3834c8f12ae3b944b242fdc7e7c..579e02bdf0568e3fee1cbdb9628c6185d3e58e70 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -2,14 +2,14 @@
 - project:
     name: netvirt
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -38,6 +38,7 @@
             disable_distribution_check: False
 
     project: 'netvirt'
+    project-name: 'netvirt'
     mvn-settings: 'netvirt-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index 5825c5143d886f9206081798619851f1ed04eb5e..ccb7e138ee9c7d59cbb127959fff30815b402a2d 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -2,15 +2,15 @@
 - project:
     name: neutron
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -39,10 +39,10 @@
             disable_distribution_check: True
 
     project: 'neutron'
+    project-name: 'neutron'
     mvn-settings: 'neutron-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[neutron] [odlparent] [aaa]'
     archive-artifacts: ''
-

diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml
index 7778f4c679594e6b9401780d86daa032c48a0213..892f447539aa8a0685a00e635f294e65c913ae77 100644 (file)
--- a/jjb/next/next.yaml
+++ b/jjb/next/next.yaml
@@ -2,15 +2,15 @@
 - project:
     name: next
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -32,6 +32,7 @@
             disable_distribution_check: False
 
     project: 'next'
+    project-name: 'next'
     mvn-settings: 'next-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml
index 22b9033ab2203ce90a7aa64a76a86a841ea70681..d4cacd8c3219b9835d887a15fd2d81d171d7b8c6 100644 (file)
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -2,15 +2,15 @@
 - project:
     name: nic
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -39,6 +39,7 @@
             disable_distribution_check: True
 
     project: 'nic'
+    project-name: 'nic'
     mvn-settings: 'nic-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml
index 34ad50c9fab519eaa9b93470439275e6032e9232..1434ae4e3c5b0374f491bfefb578e4f23ddf5051 100644 (file)
--- a/jjb/ocpplugin/ocpplugin.yaml
+++ b/jjb/ocpplugin/ocpplugin.yaml
@@ -2,15 +2,15 @@
 - project:
     name: ocpplugin
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -24,10 +24,10 @@
             disable_distribution_check: False
 
     project: 'ocpplugin'
+    project-name: 'ocpplugin'
     mvn-settings: 'ocpplugin-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
-

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 2cb555a4599ac167b53fbcfdae25e2a16e640924..be45ebe6198b375e42e61442b14f8d59592c834e 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -1,44 +1,99 @@
 # ODL Releng build templates
 - project:
-    name: odlparent
+    name: odlparent-boron
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdk}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
             disable_autorelease: False
             disable_distribution_check: False
+
+    project: 'odlparent'
+    project-name: 'odlparent'
+    branch: 'master'
+    jdk: openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'odlparent-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[odlparent]'
+    archive-artifacts: ''
+
+- project:
+    name: odlparent-beryllium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdk}'
+
+    # stream:    release stream (eg. stable-lithium or beryllium)
+    # branch:    git branch (eg. stable/lithium or master)
+    stream:
         - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
             disable_autorelease: False
             disable_distribution_check: False
+
+    project: 'odlparent'
+    project-name: 'odlparent'
+    branch: 'stable/beryllium'
+    jdk:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'odlparent-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[odlparent]'
+    archive-artifacts: ''
+
+# ODL Releng build templates
+- project:
+    name: odlparent-lithium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdk}'
+
+    # stream:    release stream (eg. stable-lithium or beryllium)
+    # branch:    git branch (eg. stable/lithium or master)
+    stream:
         - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
             disable_autorelease: True
             disable_distribution_check: True
 
     project: 'odlparent'
+    project-name: 'odlparent'
+    branch: 'stable/lithium'
+    jdk: openjdk7
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
     mvn-settings: 'odlparent-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -46,3 +101,14 @@
     email-upstream: '[odlparent]'
     archive-artifacts: ''
 
+- project:
+    name: odlparent-sonar
+    jobs:
+        - '{project-name}-sonar'
+
+    project: 'odlparent'
+    project-name: 'odlparent'
+    branch: 'master'
+    mvn-settings: 'odlparent-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index 767bacb0b73c8b143887ff3540ab898e8ee4c38b..d3238fa893c69c3e570cf4beb7c58f710b8b1e93 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -2,15 +2,15 @@
 - project:
     name: of-config
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -32,6 +32,7 @@
             disable_distribution_check: False
 
     project: 'of-config'
+    project-name: 'of-config'
     mvn-settings: 'of-config-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml
index aa88491cb7957f888e3113bcd483132413134df0..c05ef165aa0af001a2e54e2ed97124aec82521a4 100644 (file)
--- a/jjb/ofextensions/circuitsw/circuitsw.yaml
+++ b/jjb/ofextensions/circuitsw/circuitsw.yaml
@@ -2,15 +2,15 @@
 - project:
     name: circuitsw
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -32,6 +32,7 @@
             disable_distribution_check: False
 
     project: 'ofextensions/circuitsw'
+    project-name: 'circuitsw'
     mvn-settings: 'ofextensions-circuitsw-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml
index f6955e1a82e2f540514498b360f7aaf82659da8e..8600590c0a0bfdb6c072c5a669e4174ceec6389f 100644 (file)
--- a/jjb/openflowjava/openflowjava.yaml
+++ b/jjb/openflowjava/openflowjava.yaml
@@ -2,15 +2,15 @@
 - project:
     name: openflowjava
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -40,10 +40,10 @@
             disable_distribution_check: True
 
     project: 'openflowjava'
+    project-name: 'openflowjava'
     mvn-settings: 'openflowjava-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
-

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 2a3c12bf43e417dd735047b68f8a9174f5bfee82..efb70ce35fb4a25636e2fceafc9fc17a53d05d7d 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -2,15 +2,15 @@
 - project:
     name: openflowplugin
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -40,10 +40,10 @@
             disable_distribution_check: True
 
     project: 'openflowplugin'
+    project-name: 'openflowplugin'
     mvn-settings: 'openflowplugin-settings'
     mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},openflowjava-merge-{stream}'
     email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
     archive-artifacts: 'model/*/target/site/**'
-

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index edd341d759696fe02de27d28b9ff309d5bc6d9f6..1abb485382314cb6c5cf5fd9f2d18188a76ca536 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -23,6 +23,7 @@
                 - openjdk7
 
     project: 'ovsdb'
+    archive-artifacts: 'docker-ovs-*.log'
 
 - job-template:
     name: 'ovsdb-daily-full-integration-{stream}'
@@ -127,8 +128,7 @@
         - jacoco-nojava-workaround
 
     publishers:
-        - archive:
-            artifacts: 'docker-ovs-*.log'
-            fingerprint: false
         - email-notification:
             email-prefix: '[ovsdb]'
+        - archive-build:
+            maven-version: '{mvn33}'

diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml
index 88a49b24b66adeead328747ca194dd77427dead4..69a08227c8da53701d5d4f21c4d7f5961141b727 100644 (file)
--- a/jjb/ovsdb/ovsdb-sonar.yaml
+++ b/jjb/ovsdb/ovsdb-sonar.yaml
@@ -82,3 +82,5 @@
         - email-notification:
             email-prefix: '[ovsdb]'
         - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index fe8cc4066ea03eeed78b442882e4f1fb26423c19..cecee685296ee252ff4c476b092c142f5a4bb3a1 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -1,44 +1,95 @@
 # ODL Releng build templates
 - project:
-    name: ovsdb
+    name: ovsdb-boron
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
-        - '{name}-verify-{stream}-{maven}-{jdk}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdk}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
             disable_autorelease: False
             disable_distribution_check: False
+
+    project: 'ovsdb'
+    project-name: 'ovsdb'
+    branch: 'master'
+    jdk: openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'ovsdb-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
+    archive-artifacts: ''
+
+- project:
+    name: ovsdb-beryllium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdk}'
+
+    # stream:    release stream (eg. stable-lithium or beryllium)
+    # branch:    git branch (eg. stable/lithium or master)
+    stream:
         - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
             disable_autorelease: False
             disable_distribution_check: False
+
+    project: 'ovsdb'
+    project-name: 'ovsdb'
+    branch: 'stable/beryllium'
+    jdk:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'ovsdb-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
+    archive-artifacts: ''
+
+- project:
+    name: ovsdb-lithium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdk}'
+
+    # stream:    release stream (eg. stable-lithium or beryllium)
+    # branch:    git branch (eg. stable/lithium or master)
+    stream:
         - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
             disable_autorelease: True
             disable_distribution_check: True
 
     project: 'ovsdb'
+    project-name: 'ovsdb'
+    branch: 'stable/lithium'
+    jdk: openjdk7
     maven:
         - mvn33:
             mvn-version: '{mvn33}'

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index fe8a4cc06d31d13214ff0311a179e32a0ff25eba..f3d1a6a6f9e204e59242c3664f101b90ebc8e2be 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -1,10 +1,11 @@
 - project:
     name: packaging
     jobs:
-        - '{name}-verify-python-{stream}'
+        - '{project-name}-verify-python-{stream}'
 
     stream:
         - master:
             branch: 'master'
 
     project: 'integration/packaging'
+    project-name: 'packaging'

diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml
index 8ead4af9d1476734c50730e025c9690cf7e3e3dd..121505fc95d89f3ef722f82b0024cf43c31409ed 100644 (file)
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -2,15 +2,15 @@
 - project:
     name: packetcable
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -39,6 +39,7 @@
             disable_distribution_check: True
 
     project: 'packetcable'
+    project-name: 'packetcable'
     mvn-settings: 'packetcable-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml
index a2c36a84c211d1008b032763106b0aa45bc4c076..fe919d7f53c80e4fcd8a93173e9ec15a2964d9d2 100644 (file)
--- a/jjb/persistence/persistence.yaml
+++ b/jjb/persistence/persistence.yaml
@@ -2,15 +2,15 @@
 - project:
     name: persistence
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -41,6 +41,7 @@
             disable_distribution_check: True
 
     project: 'persistence'
+    project-name: 'persistence'
     mvn-settings: 'persistence-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index b58714f6e96141e8de713d93583eea2dc4a95acb..eb563f803dd59a6115ffb29d9532ed38265bb4ae 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -61,7 +61,7 @@
         - shell: |
             pip freeze
             python scripts/jjb-autoupdate-project.py
-            jenkins-jobs test --recursive -o archives/job_output jjb/
+            jenkins-jobs -l DEBUG test --recursive -o archives/job_output jjb/
             gzip archives/job_output/*
 
         - releng-check-unicode

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 6c70f7c729141fef0d9af210e9be2a9f59508dea..257a9a3cf6e2a012eae672d6c6023f4a727d8490 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -6,7 +6,7 @@
     #   {mvn-settings} - Project maven settings file
     #   {stream}
     #   {jdk}
-    name: '{name}-clm-{stream}'
+    name: '{project-name}-clm-{stream}'
 
     project-type: maven
     node: '{build-node}'
@@ -53,16 +53,16 @@
     postbuilders:
         - shell: 'find . -regex ".*karaf/target" | xargs rm -rf'
         - check-clm:
-            application-name: '{name}'
+            application-name: '{project-name}'
 
     publishers:
         - email-notification:
-            email-prefix: '[{name}]'
+            email-prefix: '[{project-name}]'
         - archive-build:
             maven-version: '{mvn33}'
 
 - job-template:
-    name: '{name}-distribution-{stream}'
+    name: '{project-name}-distribution-{stream}'
 
     # Required variables:
     #     stream:    release stream (eg. stable-lithium or beryllium)
@@ -130,7 +130,7 @@
     # Operation: This job template builds a patch, creates a distribution containing
     #            the patch, and triggers the distribution deploy test
 
-    name: '{name}-distribution-check-{stream}'
+    name: '{project-name}-distribution-check-{stream}'
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
@@ -181,7 +181,7 @@
                     comment-contains-value: 'recheck'
             projects:
               - project-compare-type: 'ANT'
-                project-pattern: '{name}'
+                project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
@@ -220,7 +220,7 @@
 
     publishers:
         - email-notification:
-            email-prefix: '[{name}]'
+            email-prefix: '[{project-name}]'
         - postbuildscript:
             builders:
                 - shell: |
@@ -234,7 +234,7 @@
             maven-version: '{mvn33}'
 
 - job-template:
-    name: '{name}-integration-{stream}'
+    name: '{project-name}-integration-{stream}'
 
     # Job template for ODL integration verify jobs
     #
@@ -303,7 +303,7 @@
             maven-version: '{mvn33}'
 
 - job-template:
-    name: '{name}-merge-{stream}'
+    name: '{project-name}-merge-{stream}'
 
     # Job template for ODL merge jobs
     #
@@ -401,7 +401,7 @@
 
     publishers:
         - email-notification:
-            email-prefix: '[{name}]'
+            email-prefix: '[{project-name}]'
         - maven-deploy:
             id: ''
             unique-version: true
@@ -411,7 +411,7 @@
             maven-version: '{mvn33}'
 
 - job-template:
-    name: '{name}-periodic-{stream}'
+    name: '{project-name}-periodic-{stream}'
 
     # Job template for periodic builders
     #
@@ -468,13 +468,13 @@
 
     publishers:
         - email-notification:
-            email-prefix: '[{name}]'
+            email-prefix: '[{project-name}]'
         - jacoco-report
         - archive-build:
             maven-version: '{mvn33}'
 
 - job-template:
-    name: '{name}-sonar'
+    name: '{project-name}-sonar'
     disabled: false
 
     project-type: maven
@@ -531,13 +531,13 @@
             language: 'java'
             maven-opts: '-Xmx6144m -XX:MaxPermSize=1024m'
         - email-notification:
-            email-prefix: '[{name}]'
+            email-prefix: '[{project-name}]'
         - jacoco-report
         - archive-build:
             maven-version: '{mvn33}'
 
 - job-template:
-    name: '{name}-validate-autorelease-{stream}'
+    name: '{project-name}-validate-autorelease-{stream}'
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
@@ -639,12 +639,12 @@
 
     publishers:
         - email-notification:
-            email-prefix: '[autorelease] [{name}]'
+            email-prefix: '[autorelease] [{project-name}]'
         - archive-build:
             maven-version: '{mvn33}'
 
 - job-template:
-    name: '{name}-verify-{stream}'
+    name: '{project-name}-verify-{stream}'
 
     # Job template for ODL verify jobs
     #
@@ -710,13 +710,13 @@
     publishers:
         - findbugs
         - email-notification:
-            email-prefix: '[{name}]'
+            email-prefix: '[{project-name}]'
         - jacoco-report
         - archive-build:
             maven-version: '{mvn33}'
 
 - job-template:
-    name: '{name}-verify-{stream}-{maven}-{jdk}'
+    name: '{project-name}-verify-{stream}-{maven}-{jdk}'
 
     # Job template for ODL verify jobs
     #
@@ -773,7 +773,7 @@
     publishers:
         - findbugs
         - email-notification:
-            email-prefix: '[{name}]'
+            email-prefix: '[{project-name}]'
         - jacoco-report
         - archive-build:
             maven-version: '{mvn-version}'

diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml
index e5f611a2618658f6800606bea8eff07805eef8d6..ed4f704452e77d78a47dfab2bb510a19fdbcaa64 100644 (file)
--- a/jjb/releng-templates.yaml
+++ b/jjb/releng-templates.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{name}-release-java'
+    name: '{project-name}-release-java'
 
     # Job template for producing a release candidate by creating a staging repo
     # in Nexus.
@@ -62,7 +62,7 @@
 
 
 - job-template:
-    name: '{name}-publish-p2repo'
+    name: '{project-name}-publish-p2repo'
 
     # Job template for publishing a p2 repo given a URL to a zipped p2repo.
 
@@ -112,7 +112,7 @@
 # Python Related
 
 - job-template:
-    name: '{name}-verify-python-{stream}'
+    name: '{project-name}-verify-python-{stream}'
 
     # Job template for python verify jobs
     #
@@ -195,7 +195,7 @@
             email-prefix: '[{project}]'
 
 - job-template:
-    name: '{name}-merge-rtd-{stream}'
+    name: '{project-name}-merge-rtd-{stream}'
     # Template for ReadTheDocs triggering
 
     project-type: freestyle
@@ -229,7 +229,7 @@
 # Node related
 
 - job-template:
-    name: '{name}-verify-node-{stream}'
+    name: '{project-name}-verify-node-{stream}'
 
     # Job template for python verify jobs
     #

diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml
index f099f2e748516f9a6f69da85b1754e4859aa348f..9a4e44defd95f5d2ba4eafc68aa89f7ff5b745af 100644 (file)
--- a/jjb/reservation/reservation.yaml
+++ b/jjb/reservation/reservation.yaml
@@ -2,15 +2,15 @@
 - project:
     name: reservation
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -39,6 +39,7 @@
             disable_distribution_check: True
 
     project: 'reservation'
+    project-name: 'reservation'
     mvn-settings: 'reservation-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
index 1f69048d8e49c593484f78f9af260e3e4a75b15c..1417bd3e702a5de1f32037156dfd3e50b90a0f23 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
@@ -2,15 +2,15 @@
 - project:
     name: sdninterfaceapp
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -40,6 +40,7 @@
             disable_distribution_check: True
 
     project: 'sdninterfaceapp'
+    project-name: 'sdninterfaceapp'
     mvn-settings: 'sdninterfaceapp-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index cab5eec62212e365793af4b7dfcc8b65190977d5..30d549c21eca5a51d7bc4e4106991672d6f5b7ff 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -2,15 +2,15 @@
 - project:
     name: sfc
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -39,6 +39,7 @@
             disable_distribution_check: True
 
     project: 'sfc'
+    project-name: 'sfc'
     mvn-settings: 'sfc-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'

diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml
index 4137a0b0750466297b1feeb1f5c230a2e739b639..0546f0ef92e234ddd3be5724499724c7515e0efb 100644 (file)
--- a/jjb/snbi/snbi.yaml
+++ b/jjb/snbi/snbi.yaml
@@ -2,15 +2,15 @@
 - project:
     name: snbi
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -39,6 +39,7 @@
             disable_distribution_check: True
 
     project: 'snbi'
+    project-name: 'snbi'
     mvn-settings: 'snbi-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml
index a49d191c447c6f671300bb1588198e70819f4feb..68ad25340041a760f6ec077f1265b108138d2168 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -2,15 +2,15 @@
 - project:
     name: snmp
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -40,10 +40,10 @@
             disable_distribution_check: True
 
     project: 'snmp'
+    project-name: 'snmp'
     mvn-settings: 'snmp-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[snmp] [odlparent]'
     archive-artifacts: ''
-

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index c2928e998e7ee2af3e43db6171acb9192ea5c886..09329d917512d8312b22d54d8d8b8fc9916e1a19 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -2,15 +2,15 @@
 - project:
     name: snmp4sdn
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -39,10 +39,10 @@
             disable_distribution_check: True
 
     project: 'snmp4sdn'
+    project-name: 'snmp4sdn'
     mvn-settings: 'snmp4sdn-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
-

diff --git a/jjb/spectrometer/spectrometer-jobs.yaml b/jjb/spectrometer/spectrometer-jobs.yaml
index 880c616b8997b7bbd89d1342d8e370bedacdb8f4..25ab3402eec8fd04b14fbb28019fa0bedeecb9af 100644 (file)
--- a/jjb/spectrometer/spectrometer-jobs.yaml
+++ b/jjb/spectrometer/spectrometer-jobs.yaml
@@ -1,15 +1,16 @@
 - project:
     name: spectrometer
     jobs:
-        - '{name}-merge-rtd-{stream}'
-        - '{name}-verify-node-{stream}'
-        - '{name}-verify-python-{stream}'
+        - '{project-name}-merge-rtd-{stream}'
+        - '{project-name}-verify-node-{stream}'
+        - '{project-name}-verify-python-{stream}'
 
     stream:
         - master:
             branch: 'master'
 
     project: 'spectrometer'
+    project-name: 'spectrometer'
     rtdproject: 'opendaylight-spectrometer'
     toxdir: server
     nodedir: web

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index c124c600cb859ad11cc2b54cdd3768e1a7c027e8..542ab5ced5172cb064efe9d54b2dbaa05f6d64ce 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -2,15 +2,15 @@
 - project:
     name: sxp
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -39,10 +39,10 @@
             disable_distribution_check: True
 
     project: 'sxp'
+    project-name: 'sxp'
     mvn-settings: 'sxp-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
-

diff --git a/jjb/tcpmd5/tcpmd5.yaml b/jjb/tcpmd5/tcpmd5.yaml
index e1d5426739486d4601686b78b398563531213582..fd08a31ee2a4349930a5daf50715d7d1e07b0fe2 100644 (file)
--- a/jjb/tcpmd5/tcpmd5.yaml
+++ b/jjb/tcpmd5/tcpmd5.yaml
@@ -2,15 +2,15 @@
 - project:
     name: tcpmd5
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -40,10 +40,10 @@
             disable_distribution_check: True
 
     project: 'tcpmd5'
+    project-name: 'tcpmd5'
     mvn-settings: 'tcpmd5-settings'
     mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[tcpmd5] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
-

diff --git a/jjb/toolkit/toolkit.yaml b/jjb/toolkit/toolkit.yaml
index 103bd1505d72f248c845a24280f20a0aa3e687c5..cd8792745ec8ca943d97d45f130f8c5e45531e9a 100644 (file)
--- a/jjb/toolkit/toolkit.yaml
+++ b/jjb/toolkit/toolkit.yaml
@@ -2,15 +2,15 @@
 - project:
     name: toolkit
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -31,6 +31,7 @@
             disable_distribution_check: False
 
     project: 'toolkit'
+    project-name: 'toolkit'
     mvn-settings: 'toolkit-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml
index d40095d740400a6f837051aaf0accd9fb29a1cfd..c701e3a47440b5b9e255f3347fe664efe9dce987 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.yaml
+++ b/jjb/topoprocessing/topoprocessing.yaml
@@ -2,15 +2,15 @@
 - project:
     name: topoprocessing
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -40,10 +40,10 @@
             disable_distribution_check: True
 
     project: 'topoprocessing'
+    project-name: 'topoprocessing'
     mvn-settings: 'topoprocessing-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
-

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index e6340fa1c7cec83ea45e28c85c32aec3d985be38..bbbb7dac6e7005de4f2dd5ecba8dc7f4099cbd63 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -2,15 +2,15 @@
 - project:
     name: tsdr
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -39,6 +39,7 @@
             disable_distribution_check: True
 
     project: 'tsdr'
+    project-name: 'tsdr'
     mvn-settings: 'tsdr-settings'
     mvn-goals: 'clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml
index 845b56d8948610ce66d174dfcb2e4ab6d941cb79..a4bd850c19f6a99af8ad2e6ff5ce4ee0f6f99e3d 100644 (file)
--- a/jjb/ttp/ttp.yaml
+++ b/jjb/ttp/ttp.yaml
@@ -2,15 +2,15 @@
 - project:
     name: ttp
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -39,10 +39,10 @@
             disable_distribution_check: True
 
     project: 'ttp'
+    project-name: 'ttp'
     mvn-settings: 'ttp-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[ttp] [odlparent]'
     archive-artifacts: ''
-

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index 9bb857b8bc54b470b6d4f11837d193272691a199..b0258563d472b1590471b8f041d74bc6a2f56354 100644 (file)
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -2,15 +2,15 @@
 - project:
     name: unimgr
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -32,6 +32,7 @@
             disable_distribution_check: False
 
     project: 'unimgr'
+    project-name: 'unimgr'
     mvn-settings: 'unimgr-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index 5809913d28ce2afa451607b86b1aaa66136d1ece..5bfd6d22cf4489739bfa9a1007ff36212e9c3ad6 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -2,15 +2,15 @@
 - project:
     name: usc
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -40,10 +40,10 @@
             disable_distribution_check: True
 
     project: 'usc'
+    project-name: 'usc'
     mvn-settings: 'usc-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
     email-upstream: '[usc] [controller] [yangtools] [odlparent]'
     archive-artifacts: ''
-

diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml
index 464327141d2c5dadd98c7a0205aec33be6f25944..b7c58136cbbcd01c8bf4f886b7847f2b41af0725 100644 (file)
--- a/jjb/usecplugin/usecplugin.yaml
+++ b/jjb/usecplugin/usecplugin.yaml
@@ -2,15 +2,15 @@
 - project:
     name: usecplugin
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -32,6 +32,7 @@
             disable_distribution_check: False
 
     project: 'usecplugin'
+    project-name: 'usecplugin'
     mvn-settings: 'usecplugin-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/vpnservice/vpnservice.yaml b/jjb/vpnservice/vpnservice.yaml
index 4f4d010cde91cc4a2850e50aa58621df52f9c418..fdb3b257fec8455125cb9420bdb9bcd408592f59 100644 (file)
--- a/jjb/vpnservice/vpnservice.yaml
+++ b/jjb/vpnservice/vpnservice.yaml
@@ -2,15 +2,15 @@
 - project:
     name: vpnservice
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -39,6 +39,7 @@
             disable_distribution_check: True
 
     project: 'vpnservice'
+    project-name: 'vpnservice'
     mvn-settings: 'vpnservice-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index 79b96160316f015a81b8fb821cdf27c9b85d2a40..3a0fe5d7d6307450b9339d696f43ad73b50603c3 100644 (file)
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -2,15 +2,15 @@
 - project:
     name: vtn
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -39,6 +39,7 @@
             disable_distribution_check: True
 
     project: 'vtn'
+    project-name: 'vtn'
     mvn-settings: 'vtn-settings'
     mvn-goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2 -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml
index beef82c0eac9e95d5e7c1e1735162be1be16749e..710b95d6f811acc064153eee5931bdb86d74a7b1 100644 (file)
--- a/jjb/yang-push/yang-push.yaml
+++ b/jjb/yang-push/yang-push.yaml
@@ -2,15 +2,15 @@
 - project:
     name: yang-push
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -32,6 +32,7 @@
             disable_distribution_check: False
 
     project: 'yang-push'
+    project-name: 'yang-push'
     mvn-settings: 'yang-push-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/yangide/yangide-releng.yaml b/jjb/yangide/yangide-releng.yaml
index 45e19b69ece705ceff3aa346fae2ea6d5afd3f97..8ff99afac56fa66a974a2577e57a787df9eb36fe 100644 (file)
--- a/jjb/yangide/yangide-releng.yaml
+++ b/jjb/yangide/yangide-releng.yaml
@@ -1,10 +1,11 @@
 - project:
     name: yangide-releng
     jobs:
-    - '{name}-publish-p2repo'
-    - '{name}-release-java'
+    - '{project-name}-publish-p2repo'
+    - '{project-name}-release-java'
 
     project: yangide
+    project-name: 'yangide'
     jdk: 'openjdk8'
     stage-id: 'fba306956f98'
     project-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1448465159080'

diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml
index 9629e40bd88f65ce4604c3db2e104ab2ee731993..9c7fda3f641efd37524372e6cf301dc4656c31f8 100644 (file)
--- a/jjb/yangide/yangide.yaml
+++ b/jjb/yangide/yangide.yaml
@@ -2,15 +2,15 @@
 - project:
     name: yangide
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -24,10 +24,10 @@
             disable_distribution_check: True
 
     project: 'yangide'
+    project-name: 'yangide'
     mvn-settings: 'yangide-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[yangide] [odlparent] [yangtools]'
     archive-artifacts: ''
-

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 7f8a882a4dfda32847158d00f83ab7055f1dfcf6..6c70e74b4f71dcd432fd370b427c4626c8056ab8 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -2,14 +2,14 @@
 - project:
     name: yangtools
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -39,6 +39,7 @@
             disable_distribution_check: True
 
     project: 'yangtools'
+    project-name: 'yangtools'
     mvn-settings: 'yangtools-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/packer/README.markdown b/packer/README.markdown
new file mode 100644 (file)
index 0000000..fef4cea
--- /dev/null
+++ b/packer/README.markdown
@@ -0,0 +1,38 @@
+# OpenDaylight CI Packer
+
+[Packer][1] is a tool for automatically creating VM and container images,
+configuring them and post-processing them into standard output formats.
+
+We build OpenDaylight's CI images via Packer.
+
+## Building
+
+You'll need to [install Packer][2], of course.
+
+OpenDaylight's Packer configuration is divided into build-specific variables,
+output-specific templates and a set of shared provisioning scripts. To do a
+specific build, combine the template for the desired output artifact type with
+a variable file. To build a new java-builder instance the following would be done:
+
+```
+packer build -var-file=vars/cloud-env.json -var-file/centos.json templates/java-builder.json
+```
+
+**NOTE:** vars/cloud-env.json is a gitignored file as it contains private
+information. There is a vars/cloud-env.json.example file that may be used as a
+base for creating the one needed.
+
+This would build bootable image in two different OpenStack clouds. In specific,
+Rackspace's Public cloud and a private OpenStack cloud.
+
+From a high level, the builds:
+
+* Boot a specified base image in both clouds.
+* Run a set of shell scripts, listed in the template's shell provisioner
+  section, to do any configuration required by the builder.
+* Execute a shutdown of the running instance in the clouds.
+* Execute a 'nova image-create' operation against the shutdown instance.
+* Perform a 'nova delete' operation against the shutdown instance.
+
+[1]: https://www.packer.io/
+[2]: https://www.packer.io/intro/getting-started/setup.html

diff --git a/vagrant/lib/baseline.sh b/packer/provision/baseline.sh
similarity index 97%
rename from vagrant/lib/baseline.sh
rename to packer/provision/baseline.sh
index 2cf8c8b3b11b6adefe56812bd0cc877696276975..ee87f00559b102bf8fd2b02e863a15e676538321 100644 (file)
--- a/vagrant/lib/baseline.sh
+++ b/packer/provision/baseline.sh
@@ -46,6 +46,7 @@ EOF
 
     echo "---> Updating operating system"
     yum clean all -q
+    yum install -y -q deltarpm
     yum update -y -q
 
     # add in components we need or want on systems
@@ -165,10 +166,16 @@ all_systems() {
 
 echo "---> Attempting to detect OS"
 # upstream cloud images use the distro name as the initial user
-ORIGIN=$(logname)
+ORIGIN=$(if [ -e /etc/redhat-release ]
+    then
+        echo redhat
+    else
+        echo ubuntu
+    fi)
+#ORIGIN=$(logname)
 
 case "${ORIGIN}" in
-    fedora|centos)
+    fedora|centos|redhat)
         echo "---> RH type system detected"
         rh_systems
     ;;

diff --git a/vagrant/ovsdb-devstack/bootstrap.sh b/packer/provision/devstack.sh
similarity index 100%
rename from vagrant/ovsdb-devstack/bootstrap.sh
rename to packer/provision/devstack.sh

diff --git a/vagrant/docker/bootstrap.sh b/packer/provision/docker.sh
similarity index 100%
rename from vagrant/docker/bootstrap.sh
rename to packer/provision/docker.sh

diff --git a/vagrant/gbp-ubuntu-docker-ovs-node/bootstrap.sh b/packer/provision/gbp.sh
similarity index 93%
rename from vagrant/gbp-ubuntu-docker-ovs-node/bootstrap.sh
rename to packer/provision/gbp.sh
index 2b880b73ef9f193237bf4495e538ea54ee171b71..dc461c94ccdb12f73c46f3978897dd5d584ec986 100644 (file)
--- a/vagrant/gbp-ubuntu-docker-ovs-node/bootstrap.sh
+++ b/packer/provision/gbp.sh
@@ -13,7 +13,7 @@ puppet module install garethr-docker --version 4.1.1
 # do the package install via puppet so that we know it actually installs
 # properly and it also makes it quieter but with better error reporting
 echo "---> Installing Group Based Policy requirements"
-puppet apply /vagrant/gbp_packages.pp
+puppet apply /tmp/packer/gbp_packages.pp
 
 # configure docker networking so that it does not conflict with LF internal networks
 # configure docker daemon to listen on port 5555 enabling remote managment
@@ -26,7 +26,7 @@ EOL
 
 # docker
 echo "---> Installing docker"
-puppet apply /vagrant/docker_setup.pp
+puppet apply /tmp/packer/docker_setup.pp
 
 echo "---> stopping docker"
 puppet apply -e "service { 'docker': ensure => stopped }"
@@ -37,7 +37,7 @@ rm -f /var/lib/docker/repositories-aufs /etc/docker/key.json
 # OVS
 echo "---> Installing ovs"
 puppet module install puppetlabs-vcsrepo
-puppet apply /vagrant/ovs_setup.pp
+puppet apply /tmp/packer/ovs_setup.pp
 
 pushd /root/ovs
 DEB_BUILD_OPTIONS='parallel=8 nocheck' fakeroot debian/rules binary | \

diff --git a/vagrant/gbp-ubuntu-docker-ovs-node/docker_setup.pp b/packer/provision/gbp_puppet/docker_setup.pp
similarity index 100%
rename from vagrant/gbp-ubuntu-docker-ovs-node/docker_setup.pp
rename to packer/provision/gbp_puppet/docker_setup.pp

diff --git a/vagrant/gbp-ubuntu-docker-ovs-node/gbp_packages.pp b/packer/provision/gbp_puppet/gbp_packages.pp
similarity index 100%
rename from vagrant/gbp-ubuntu-docker-ovs-node/gbp_packages.pp
rename to packer/provision/gbp_puppet/gbp_packages.pp

diff --git a/vagrant/gbp-ubuntu-docker-ovs-node/ovs_setup.pp b/packer/provision/gbp_puppet/ovs_setup.pp
similarity index 100%
rename from vagrant/gbp-ubuntu-docker-ovs-node/ovs_setup.pp
rename to packer/provision/gbp_puppet/ovs_setup.pp

diff --git a/vagrant/basic-builder/bootstrap.sh b/packer/provision/java-builder.sh
similarity index 100%
rename from vagrant/basic-builder/bootstrap.sh
rename to packer/provision/java-builder.sh

diff --git a/vagrant/ubuntu-mininet-ovs-2.3/bootstrap.sh b/packer/provision/mininet-ovs-2.3.sh
similarity index 100%
rename from vagrant/ubuntu-mininet-ovs-2.3/bootstrap.sh
rename to packer/provision/mininet-ovs-2.3.sh

diff --git a/vagrant/ubuntu-mininet/bootstrap.sh b/packer/provision/mininet.sh
similarity index 100%
rename from vagrant/ubuntu-mininet/bootstrap.sh
rename to packer/provision/mininet.sh

diff --git a/packer/provision/null_data.sh b/packer/provision/null_data.sh
new file mode 100644 (file)
index 0000000..3fa6a3c
--- /dev/null
+++ b/packer/provision/null_data.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+# vi: ts=4 sw=4 sts=4 et :
+
+# Nothing to do for Ubuntu specific provisioning

diff --git a/packer/provision/rh-user_data.sh b/packer/provision/rh-user_data.sh
new file mode 100644 (file)
index 0000000..6bddb24
--- /dev/null
+++ b/packer/provision/rh-user_data.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+# vi: ts=4 sw=4 sts=4 et :
+
+/bin/sed -i 's/ requiretty/ !requiretty/' /etc/sudoers;

diff --git a/vagrant/integration-robotframework/bootstrap.sh b/packer/provision/robot.sh
similarity index 60%
rename from vagrant/integration-robotframework/bootstrap.sh
rename to packer/provision/robot.sh
index 90b4e068e91773e517b87bb037f3c7be33e7a0eb..441b0104784eb9a9e07f920d9c4f4c9f44e74e11 100644 (file)
--- a/vagrant/integration-robotframework/bootstrap.sh
+++ b/packer/provision/robot.sh
@@ -5,10 +5,20 @@
 # Install minimal python requirements to get virtualenv going
 # Additional python dependencies should be installed via JJB configuration
 # inside project jobs using a virtualenv setup.
-yum install -q -y python-{devel,setuptools,virtualenv}
+yum install -q -y python-{devel,setuptools,virtualenv} @development
+
+# Install dependencies for robotframework and robotframework-sshlibrary
+# installed elsewhere
+yum install -y -q yum-utils unzip sshuttle nc libffi-devel openssl-devel
+
+# Install dependencies for matplotlib library used in longevity framework
+yum-builddep -y python-matplotlib
+
+# install crudini command line tool for editing config files
+yum install -y -q crudini
 
 # Install `udpreplay` to be used for (lispflowmapping) performance tests
-yum install -q -y @development libpcap-devel boost-devel
+yum install -q -y libpcap-devel boost-devel
 git clone -q https://github.com/ska-sa/udpreplay.git
 cd udpreplay
 make &> /dev/null && cp udpreplay /usr/local/bin

diff --git a/packer/provision/system_reseal.sh b/packer/provision/system_reseal.sh
new file mode 100644 (file)
index 0000000..f8bc7dc
--- /dev/null
+++ b/packer/provision/system_reseal.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+# vim: sw=2 ts=2 sts=2 et :
+
+rm -rf /etc/Pegasus/*.cnf /etc/Pegasus/*.crt /etc/Pegasus/*.csr \
+  /etc/Pegasus/*.pem /etc/Pegasus/*.srl /root/anaconda-ks.cfg \
+  /root/anaconda-post.log /root/initial-setup-ks.cfg /root/install.log \
+  /root/install.log.syslog /var/cache/fontconfig/* /var/cache/gdm/* \
+  /var/cache/man/* /var/lib/AccountService/users/* /var/lib/fprint/* \
+  /var/lib/logrotate.status /var/log/*.log* /var/log/BackupPC/LOG \
+  /var/log/ConsoleKit/* /var/log/anaconda.syslog /var/log/anaconda/* \
+  /var/log/apache2/*_log /var/log/apache2/*_log-* /var/log/apt/* \
+  /var/log/aptitude* /var/log/audit/* /var/log/btmp* /var/log/ceph/*.log \
+  /var/log/chrony/*.log /var/log/cron* /var/log/cups/*_log /var/log/debug* \
+  /var/log/dmesg* /var/log/exim4/* /var/log/faillog* /var/log/gdm/* \
+  /var/log/glusterfs/*glusterd.vol.log /var/log/glusterfs/glusterfs.log \
+  /var/log/httpd/*log /var/log/installer/* /var/log/jetty/jetty-console.log \
+  /var/log/journal/* /var/log/lastlog* /var/log/libvirt/libvirtd.log \
+  /var/log/libvirt/lxc/*.log /var/log/libvirt/qemu/*.log \
+  /var/log/libvirt/uml/*.log /var/log/lightdm/* /var/log/mail/* \
+  /var/log/maillog* /var/log/messages* /var/log/ntp /var/log/ntpstats/* \
+  /var/log/ppp/connect-errors /var/log/rhsm/* /var/log/sa/* /var/log/secure* \
+  /var/log/setroubleshoot/*.log /var/log/spooler* /var/log/squid/*.log \
+  /var/log/syslog* /var/log/tallylog* /var/log/tuned/tuned.log /var/log/wtmp* \
+  /var/named/data/named.run
+
+rm -rf ~/.viminfo /etc/ssh/ssh*key* /root/.ssh/*
+
+# kill any cloud-init related bits
+rm -rf /var/lib/cloud/*
+
+# clean-up any manual packer uploads
+rm -rf /tmp/packer
+
+# Force a system sync and sleep to get around any SSD issues
+echo "Forcing sync and sleep for 10sec"
+sync
+sleep 10

diff --git a/packer/templates/baseline.json b/packer/templates/baseline.json
new file mode 100644 (file)
index 0000000..d0d304f
--- /dev/null
+++ b/packer/templates/baseline.json
@@ -0,0 +1,67 @@
+{
+  "variables": {
+    "public_base_image": null,
+    "public_network": null,
+    "public_cloud_user": null,
+    "public_auth_url": null,
+    "public_tenant": null,
+    "public_user": null,
+    "public_pass": null,
+
+    "private_base_image": null,
+    "private_network": null,
+    "private_cloud_user": null,
+    "private_auth_url": null,
+    "private_tenant": null,
+    "private_user": null,
+    "private_pass": null,
+
+    "distro": null,
+    "cloud_user_data": null
+  },
+  "builders": [
+    {
+      "type": "openstack",
+      "name": "public_cloud",
+      "identity_endpoint": "{{user `public_auth_url`}}",
+      "tenant_name": "{{user `public_tenant`}}",
+      "username": "{{user `public_user`}}",
+      "password": "{{user `public_pass`}}",
+      "region": "DFW",
+      "ssh_username": "{{user `public_cloud_user`}}",
+      "image_name": "{{user `distro`}} - baseline - {{isotime \"20060102-1504\"}}",
+      "source_image_name": "{{user `public_base_image`}}",
+      "flavor": "general1-1",
+      "networks": [
+        "{{user `public_network`}}"
+      ],
+      "user_data_file": "{{user `cloud_user_data`}}"
+    },
+    {
+      "type": "openstack",
+      "name": "private_cloud",
+      "identity_endpoint": "{{user `private_auth_url`}}",
+      "tenant_name": "{{user `private_tenant`}}",
+      "username": "{{user `private_user`}}",
+      "password": "{{user `private_pass`}}",
+      "ssh_username": "{{user `private_cloud_user`}}",
+      "image_name": "{{user `distro`}} - baseline - {{isotime \"20060102-1504\"}}",
+      "source_image_name": "{{user `private_base_image`}}",
+      "flavor": "general1-1",
+      "networks": [
+        "{{user `private_network`}}"
+      ],
+      "user_data_file": "{{user `cloud_user_data`}}"
+    }
+  ],
+  "provisioners": [
+    {
+      "type": "shell",
+      "scripts": [
+        "provision/baseline.sh",
+        "provision/system_reseal.sh"
+      ],
+      "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
+    }
+  ]
+}

diff --git a/packer/templates/devstack.json b/packer/templates/devstack.json
new file mode 100644 (file)
index 0000000..18fdfd0
--- /dev/null
+++ b/packer/templates/devstack.json
@@ -0,0 +1,68 @@
+{
+  "variables": {
+    "public_base_image": null,
+    "public_network": null,
+    "public_cloud_user": null,
+    "public_auth_url": null,
+    "public_tenant": null,
+    "public_user": null,
+    "public_pass": null,
+
+    "private_base_image": null,
+    "private_network": null,
+    "private_cloud_user": null,
+    "private_auth_url": null,
+    "private_tenant": null,
+    "private_user": null,
+    "private_pass": null,
+
+    "distro": null,
+    "cloud_user_data": null
+  },
+  "builders": [
+    {
+      "type": "openstack",
+      "name": "public_cloud",
+      "identity_endpoint": "{{user `public_auth_url`}}",
+      "tenant_name": "{{user `public_tenant`}}",
+      "username": "{{user `public_user`}}",
+      "password": "{{user `public_pass`}}",
+      "region": "DFW",
+      "ssh_username": "{{user `public_cloud_user`}}",
+      "image_name": "{{user `distro`}} - devstack - {{isotime \"20060102-1504\"}}",
+      "source_image_name": "{{user `public_base_image`}}",
+      "flavor": "general1-1",
+      "networks": [
+        "{{user `public_network`}}"
+      ],
+      "user_data_file": "{{user `cloud_user_data`}}"
+    },
+    {
+      "type": "openstack",
+      "name": "private_cloud",
+      "identity_endpoint": "{{user `private_auth_url`}}",
+      "tenant_name": "{{user `private_tenant`}}",
+      "username": "{{user `private_user`}}",
+      "password": "{{user `private_pass`}}",
+      "ssh_username": "{{user `private_cloud_user`}}",
+      "image_name": "{{user `distro`}} - devstack - {{isotime \"20060102-1504\"}}",
+      "source_image_name": "{{user `private_base_image`}}",
+      "flavor": "general1-1",
+      "networks": [
+        "{{user `private_network`}}"
+      ],
+      "user_data_file": "{{user `cloud_user_data`}}"
+    }
+  ],
+  "provisioners": [
+    {
+      "type": "shell",
+      "scripts": [
+        "provision/baseline.sh",
+        "provision/devstack.sh",
+        "provision/system_reseal.sh"
+      ],
+      "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
+    }
+  ]
+}

diff --git a/packer/templates/docker.json b/packer/templates/docker.json
new file mode 100644 (file)
index 0000000..c7ff215
--- /dev/null
+++ b/packer/templates/docker.json
@@ -0,0 +1,68 @@
+{
+  "variables": {
+    "public_base_image": null,
+    "public_network": null,
+    "public_cloud_user": null,
+    "public_auth_url": null,
+    "public_tenant": null,
+    "public_user": null,
+    "public_pass": null,
+
+    "private_base_image": null,
+    "private_network": null,
+    "private_cloud_user": null,
+    "private_auth_url": null,
+    "private_tenant": null,
+    "private_user": null,
+    "private_pass": null,
+
+    "distro": null,
+    "cloud_user_data": null
+  },
+  "builders": [
+    {
+      "type": "openstack",
+      "name": "public_cloud",
+      "identity_endpoint": "{{user `public_auth_url`}}",
+      "tenant_name": "{{user `public_tenant`}}",
+      "username": "{{user `public_user`}}",
+      "password": "{{user `public_pass`}}",
+      "region": "DFW",
+      "ssh_username": "{{user `public_cloud_user`}}",
+      "image_name": "{{user `distro`}} - docker - {{isotime \"20060102-1504\"}}",
+      "source_image_name": "{{user `public_base_image`}}",
+      "flavor": "general1-1",
+      "networks": [
+        "{{user `public_network`}}"
+      ],
+      "user_data_file": "{{user `cloud_user_data`}}"
+    },
+    {
+      "type": "openstack",
+      "name": "private_cloud",
+      "identity_endpoint": "{{user `private_auth_url`}}",
+      "tenant_name": "{{user `private_tenant`}}",
+      "username": "{{user `private_user`}}",
+      "password": "{{user `private_pass`}}",
+      "ssh_username": "{{user `private_cloud_user`}}",
+      "image_name": "{{user `distro`}} - docker - {{isotime \"20060102-1504\"}}",
+      "source_image_name": "{{user `private_base_image`}}",
+      "flavor": "general1-1",
+      "networks": [
+        "{{user `private_network`}}"
+      ],
+      "user_data_file": "{{user `cloud_user_data`}}"
+    }
+  ],
+  "provisioners": [
+    {
+      "type": "shell",
+      "scripts": [
+        "provision/baseline.sh",
+        "provision/docker.sh",
+        "provision/system_reseal.sh"
+      ],
+      "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
+    }
+  ]
+}

diff --git a/packer/templates/gbp.json b/packer/templates/gbp.json
new file mode 100644 (file)
index 0000000..52d420a
--- /dev/null
+++ b/packer/templates/gbp.json
@@ -0,0 +1,77 @@
+{
+  "variables": {
+    "public_base_image": null,
+    "public_network": null,
+    "public_cloud_user": null,
+    "public_auth_url": null,
+    "public_tenant": null,
+    "public_user": null,
+    "public_pass": null,
+
+    "private_base_image": null,
+    "private_network": null,
+    "private_cloud_user": null,
+    "private_auth_url": null,
+    "private_tenant": null,
+    "private_user": null,
+    "private_pass": null,
+
+    "distro": null,
+    "cloud_user_data": null
+  },
+  "builders": [
+    {
+      "type": "openstack",
+      "name": "public_cloud",
+      "identity_endpoint": "{{user `public_auth_url`}}",
+      "tenant_name": "{{user `public_tenant`}}",
+      "username": "{{user `public_user`}}",
+      "password": "{{user `public_pass`}}",
+      "region": "DFW",
+      "ssh_username": "{{user `public_cloud_user`}}",
+      "image_name": "{{user `distro`}} - gbp - {{isotime \"20060102-1504\"}}",
+      "source_image_name": "{{user `public_base_image`}}",
+      "flavor": "general1-1",
+      "networks": [
+        "{{user `public_network`}}"
+      ],
+      "user_data_file": "{{user `cloud_user_data`}}"
+    },
+    {
+      "type": "openstack",
+      "name": "private_cloud",
+      "identity_endpoint": "{{user `private_auth_url`}}",
+      "tenant_name": "{{user `private_tenant`}}",
+      "username": "{{user `private_user`}}",
+      "password": "{{user `private_pass`}}",
+      "ssh_username": "{{user `private_cloud_user`}}",
+      "image_name": "{{user `distro`}} - gbp - {{isotime \"20060102-1504\"}}",
+      "source_image_name": "{{user `private_base_image`}}",
+      "flavor": "general1-1",
+      "networks": [
+        "{{user `private_network`}}"
+      ],
+      "user_data_file": "{{user `cloud_user_data`}}"
+    }
+  ],
+  "provisioners": [
+    {
+      "type": "shell",
+      "inline": ["mkdir -p /tmp/packer"]
+    },
+    {
+      "type": "file",
+      "source": "provision/gbp_puppet/",
+      "destination": "/tmp/packer"
+    },
+    {
+      "type": "shell",
+      "scripts": [
+        "provision/baseline.sh",
+        "provision/gbp.sh",
+        "provision/system_reseal.sh"
+      ],
+      "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
+    }
+  ]
+}

diff --git a/packer/templates/java-builder.json b/packer/templates/java-builder.json
new file mode 100644 (file)
index 0000000..f742592
--- /dev/null
+++ b/packer/templates/java-builder.json
@@ -0,0 +1,68 @@
+{
+  "variables": {
+    "public_base_image": null,
+    "public_network": null,
+    "public_cloud_user": null,
+    "public_auth_url": null,
+    "public_tenant": null,
+    "public_user": null,
+    "public_pass": null,
+
+    "private_base_image": null,
+    "private_network": null,
+    "private_cloud_user": null,
+    "private_auth_url": null,
+    "private_tenant": null,
+    "private_user": null,
+    "private_pass": null,
+
+    "distro": null,
+    "cloud_user_data": null
+  },
+  "builders": [
+    {
+      "type": "openstack",
+      "name": "public_cloud",
+      "identity_endpoint": "{{user `public_auth_url`}}",
+      "tenant_name": "{{user `public_tenant`}}",
+      "username": "{{user `public_user`}}",
+      "password": "{{user `public_pass`}}",
+      "region": "DFW",
+      "ssh_username": "{{user `public_cloud_user`}}",
+      "image_name": "{{user `distro`}} - java-builder - {{isotime \"20060102-1504\"}}",
+      "source_image_name": "{{user `public_base_image`}}",
+      "flavor": "general1-1",
+      "networks": [
+        "{{user `public_network`}}"
+      ],
+      "user_data_file": "{{user `cloud_user_data`}}"
+    },
+    {
+      "type": "openstack",
+      "name": "private_cloud",
+      "identity_endpoint": "{{user `private_auth_url`}}",
+      "tenant_name": "{{user `private_tenant`}}",
+      "username": "{{user `private_user`}}",
+      "password": "{{user `private_pass`}}",
+      "ssh_username": "{{user `private_cloud_user`}}",
+      "image_name": "{{user `distro`}} - java-builder - {{isotime \"20060102-1504\"}}",
+      "source_image_name": "{{user `private_base_image`}}",
+      "flavor": "general1-1",
+      "networks": [
+        "{{user `private_network`}}"
+      ],
+      "user_data_file": "{{user `cloud_user_data`}}"
+    }
+  ],
+  "provisioners": [
+    {
+      "type": "shell",
+      "scripts": [
+        "provision/baseline.sh",
+        "provision/java-builder.sh",
+        "provision/system_reseal.sh"
+      ],
+      "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
+    }
+  ]
+}

diff --git a/packer/templates/mininet-ovs-2.3.json b/packer/templates/mininet-ovs-2.3.json
new file mode 100644 (file)
index 0000000..938c1f0
--- /dev/null
+++ b/packer/templates/mininet-ovs-2.3.json
@@ -0,0 +1,68 @@
+{
+  "variables": {
+    "public_base_image": null,
+    "public_network": null,
+    "public_cloud_user": null,
+    "public_auth_url": null,
+    "public_tenant": null,
+    "public_user": null,
+    "public_pass": null,
+
+    "private_base_image": null,
+    "private_network": null,
+    "private_cloud_user": null,
+    "private_auth_url": null,
+    "private_tenant": null,
+    "private_user": null,
+    "private_pass": null,
+
+    "distro": null,
+    "cloud_user_data": null
+  },
+  "builders": [
+    {
+      "type": "openstack",
+      "name": "public_cloud",
+      "identity_endpoint": "{{user `public_auth_url`}}",
+      "tenant_name": "{{user `public_tenant`}}",
+      "username": "{{user `public_user`}}",
+      "password": "{{user `public_pass`}}",
+      "region": "DFW",
+      "ssh_username": "{{user `public_cloud_user`}}",
+      "image_name": "{{user `distro`}} - mininet-ovs-2.3 - {{isotime \"20060102-1504\"}}",
+      "source_image_name": "{{user `public_base_image`}}",
+      "flavor": "general1-1",
+      "networks": [
+        "{{user `public_network`}}"
+      ],
+      "user_data_file": "{{user `cloud_user_data`}}"
+    },
+    {
+      "type": "openstack",
+      "name": "private_cloud",
+      "identity_endpoint": "{{user `private_auth_url`}}",
+      "tenant_name": "{{user `private_tenant`}}",
+      "username": "{{user `private_user`}}",
+      "password": "{{user `private_pass`}}",
+      "ssh_username": "{{user `private_cloud_user`}}",
+      "image_name": "{{user `distro`}} - mininet-ovs-2.3 - {{isotime \"20060102-1504\"}}",
+      "source_image_name": "{{user `private_base_image`}}",
+      "flavor": "general1-1",
+      "networks": [
+        "{{user `private_network`}}"
+      ],
+      "user_data_file": "{{user `cloud_user_data`}}"
+    }
+  ],
+  "provisioners": [
+    {
+      "type": "shell",
+      "scripts": [
+        "provision/baseline.sh",
+        "provision/mininet-ovs-2.3.sh",
+        "provision/system_reseal.sh"
+      ],
+      "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
+    }
+  ]
+}

diff --git a/packer/templates/mininet.json b/packer/templates/mininet.json
new file mode 100644 (file)
index 0000000..180975b
--- /dev/null
+++ b/packer/templates/mininet.json
@@ -0,0 +1,68 @@
+{
+  "variables": {
+    "public_base_image": null,
+    "public_network": null,
+    "public_cloud_user": null,
+    "public_auth_url": null,
+    "public_tenant": null,
+    "public_user": null,
+    "public_pass": null,
+
+    "private_base_image": null,
+    "private_network": null,
+    "private_cloud_user": null,
+    "private_auth_url": null,
+    "private_tenant": null,
+    "private_user": null,
+    "private_pass": null,
+
+    "distro": null,
+    "cloud_user_data": null
+  },
+  "builders": [
+    {
+      "type": "openstack",
+      "name": "public_cloud",
+      "identity_endpoint": "{{user `public_auth_url`}}",
+      "tenant_name": "{{user `public_tenant`}}",
+      "username": "{{user `public_user`}}",
+      "password": "{{user `public_pass`}}",
+      "region": "DFW",
+      "ssh_username": "{{user `public_cloud_user`}}",
+      "image_name": "{{user `distro`}} - mininet - {{isotime \"20060102-1504\"}}",
+      "source_image_name": "{{user `public_base_image`}}",
+      "flavor": "general1-1",
+      "networks": [
+        "{{user `public_network`}}"
+      ],
+      "user_data_file": "{{user `cloud_user_data`}}"
+    },
+    {
+      "type": "openstack",
+      "name": "private_cloud",
+      "identity_endpoint": "{{user `private_auth_url`}}",
+      "tenant_name": "{{user `private_tenant`}}",
+      "username": "{{user `private_user`}}",
+      "password": "{{user `private_pass`}}",
+      "ssh_username": "{{user `private_cloud_user`}}",
+      "image_name": "{{user `distro`}} - mininet - {{isotime \"20060102-1504\"}}",
+      "source_image_name": "{{user `private_base_image`}}",
+      "flavor": "general1-1",
+      "networks": [
+        "{{user `private_network`}}"
+      ],
+      "user_data_file": "{{user `cloud_user_data`}}"
+    }
+  ],
+  "provisioners": [
+    {
+      "type": "shell",
+      "scripts": [
+        "provision/baseline.sh",
+        "provision/mininet.sh",
+        "provision/system_reseal.sh"
+      ],
+      "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
+    }
+  ]
+}

diff --git a/packer/templates/robot.json b/packer/templates/robot.json
new file mode 100644 (file)
index 0000000..a20eefb
--- /dev/null
+++ b/packer/templates/robot.json
@@ -0,0 +1,68 @@
+{
+  "variables": {
+    "public_base_image": null,
+    "public_network": null,
+    "public_cloud_user": null,
+    "public_auth_url": null,
+    "public_tenant": null,
+    "public_user": null,
+    "public_pass": null,
+
+    "private_base_image": null,
+    "private_network": null,
+    "private_cloud_user": null,
+    "private_auth_url": null,
+    "private_tenant": null,
+    "private_user": null,
+    "private_pass": null,
+
+    "distro": null,
+    "cloud_user_data": null
+  },
+  "builders": [
+    {
+      "type": "openstack",
+      "name": "public_cloud",
+      "identity_endpoint": "{{user `public_auth_url`}}",
+      "tenant_name": "{{user `public_tenant`}}",
+      "username": "{{user `public_user`}}",
+      "password": "{{user `public_pass`}}",
+      "region": "DFW",
+      "ssh_username": "{{user `public_cloud_user`}}",
+      "image_name": "{{user `distro`}} - robot - {{isotime \"20060102-1504\"}}",
+      "source_image_name": "{{user `public_base_image`}}",
+      "flavor": "general1-1",
+      "networks": [
+        "{{user `public_network`}}"
+      ],
+      "user_data_file": "{{user `cloud_user_data`}}"
+    },
+    {
+      "type": "openstack",
+      "name": "private_cloud",
+      "identity_endpoint": "{{user `private_auth_url`}}",
+      "tenant_name": "{{user `private_tenant`}}",
+      "username": "{{user `private_user`}}",
+      "password": "{{user `private_pass`}}",
+      "ssh_username": "{{user `private_cloud_user`}}",
+      "image_name": "{{user `distro`}} - robot - {{isotime \"20060102-1504\"}}",
+      "source_image_name": "{{user `private_base_image`}}",
+      "flavor": "general1-1",
+      "networks": [
+        "{{user `private_network`}}"
+      ],
+      "user_data_file": "{{user `cloud_user_data`}}"
+    }
+  ],
+  "provisioners": [
+    {
+      "type": "shell",
+      "scripts": [
+        "provision/baseline.sh",
+        "provision/robot.sh",
+        "provision/system_reseal.sh"
+      ],
+      "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
+    }
+  ]
+}

diff --git a/packer/vars/.gitignore b/packer/vars/.gitignore
new file mode 100644 (file)
index 0000000..af92028
--- /dev/null
+++ b/packer/vars/.gitignore
@@ -0,0 +1,2 @@
+# exclude private cloud-env settings
+cloud-env.json

diff --git a/packer/vars/centos.json b/packer/vars/centos.json
new file mode 100644 (file)
index 0000000..06754ed
--- /dev/null
+++ b/packer/vars/centos.json
@@ -0,0 +1,12 @@
+{
+  "public_base_image": "CentOS 7 (PVHVM)",
+  "public_network": "cac67a72-aefc-48f8-ae55-9affa3540dd0",
+  "public_cloud_user": "root",
+
+  "private_base_image": "CentOS 7 (cloudimg 1510)",
+  "private_network": "6bd0cc77-9896-4fba-a663-88c1a4bbd9a2",
+  "private_cloud_user": "centos",
+
+  "distro": "CentOS 7",
+  "cloud_user_data": "provision/rh-user_data.sh"
+}

diff --git a/packer/vars/cloud-env.json.example b/packer/vars/cloud-env.json.example
new file mode 100644 (file)
index 0000000..6c10f8c
--- /dev/null
+++ b/packer/vars/cloud-env.json.example
@@ -0,0 +1,14 @@
+{
+  "public_auth_url": "https://identity.api.rackspacecloud.com/v2.0/",
+
+  "public_tenant": "TENNANTID",
+  "public_user": "USERID",
+  "public_pass": "USERPASS",
+
+
+  "private_auth_url": "https://privapi.opendaylight.org:5000/v2.0",
+
+  "private_tenant": "TENNANTID",
+  "private_user": "USERID",
+  "private_pass": "USERPASS"
+}

diff --git a/packer/vars/ubuntu-14.04.json b/packer/vars/ubuntu-14.04.json
new file mode 100644 (file)
index 0000000..7902b6b
--- /dev/null
+++ b/packer/vars/ubuntu-14.04.json
@@ -0,0 +1,12 @@
+{
+  "public_base_image": "Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)",
+  "public_network": "cac67a72-aefc-48f8-ae55-9affa3540dd0",
+  "public_cloud_user": "root",
+
+  "private_base_image": "Ubuntu 14.04 LTS Trusty Tahr (cloudimg)",
+  "private_network": "6bd0cc77-9896-4fba-a663-88c1a4bbd9a2",
+  "private_cloud_user": "ubuntu",
+
+  "distro": "Ubuntu 14.04",
+  "cloud_user_data": "provision/null_data.sh"
+}

diff --git a/packer/vars/ubuntu-16.04.json b/packer/vars/ubuntu-16.04.json
new file mode 100644 (file)
index 0000000..d01b773
--- /dev/null
+++ b/packer/vars/ubuntu-16.04.json
@@ -0,0 +1,12 @@
+{
+  "public_base_image": "Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM)",
+  "public_network": "cac67a72-aefc-48f8-ae55-9affa3540dd0",
+  "public_cloud_user": "root",
+
+  "private_base_image": "Ubuntu 16.04 LTS (2016-05-03 cloudimg)",
+  "private_network": "6bd0cc77-9896-4fba-a663-88c1a4bbd9a2",
+  "private_cloud_user": "ubuntu",
+
+  "distro": "Ubuntu 16.04",
+  "cloud_user_data": "provision/null_data.sh"
+}

diff --git a/vagrant/README.md b/vagrant/README.md
deleted file mode 100644 (file)
index 37f17b3..0000000
--- a/vagrant/README.md
+++ /dev/null
@@ -1,41 +0,0 @@
-The purpose of these various directories is to have Vagrant definitions
-that are then snapshotted for use as slaves in the OpenDaylight and
-ODLForge environments.
-
-If building up in a Rackspace environment using this for the first time
-there is a particular order that should be taken to produce a finalized
-image.
-
-1. Bring a vagrant image up using the rackspace-convert-base definition.
-   This will prepare a basic Rackspace image to operate properly when
-   being managed by vagrant. It is purposely very limited in what it
-   does.
-
-2. After the rackspace-convert-base image is up and you receive the
-   notice to snapshot the image perform a ```nova create-image```
-   against the running instance. Once the snapshot is complete you may
-   destroy the currently running vagrant image (it's easiest if the
-   create-image is done with --poll so you know when it's complete)
-
-3. Bring up one of the various other vagrant images passing
-   ```RSIMAGE=${a_vagrant_image_id}``` where ```$a_vagrant_image_id```
-   is the imageID that was generated after the snapshotting operation in
-   step 2. You probably also want to execute using ```RSRESEAL=true` to
-   have the brought up image resealed for cloning purposes.
-
-4. If you executed with ```RSRESEAL=true``` now is the time to take the
-   snapshot of the current running vagrant. See step 2
-
-5. The final step in preparing an image for use in the Linux Foundation
-   managed environments to then take the image produced in step 4 and
-   run the ```lf-networking``` vagrant definition using it. See the
-   README.md in that vagrant folder for the required extra environment
-   variables.
-
-6. Snapshot the new vagrant, see step 2 for details.
-
-At this point a new Rackspace image will be ready for a given network
-configuration. If you, the reader, are looking to utilize any of this
-for your own Rackspace managed environment, or standard Vagrant then
-step 5 & 6 will likely not be needed as they are specific to how the
-Linux Foundation manages the Jenkins environment for OpenDaylight.

diff --git a/vagrant/baseline/README.md b/vagrant/baseline/README.md
deleted file mode 100644 (file)
index 32252b8..0000000
--- a/vagrant/baseline/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-baseline can be used for preparing basic test images. It's suitable for
-use only as a verification that our baseline library script is working
-as expected or for a very vanilla image.
-
-This is controlled by the IMAGE environment variable
-
-ex:
-
-$ export RESEAL=true
-$ IMAGE='CentOS 7' vagrant up --provider=openstack
-
-If $RESEAL is not set then the system will not be cleaned up in
-preparation for snapshotting. This is mostly useful for troubleshooting
-a vagrant definition before you do your final creation and snapshot.

diff --git a/vagrant/baseline/Vagrantfile b/vagrant/baseline/Vagrantfile
deleted file mode 100644 (file)
index 8a6080c..0000000
--- a/vagrant/baseline/Vagrantfile
+++ /dev/null
@@ -1,104 +0,0 @@
-# -*- 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 init user ${osname}
-  # getting the ssh key for some reason, root does
-  # so use that
-  config.ssh.username = 'root'
-
-  # DEPRECATED
-  # ==========
-  #
-  # NOTE: The Rackspace provider section is deprecated as we are moving into a
-  # private OpenStack cloud. It may be revived after we've migrated and have a
-  # chance to do work to reconfigure the Rackspace public cloud to work for
-  # burst access
-  #
-  # 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 a 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 to the Fedora 20 image unless overridden by a RSIMAGE
-    # environment variable
-    if ENV['IMAGE']
-      rs.image = ENV['IMAGE']
-    else
-      rs.image = 'Fedora 20 (Heisenbug) (PVHVM)'
-    end
-  end
-  # /DEPRECATED
-
-  # Configuration used by ODL Private cloud
-  # Should be mostly usable by any OpenStack cloud that can
-  # utilize upstream cloud images
-  config.vm.provider :openstack do |os, override|
-    if ENV['BOX']
-      override.vm.box = ENV['BOX']
-    else
-      override.vm.box = 'dummy'
-    end
-    config.ssh.username = 'centos'
-    os.flavor = 'm1.small'
-
-    # require an IMAGE to be passed in
-    # IMAGE must be a human name and not an image ID!
-    if ENV['IMAGE']
-      os.image = ENV['IMAGE']
-    else
-      os.image = 'BAD IMAGE'
-      override.ssh.username = 'baduser'
-    end
-
-    case ENV['IMAGE']
-      when /.*ubuntu.*/i
-        override.ssh.username = 'ubuntu'
-
-      when /.*fedora.*/i
-        override.ssh.username = 'fedora'
-
-        # take care of the tty requirement by fedora for sudo
-        os.user_data = "#!/bin/bash
-/bin/sed -i 's/ requiretty/ !requiretty/' /etc/sudoers;"
-
-      when /.*centos.*/i
-        override.ssh.username = 'centos'
-
-        # take care of the tty requirement by centos for sudo
-        os.user_data = "#!/bin/bash
-/bin/sed -i 's/ requiretty/ !requiretty/' /etc/sudoers;"
-    end
-
-  end
-
-  # Do a full system update and enable enforcing if needed
-  config.vm.provision 'shell', path: '../lib/baseline.sh'
-
-  # Execute a system clean-up in prep for imaging so that this base
-  # image can be used for other Rackspace Vagrant configurations
-  config.vm.provision 'shell', path: '../lib/system_reseal.sh'
-end

diff --git a/vagrant/basic-builder/README.md b/vagrant/basic-builder/README.md
deleted file mode 100644 (file)
index 31ec3c7..0000000
--- a/vagrant/basic-builder/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-basic-builder can be used to take an already converted Rackspace
-native base image into a usuable basic java system for use in the
-OpenDaylight build and testing environment.
-
-Please see the rackspace-convert-base vagrant setup for creation of the
-needed base image.
-
-This vagrant expects (by default) a personal Rackspace image named
-
-'CentOS 7 - Vagrant ready'
-
-To spin up and utilize.
-
-$ RSIMAGE='${baseimagename}' vagrant up --provider=rackspace
-
-Will execute this vagrant against a differently named base image
-
-$ RSRESEAL=true vagrant up --provider=rackspace
-
-NOTE: resealing will cause the vagrant to run the resealing operation.
-This operation will intentionally destroy current SSH pubkeys installed
-on the system as well as reset log files and network configurations. You
-have been warned.

diff --git a/vagrant/basic-builder/Vagrantfile b/vagrant/basic-builder/Vagrantfile
deleted file mode 100644 (file)
index 0622a7a..0000000
--- a/vagrant/basic-builder/Vagrantfile
+++ /dev/null
@@ -1,85 +0,0 @@
-# -*- 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 openstack provider dummy box
-  config.vm.box = "dummy"
-  config.ssh.username = 'root'
-
-  # make sure to set the following in your
-  # ~/.vagrant.d/boxes/dummy/0/openstack/Vagrantfile
-  #
-  # os.openstack_auth_url
-  # os.endpoint_type
-  # os.flavor
-  # os.tenant_name
-  # os.username
-  # os.password
-  # os.networks
-  #
-  # If you are not using an SSH token / smartcard also set this
-  # os.key_name
-  # config.ssh.private_key_path -- set this outside the openstack block
-  #         in your base box
-  config.vm.provider :openstack do |os, override|
-    if ENV['BOX']
-      override.vm.box = ENV['BOX']
-    else
-      override.vm.box = 'dummy'
-    end
-    config.ssh.username = 'centos'
-    os.flavor = 'm1.small'
-
-    # require an IMAGE to be passed in
-    # IMAGE must be a human name and not an image ID!
-    if ENV['IMAGE']
-      os.image = ENV['IMAGE']
-    else
-      os.image = 'BAD IMAGE'
-      override.ssh.username = 'baduser'
-    end
-
-    case ENV['IMAGE']
-      when /.*ubuntu.*/i
-        override.ssh.username = 'ubuntu'
-
-      when /.*fedora.*/i
-        override.ssh.username = 'fedora'
-
-        # take care of the tty requirement by fedora for sudo
-        os.user_data = "#!/bin/bash
-/bin/sed -i 's/ requiretty/ !requiretty/' /etc/sudoers;"
-
-      when /.*centos.*/i
-        override.ssh.username = 'centos'
-
-        # take care of the tty requirement by centos for sudo
-        os.user_data = "#!/bin/bash
-/bin/sed -i 's/ requiretty/ !requiretty/' /etc/sudoers;"
-    end
-  end
-
-  # Explicitlly set default shared folder and load lib folder
-  config.vm.synced_folder ".", "/vagrant"
-  config.vm.synced_folder "../lib/", "/vagrant/lib"
-
-  # Do a full system update and enable enforcing if needed
-  config.vm.provision 'shell', path: '../lib/baseline.sh'
-
-  # run our bootstrapping
-  config.vm.provision 'shell', path: 'bootstrap.sh'
-
-  #################
-  # FINAL CLEANUP #
-  #################
-
-  # set RESEAL 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['RESEAL']
-    config.vm.provision 'shell', path: '../lib/system_reseal.sh'
-  end
-end

diff --git a/vagrant/basic-java-node/README.md b/vagrant/basic-java-node/README.md
deleted file mode 100644 (file)
index 592113c..0000000
--- a/vagrant/basic-java-node/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-basic-java-node can be used to take an already converted Rackspace
-native base image into a usuable basic java system for use in the
-OpenDaylight build and testing environment.
-
-Please see the rackspace-convert-base vagrant setup for creation of the
-needed base image.
-
-This vagrant expects (by default) a personal Rackspace image named
-
-'CentOS 6.5 - Vagrant ready'
-
-To spin up and utilize.
-
-$ RSIMAGE='${baseimagename}' vagrant up --provider=rackspace
-
-Will execute this vagrant against a differently named base image
-
-$ RSRESEAL=true vagrant up --provider=rackspace
-
-NOTE: resealing will cause the vagrant to run the resealing operation.
-This operation will intentionally destroy current SSH pubkeys installed
-on the system as well as reset log files and network configurations. You
-have been warned.

diff --git a/vagrant/basic-java-node/Vagrantfile b/vagrant/basic-java-node/Vagrantfile
deleted file mode 100644 (file)
index 46e61bf..0000000
--- a/vagrant/basic-java-node/Vagrantfile
+++ /dev/null
@@ -1,82 +0,0 @@
-# -*- 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'
-
-  # Fedora and EL systems default to requiring tty for sudo
-  # This should have been disabled with the Vagrant ready
-  # base box conversion (see rackspace-convert-base vagrant)
-  # but just to be safe
-  config.ssh.pty = true
-
-  # 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 CentOS 6.5 - Vagrant ready image unless overriden by a RSIMAGE
-    # environment variable
-    if ENV['RSIMAGE']
-      rs.image = ENV['RSIMAGE']
-    else
-      rs.image = 'CentOS 6.5 - 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 ovsdb-devstack system
-  config.vm.provision 'shell', path: 'bootstrap.sh'
-
-
-  #################
-  # LF NETWORKING #
-  #################
-
-  if ENV['LFNETWORK']
-    # reconfigure the network setup to support our special private setup
-    config.vm.provision 'shell', path: '../lib/lf-networking/configure_lf_infra.sh',
-      args: ENV['RSSUBDOMAIN']
-  end
-
-
-  #################
-  # FINAL CLEANUP #
-  #################
-
-  # set RSRESEAL to... anything if you want to snap an image of this box
-  # not setting the environment variable will cause the system to come
-  # up fully and not be in a resealable state
-  if ENV['RSRESEAL']
-    config.vm.provision 'shell', path: '../lib/system_reseal.sh'
-  end
-end

diff --git a/vagrant/basic-java-node/bootstrap.sh b/vagrant/basic-java-node/bootstrap.sh
deleted file mode 100644 (file)
index 7cdb812..0000000
--- a/vagrant/basic-java-node/bootstrap.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# vim: sw=4 ts=4 sts=4 et tw=72 :
-
-yum clean all
-
-# Make sure the system is fully up to date
-yum update -q -y
-
-

diff --git a/vagrant/basic-mininet-fedora-node/README.md b/vagrant/basic-mininet-fedora-node/README.md
deleted file mode 100644 (file)
index 16a6fe2..0000000
--- a/vagrant/basic-mininet-fedora-node/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-basic-mininet-fedora-node can be used to take an already converted
-Rackspace native base image to a basic system with mininet and other
-test tools for use in the OpenDaylight build and testing environment
-
-Please see the rackspace-convert-base vagrant setup for creation of the
-needed base image.
-
-This vagrant expects (by default) a personal Rackspace image named
-
-'Fedora 21 - Vagrant ready'
-
-To spin up and utilize.
-
-$ RSIMAGE='${baseimagename}' vagrant up --provider=rackspace
-
-Will execute this vagrant against a differently named base image
-
-$ RSRESEAL=true vagrant up --provider=rackspace
-
-NOTE: resealing will cause the vagrant to run the resealing operation.
-This operation will intentionally destroy current SSH pubkeys installed
-on the system as well as reset log files and network configurations. You
-have been warned.

diff --git a/vagrant/basic-mininet-fedora-node/Vagrantfile b/vagrant/basic-mininet-fedora-node/Vagrantfile
deleted file mode 100644 (file)
index f9476a8..0000000
--- a/vagrant/basic-mininet-fedora-node/Vagrantfile
+++ /dev/null
@@ -1,62 +0,0 @@
-# -*- 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'
-
-  # Fedora and EL systems default to requiring tty for sudo
-  # This should have been disabled with the Vagrant ready
-  # base box conversion (see rackspace-convert-base vagrant)
-  # but just to be safe
-  config.ssh.pty = true
-
-  # 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 Fedora 21 - Vagrant ready image unless overriden by a RSIMAGE
-    # environment variable
-    if ENV['RSIMAGE']
-      rs.image = ENV['RSIMAGE']
-    else
-      rs.image = 'Fedora 21 - Vagrant ready'
-    end
-  end
-
-  # run our bootstrapping for the ovsdb-devstack system
-  config.vm.provision 'shell', path: 'bootstrap.sh'
-
-  # set RSRESEAL to... anything if you want to snap an image of this box
-  # not setting the environment variable will cause the system to come
-  # up fully and not be in a resealable state
-  if ENV['RSRESEAL']
-    config.vm.provision 'shell', path: 'system_reseal.sh'
-  end
-end

diff --git a/vagrant/basic-mininet-fedora-node/bootstrap.sh b/vagrant/basic-mininet-fedora-node/bootstrap.sh
deleted file mode 100644 (file)
index 7da8761..0000000
--- a/vagrant/basic-mininet-fedora-node/bootstrap.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-# vim: sw=4 ts=4 sts=4 et tw=72 :
-
-# update os
-yum clean all
-yum update -q -y
-
-# install openvswitch
-yum install -q -y openvswitch
-# make sure it's enabled on system start, no need to start it
-# during setup
-systemctl enable openvswitch
-
-# install mininet
-git clone git://github.com/mininet/mininet
-cd mininet
-git checkout -b 2.2.1 2.2.1
-cd ..
-mininet/util/install.sh -nf
-

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

diff --git a/vagrant/basic-mininet-node/README.md b/vagrant/basic-mininet-node/README.md
deleted file mode 100644 (file)
index 396afbe..0000000
--- a/vagrant/basic-mininet-node/README.md
+++ /dev/null
@@ -1,24 +0,0 @@
-basic-mininet-node can be used to take an already converted Rackspace
-native base image to a usuable basic system with mininet, netopeer /
-netconf and installation requirements for VTN already setup for use in
-the OpenDaylight build and testing environment
-
-Please see the rackspace-convert-base vagrant setup for creation of the
-needed base image.
-
-This vagrant expects (by default) a personal Rackspace image named
-
-'CentOS 6.5 - Vagrant ready'
-
-To spin up and utilize.
-
-$ RSIMAGE='${baseimagename}' vagrant up --provider=rackspace
-
-Will execute this vagrant against a differently named base image
-
-$ RSRESEAL=true vagrant up --provider=rackspace
-
-NOTE: resealing will cause the vagrant to run the resealing operation.
-This operation will intentionally destroy current SSH pubkeys installed
-on the system as well as reset log files and network configurations. You
-have been warned.

diff --git a/vagrant/basic-mininet-node/Vagrantfile b/vagrant/basic-mininet-node/Vagrantfile
deleted file mode 100644 (file)
index 46e61bf..0000000
--- a/vagrant/basic-mininet-node/Vagrantfile
+++ /dev/null
@@ -1,82 +0,0 @@
-# -*- 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'
-
-  # Fedora and EL systems default to requiring tty for sudo
-  # This should have been disabled with the Vagrant ready
-  # base box conversion (see rackspace-convert-base vagrant)
-  # but just to be safe
-  config.ssh.pty = true
-
-  # 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 CentOS 6.5 - Vagrant ready image unless overriden by a RSIMAGE
-    # environment variable
-    if ENV['RSIMAGE']
-      rs.image = ENV['RSIMAGE']
-    else
-      rs.image = 'CentOS 6.5 - 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 ovsdb-devstack system
-  config.vm.provision 'shell', path: 'bootstrap.sh'
-
-
-  #################
-  # LF NETWORKING #
-  #################
-
-  if ENV['LFNETWORK']
-    # reconfigure the network setup to support our special private setup
-    config.vm.provision 'shell', path: '../lib/lf-networking/configure_lf_infra.sh',
-      args: ENV['RSSUBDOMAIN']
-  end
-
-
-  #################
-  # FINAL CLEANUP #
-  #################
-
-  # set RSRESEAL to... anything if you want to snap an image of this box
-  # not setting the environment variable will cause the system to come
-  # up fully and not be in a resealable state
-  if ENV['RSRESEAL']
-    config.vm.provision 'shell', path: '../lib/system_reseal.sh'
-  end
-end

diff --git a/vagrant/basic-mininet-node/bootstrap.sh b/vagrant/basic-mininet-node/bootstrap.sh
deleted file mode 100644 (file)
index 5dbe823..0000000
--- a/vagrant/basic-mininet-node/bootstrap.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-# vim: sw=4 ts=4 sts=4 et tw=72 :
-
-yum clean all
-# Add the ODL yum repo (not needed for java nodes, but useful for
-# potential later layers)
-yum install -q -y https://nexus.opendaylight.org/content/repositories/opendaylight-yum-epel-6-x86_64/rpm/opendaylight-release/0.1.0-1.el6.noarch/opendaylight-release-0.1.0-1.el6.noarch.rpm
-
-# Make sure the system is fully up to date
-yum update -q -y
-
-# Add in git (needed for most everything) and XML-XPath as it is useful
-# for doing CLI based CML parsing of POM files
-yum install -q -y git perl-{XML-XPath,Digest-SHA}
-
-# install all available openjdk-devel sets
-yum install -q -y 'java-*-openjdk-devel'
-
-# we currently use Java7 (aka java-1.7.0-openjdk) as our standard make
-# sure that this is the java that alternatives is pointing to, dynamic
-# spin-up scripts can switch to any of the current JREs installed if
-# needed
-alternatives --set java /usr/lib/jvm/jre-1.7.0-openjdk.x86_64/bin/java
-alternatives --set java_sdk_openjdk /usr/lib/jvm/java-1.7.0-openjdk.x86_64
-
-# 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
-
-# add in mininet, openvswitch, and netopeer
-yum install -q -y netopeer-server-sl CPqD-ofsoftswitch13 mininet \
-    telnet openvswitch
-
-# we need semanage installed for some of the next bit
-yum install -q -y policycoreutils-python
-
-# netconf / netopeer needs some special modifications to ssh
-semanage port -a -t ssh_port_t -p tcp '830'
-
-# The default /etc/ssh/sshd_config doesn't actually specify a port as such
-# we need to specify both 22 as well as 830 along with the netconf
-# subsystem
-echo << EOSSH >> /etc/ssh/sshd_config
-
-# Added for netconf / netopeer testing
-Port 22
-Port 830
-Subsystem netconf /usr/bin/netopeer-server-sl
-EOSSH
-
-# 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
-
-yum install -q -y net-snmp-devel libpcap-devel autoconf make automake libtool libconfig-devel
-
-git clone git://gitosis.stanford.edu/openflow.git $OF_DIR &> /dev/null
-git clone https://github.com/andi-bigswitch/oflops.git $OFLOPS_DIR &> /dev/null
-
-cd $OFLOPS_DIR
-./boot.sh &> /dev/null
-./configure --with-openflow-src-dir=$OF_DIR &> /dev/null
-make &> /dev/null
-make install &> /dev/null

diff --git a/vagrant/docker/README.md b/vagrant/docker/README.md
deleted file mode 100644 (file)
index a66f641..0000000
--- a/vagrant/docker/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-The docker Vagrant can be used to take an already converted Rackspace native
-base image into a usuable docker ready image
-
-Please see the baseline vagrant setup for creation of the
-needed base image.
-
-This vagrant expects (by default) a personal Rackspace image named
-
-'Fedora 20 (Heisenbug) - Vagrant ready'
-
-To spin up and utilize.
-
-$ RSIMAGE="${baseimagename}" vagrant up --provider=rackspace
-
-Will execute this vagrant against a differently named base image
-
-$ RSIMAGE="${baseimagename}" RSRESEAL=true vagrant up --provider=rackspace
-
-NOTE: resealing will cause the vagrant to run the resealing operation.
-This operation will intentionally destroy current SSH pubkeys installed
-on the system as well as reset log files and network configurations. You
-have been warned.

diff --git a/vagrant/docker/Vagrantfile b/vagrant/docker/Vagrantfile
deleted file mode 100644 (file)
index 0622a7a..0000000
--- a/vagrant/docker/Vagrantfile
+++ /dev/null
@@ -1,85 +0,0 @@
-# -*- 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 openstack provider dummy box
-  config.vm.box = "dummy"
-  config.ssh.username = 'root'
-
-  # make sure to set the following in your
-  # ~/.vagrant.d/boxes/dummy/0/openstack/Vagrantfile
-  #
-  # os.openstack_auth_url
-  # os.endpoint_type
-  # os.flavor
-  # os.tenant_name
-  # os.username
-  # os.password
-  # os.networks
-  #
-  # If you are not using an SSH token / smartcard also set this
-  # os.key_name
-  # config.ssh.private_key_path -- set this outside the openstack block
-  #         in your base box
-  config.vm.provider :openstack do |os, override|
-    if ENV['BOX']
-      override.vm.box = ENV['BOX']
-    else
-      override.vm.box = 'dummy'
-    end
-    config.ssh.username = 'centos'
-    os.flavor = 'm1.small'
-
-    # require an IMAGE to be passed in
-    # IMAGE must be a human name and not an image ID!
-    if ENV['IMAGE']
-      os.image = ENV['IMAGE']
-    else
-      os.image = 'BAD IMAGE'
-      override.ssh.username = 'baduser'
-    end
-
-    case ENV['IMAGE']
-      when /.*ubuntu.*/i
-        override.ssh.username = 'ubuntu'
-
-      when /.*fedora.*/i
-        override.ssh.username = 'fedora'
-
-        # take care of the tty requirement by fedora for sudo
-        os.user_data = "#!/bin/bash
-/bin/sed -i 's/ requiretty/ !requiretty/' /etc/sudoers;"
-
-      when /.*centos.*/i
-        override.ssh.username = 'centos'
-
-        # take care of the tty requirement by centos for sudo
-        os.user_data = "#!/bin/bash
-/bin/sed -i 's/ requiretty/ !requiretty/' /etc/sudoers;"
-    end
-  end
-
-  # Explicitlly set default shared folder and load lib folder
-  config.vm.synced_folder ".", "/vagrant"
-  config.vm.synced_folder "../lib/", "/vagrant/lib"
-
-  # Do a full system update and enable enforcing if needed
-  config.vm.provision 'shell', path: '../lib/baseline.sh'
-
-  # run our bootstrapping
-  config.vm.provision 'shell', path: 'bootstrap.sh'
-
-  #################
-  # FINAL CLEANUP #
-  #################
-
-  # set RESEAL 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['RESEAL']
-    config.vm.provision 'shell', path: '../lib/system_reseal.sh'
-  end
-end

diff --git a/vagrant/gbp-ubuntu-docker-ovs-node/Vagrantfile b/vagrant/gbp-ubuntu-docker-ovs-node/Vagrantfile
deleted file mode 100644 (file)
index cb6b627..0000000
--- a/vagrant/gbp-ubuntu-docker-ovs-node/Vagrantfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# -*- 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 openstack provider dummy box
-  config.vm.box = "dummy"
-  config.ssh.username = 'root'
-
-  # make sure to set the following in your
-  # ~/.vagrant.d/boxes/dummy/0/openstack/Vagrantfile
-  #
-  # os.openstack_auth_url
-  # os.endpoint_type
-  # os.flavor
-  # os.tenant_name
-  # os.username
-  # os.password
-  # os.networks
-  #
-  # If you are not using an SSH token / smartcard also set this
-  # os.key_name
-  # config.ssh.private_key_path -- set this outside the openstack block
-  #         in your base box
-  config.vm.provider :openstack do |os, override|
-    if ENV['BOX']
-      override.vm.box = ENV['BOX']
-    else
-      override.vm.box = 'dummy'
-    end
-    config.ssh.username = 'centos'
-    os.flavor = 'm1.small'
-
-    # require an IMAGE to be passed in
-    # IMAGE must be a human name and not an image ID!
-    if ENV['IMAGE']
-      os.image = ENV['IMAGE']
-    else
-      os.image = 'BAD IMAGE'
-      override.ssh.username = 'baduser'
-    end
-
-    case ENV['IMAGE']
-      when /.*ubuntu.*/i
-        override.ssh.username = 'ubuntu'
-
-      when /.*fedora.*/i
-        override.ssh.username = 'fedora'
-
-        # take care of the tty requirement by fedora for sudo
-        os.user_data = "#!/bin/bash
-/bin/sed -i 's/ requiretty/ !requiretty/' /etc/sudoers;"
-
-      when /.*centos.*/i
-        override.ssh.username = 'centos'
-
-        # take care of the tty requirement by centos for sudo
-        os.user_data = "#!/bin/bash
-/bin/sed -i 's/ requiretty/ !requiretty/' /etc/sudoers;"
-    end
-  end
-
-  # Explicitlly set default shared folder and load lib folder
-  config.vm.synced_folder ".", "/vagrant"
-  config.vm.synced_folder "../lib/", "/vagrant/lib"
-
-  # Do a full system update and enable enforcing if needed
-  config.vm.provision 'shell', path: '../lib/baseline.sh'
-
-  # run our bootstrapping
-  config.vm.provision 'shell', path: 'bootstrap.sh'
-
-
-  #################
-  # 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/integration-robotframework/README.md b/vagrant/integration-robotframework/README.md
deleted file mode 100644 (file)
index 84a24fd..0000000
--- a/vagrant/integration-robotframework/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-integration-robotframework can be used to take an already converted
-Rackspace native base image into a usuable robotframework system for use
-in the OpenDaylight integration testing environment.
-
-Please see the rackspace-convert-base vagrant setup for creation of the
-needed base image.
-
-This vagrant expects (by default) a personal Rackspace image named
-
-'CentOS 6.5 - Vagrant ready'
-
-To spin up and utilize.
-
-$ RSIMAGE='${baseimagename}' vagrant up --provider=rackspace
-
-Will execute this vagrant against a differently named base image
-
-$ RSRESEAL=true vagrant up --provider=rackspace
-
-NOTE: resealing will cause the vagrant to run the resealing operation.
-This operation will intentionally destroy current SSH pubkeys installed
-on the system as well as reset log files and network configurations. You
-have been warned.

diff --git a/vagrant/integration-robotframework/Vagrantfile b/vagrant/integration-robotframework/Vagrantfile
deleted file mode 100644 (file)
index 0622a7a..0000000
--- a/vagrant/integration-robotframework/Vagrantfile
+++ /dev/null
@@ -1,85 +0,0 @@
-# -*- 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 openstack provider dummy box
-  config.vm.box = "dummy"
-  config.ssh.username = 'root'
-
-  # make sure to set the following in your
-  # ~/.vagrant.d/boxes/dummy/0/openstack/Vagrantfile
-  #
-  # os.openstack_auth_url
-  # os.endpoint_type
-  # os.flavor
-  # os.tenant_name
-  # os.username
-  # os.password
-  # os.networks
-  #
-  # If you are not using an SSH token / smartcard also set this
-  # os.key_name
-  # config.ssh.private_key_path -- set this outside the openstack block
-  #         in your base box
-  config.vm.provider :openstack do |os, override|
-    if ENV['BOX']
-      override.vm.box = ENV['BOX']
-    else
-      override.vm.box = 'dummy'
-    end
-    config.ssh.username = 'centos'
-    os.flavor = 'm1.small'
-
-    # require an IMAGE to be passed in
-    # IMAGE must be a human name and not an image ID!
-    if ENV['IMAGE']
-      os.image = ENV['IMAGE']
-    else
-      os.image = 'BAD IMAGE'
-      override.ssh.username = 'baduser'
-    end
-
-    case ENV['IMAGE']
-      when /.*ubuntu.*/i
-        override.ssh.username = 'ubuntu'
-
-      when /.*fedora.*/i
-        override.ssh.username = 'fedora'
-
-        # take care of the tty requirement by fedora for sudo
-        os.user_data = "#!/bin/bash
-/bin/sed -i 's/ requiretty/ !requiretty/' /etc/sudoers;"
-
-      when /.*centos.*/i
-        override.ssh.username = 'centos'
-
-        # take care of the tty requirement by centos for sudo
-        os.user_data = "#!/bin/bash
-/bin/sed -i 's/ requiretty/ !requiretty/' /etc/sudoers;"
-    end
-  end
-
-  # Explicitlly set default shared folder and load lib folder
-  config.vm.synced_folder ".", "/vagrant"
-  config.vm.synced_folder "../lib/", "/vagrant/lib"
-
-  # Do a full system update and enable enforcing if needed
-  config.vm.provision 'shell', path: '../lib/baseline.sh'
-
-  # run our bootstrapping
-  config.vm.provision 'shell', path: 'bootstrap.sh'
-
-  #################
-  # FINAL CLEANUP #
-  #################
-
-  # set RESEAL 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['RESEAL']
-    config.vm.provision 'shell', path: '../lib/system_reseal.sh'
-  end
-end

diff --git a/vagrant/lib/lf-networking/README.md b/vagrant/lib/lf-networking/README.md
deleted file mode 100644 (file)
index 9d1365f..0000000
--- a/vagrant/lib/lf-networking/README.md
+++ /dev/null
@@ -1,36 +0,0 @@
-lf-networking is the final overlay that is run on images to make them
-usable as Jenkins slaves in the OpenDaylight or ODLForge environments.
-
-Please see the rackspace-convert-base vagrant setup for creation of the
-needed base image or use one of the other vagrant configurations
-(utilizing a convert base image) for the source image.
-
-This vagrant expects (by default) a personal Rackspace image named
-
-'CentOS 6.5 - Vagrant ready'
-
-To spin up and utilize.
-
-$ RSIMAGE='${baseimagename}' vagrant up --provider=rackspace
-
-Will execute this vagrant against a differently named base image
-
-This vagrant requires that an environment variable of RSSUBDOMAIN be
-configured so that the networking configuration can be carried out
-properly as the process used makes it difficult at best and impossible
-at worst to detect what the final networking setups should be. This
-needs to be detected before we create the base image due to how
-cloud-init overwrites certain features we're trying to override and we
-therefore 'chattr +i' certain configuration files to keep it from
-breaking things.
-
-RSSUBDOMAIN may be (currently) one of the following options:
-
-dfw.opendaylight.org
-dfw.odlforge.org
-ord.opendaylight.org
-
-NOTE: This vagrant will always execute the resealing operation. This
-operation will intentially destroy current SSH pubkeys installed on the
-system as well as reset log files and network configurations. You have
-been warned.

diff --git a/vagrant/lib/lf-networking/Vagrantfile b/vagrant/lib/lf-networking/Vagrantfile
deleted file mode 100644 (file)
index a162628..0000000
--- a/vagrant/lib/lf-networking/Vagrantfile
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- 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|
-  config.vm.box = "dummy"
-
-  config.ssh.username = 'root'
-
-  config.vm.provider :rackspace do |rs|
-    rs.flavor = 'general1-1'
-
-    if ENV['RSIMAGE']
-      rs.image = ENV['RSIMAGE']
-    else
-      rs.image = 'CentOS 6.5 - Vagrant ready'
-    end
-
-    # allow for switching to ORD but default to DFW
-    if (ENV['RSREGION'] == 'ord')
-      rs.rackspace_region = :ord
-    else
-      rs.rackspace_region = :dfw
-    end
-  end
-
-  # explicitly configure shared folder syncs
-  config.vm.synced_folder '.', '/vagrant', :disabled => true
-  config.vm.synced_folder '..', '/vagrant/lib'
-
-  # reconfigure the network setup to support our special private setup
-  config.vm.provision 'shell', path: 'configure_lf_infra.sh', args: ENV['RSSUBDOMAIN']
-
-  # reseal the system for imaging
-  config.vm.provision 'shell', path: '../system_reseal.sh'
-end

diff --git a/vagrant/lib/lf-networking/confignetwork.pp b/vagrant/lib/lf-networking/confignetwork.pp
deleted file mode 100644 (file)
index e60df0c..0000000
--- a/vagrant/lib/lf-networking/confignetwork.pp
+++ /dev/null
@@ -1,132 +0,0 @@
-# make system modifications to handle being on a private Rackspace network
-
-# lint:ignore:80chars
-notice ("Operating system detected is: '${::operatingsystem} ${::operatingsystemrelease}'")
-# lint:endignore
-notice ("Subdomain being used is: '${::subdomain}'")
-
-# configure nameservers for domains
-case $::subdomain {
-  /^dfw\./: {
-    $ns1 = '72.3.128.241'
-    $ns2 = '72.3.128.240'
-    case $::subdomain {
-      /opendaylight/: {
-        $router = '10.30.11.1'
-      }
-      /odlforge/: {
-        $router = '10.30.12.1'
-      }
-      default: {
-        fail("Unrecognized subdomain ${::subdomain}")
-      }
-    }
-  }
-  /^ord\./: {
-    $ns1 = '173.203.4.9'
-    $ns2 = '173.203.4.8'
-    $router = '10.30.32.1'
-  }
-  default: {
-    fail("Unrecognized subdomain ${::subdomain}")
-  }
-}
-
-# dnsmasq
-class { 'dnsmasq': }
-
-# Setup dnsmasq special domain handlers
-dnsmasq::conf { 'LF-ns1':
-  ensure  => present,
-  content => 'server=/linux-foundation.org/172.17.192.30',
-}
-
-dnsmasq::conf { 'LF-ns2':
-  ensure  => present,
-  content => 'server=/linux-foundation.org/172.17.192.31',
-}
-
-dnsmasq::conf { 'ODL-ns1':
-  ensure  => present,
-  content => 'server=/opendaylight.org/172.17.192.30',
-}
-
-dnsmasq::conf { 'ODL-ns2':
-  ensure  => present,
-  content => 'server=/opendaylight.org/172.17.192.31',
-}
-
-dnsmasq::conf { 'ODLForge-ns1':
-  ensure  => present,
-  content => 'server=/odlforge.org/172.17.192.30',
-}
-
-dnsmasq::conf { 'ODLForge-ns2':
-  ensure  => present,
-  content => 'server=/odlforge.org/172.17.192.31',
-}
-
-# fix the resolver
-file { '/etc/resolv.conf':
-  content => "search ${::subdomain}
-nameserver 127.0.0.1
-nameserver ${ns1}
-nameserver ${ns2}
-options timeout:2
-",
-}
-
-file { '/etc/cloud/cloud.cfg.d/00_lf_resolv.cfg':
-  content => "#cloud-config
-
-manage_resolv_conf: true
-
-resolv_conf:
-  nameservers: ['127.0.0.1', '${ns1}', '${ns2}']
-  searchdomains:
-    - ${::subdomain}
-  options:
-    timeout: 2
-",
-}
-
-file_line { 'add_resolver':
-  path       => $::operatingsystem ? {
-    'Ubuntu' => '/etc/cloud/cloud.cfg',
-    default  => '/etc/cloud/cloud.cfg.d/10_rackspace.cfg',
-  },
-  line  => ' - resolv_conf',
-  after => ' - update_etc_hosts',
-}
-
-# OS specific configuration
-case $::operatingsystem {
-  'CentOS', 'Fedora', 'RedHat': {
-    file { '/etc/sysconfig/network-scripts/route-eth0':
-      content => "default via ${router} dev eth0",
-    }
-
-    # disable the DNS peerage so that our resolv.conf doesn't
-    # get destroyed
-    file_line { 'disable_peerdns':
-      path => '/etc/sysconfig/network',
-      line => 'PEERDNS=no',
-    }
-  }
-  'Ubuntu': {
-    file { '/etc/network/if-up.d/0000routing':
-      content => "#!/bin/sh\nip route add default via ${router} dev eth0",
-      mode    => '0755',
-    }
-
-    file { '/etc/resolvconf/resolv.conf.d/tail':
-      content => "# opendaylight dns
-nameserver ${ns1}
-nameserver ${ns2}
-",
-    }
-  }
-  default: {
-    notice ("${::operatingsystem} is not supported by this configuration")
-  }
-}

diff --git a/vagrant/lib/lf-networking/configure_lf_infra.sh b/vagrant/lib/lf-networking/configure_lf_infra.sh
deleted file mode 100644 (file)
index 06cac0f..0000000
--- a/vagrant/lib/lf-networking/configure_lf_infra.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/bash
-
-# script requires information about subdomain
-if [ -z "$1" ]; then
-    >&2 echo "Please provide the subdomain to Vagrant"
-    exit 1
-else
-    SUBDOM=$1
-fi
-
-
-all_systems() {
-    # install specific versions of puppet modules
-    puppet module install puppetlabs-stdlib -v 4.5.1
-    puppet module install puppetlabs-concat -v 1.2.0
-    #puppet module install lex-dnsmasq -v 2.6.1
-    puppet module install saz-dnsmasq -v 1.2.0
-
-    # write the subdomain information into a custom facter fact
-    mkdir -p /etc/facter/facts.d/
-    echo "subdomain=${SUBDOM}" > /etc/facter/facts.d/subdomain.txt
-
-    # final bits
-    puppet apply /vagrant/lib/lf-networking/confignetwork.pp
-
-}
-
-rh_systems_init() {
-    # remove current networking configurations
-    rm -f /etc/sysconfig/network-scripts/ifcfg-eth*
-}
-
-rh_systems_post() {
-    # don't let cloud-init do funny things to our routing
-    chattr +i /etc/sysconfig/network-scripts/route-eth0
-
-    # so that the network stack doesn't futz with our resolv config
-    # after we've configured it
-#    chattr +i /etc/resolv.conf
-}
-
-ubuntu_systems_post() {
-    # don't let cloud-init destroy our routing
-#    chattr +i /etc/network/if-up.d/0000routing
-    echo "---> do nothing for now"
-}
-
-# Execute setup that all systems need
-all_systems
-
-echo "---> Checking distribution"
-FACTER_OSFAMILY=`/usr/bin/facter osfamily`
-FACTER_OS=`/usr/bin/facter operatingsystem`
-case "$FACTER_OSFAMILY" in
-    RedHat)
-        rh_systems_init
-        rh_systems_post
-    ;;
-    Debian)
-        case "$FACTER_OS" in
-            Ubuntu)
-                echo "---> Ubuntu found"
-                ubuntu_systems_post
-            ;;
-            *)
-                "---> Nothing to do for ${FACTER_OS}"
-            ;;
-        esac
-    ;;
-    *)
-        echo "---> Unknown OS: ${FACTER_OSFAMILY}"
-    ;;
-esac
-
-# vim: sw=4 ts=4 sts=4 et :

diff --git a/vagrant/lib/system_reseal.sh b/vagrant/lib/system_reseal.sh
deleted file mode 100644 (file)
index 84b2953..0000000
--- a/vagrant/lib/system_reseal.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-# vim: sw=2 ts=2 sts=2 et :
-
-if [ -f /.autorelabel ]; then
-  echo "**********************************************"
-  echo "* SYSTEM REQUIRES RELABELING SKIPPING RESEAL *"
-  echo "*     PLEASE RESTART SYSTEM AND RERUN        *"
-  echo "*           PROVISIONING SCRIPTS             *"
-  echo "**********************************************"
-  exit 1;
-fi
-
-rm -rf /etc/Pegasus/*.cnf /etc/Pegasus/*.crt /etc/Pegasus/*.csr /etc/Pegasus/*.pem /etc/Pegasus/*.srl /root/anaconda-ks.cfg /root/anaconda-post.log /root/initial-setup-ks.cfg /root/install.log /root/install.log.syslog /var/cache/fontconfig/* /var/cache/gdm/* /var/cache/man/* /var/lib/AccountService/users/* /var/lib/fprint/* /var/lib/logrotate.status /var/log/*.log* /var/log/BackupPC/LOG /var/log/ConsoleKit/* /var/log/anaconda.syslog /var/log/anaconda/* /var/log/apache2/*_log /var/log/apache2/*_log-* /var/log/apt/* /var/log/aptitude* /var/log/audit/* /var/log/btmp* /var/log/ceph/*.log /var/log/chrony/*.log /var/log/cron* /var/log/cups/*_log /var/log/debug* /var/log/dmesg* /var/log/exim4/* /var/log/faillog* /var/log/gdm/* /var/log/glusterfs/*glusterd.vol.log /var/log/glusterfs/glusterfs.log /var/log/httpd/*log /var/log/installer/* /var/log/jetty/jetty-console.log /var/log/journal/* /var/log/lastlog* /var/log/libvirt/libvirtd.log /var/log/libvirt/lxc/*.log /var/log/libvirt/qemu/*.log /var/log/libvirt/uml/*.log /var/log/lightdm/* /var/log/mail/* /var/log/maillog* /var/log/messages* /var/log/ntp /var/log/ntpstats/* /var/log/ppp/connect-errors /var/log/rhsm/* /var/log/sa/* /var/log/secure* /var/log/setroubleshoot/*.log /var/log/spooler* /var/log/squid/*.log /var/log/syslog* /var/log/tallylog* /var/log/tuned/tuned.log /var/log/wtmp* /var/named/data/named.run
-
-rm -rf ~/.viminfo /etc/ssh/ssh*key* ~/.ssh/* /root/.ssh/* /home/$(logname)/.ssh/*
-
-# kill any cloud-init related bits
-rm -rf /var/lib/cloud/*
-
-# cleanup /vagrant
-rm -rf /vagrant
-
-# Force a system sync and sleep to get around any SSD issues
-echo "Forcing sync and sleep for 10sec"
-sync
-sleep 10
-
-echo "********************************************"
-echo "*   PLEASE SNAPSHOT IMAGE AT THIS TIME     *"
-echo "********************************************"

diff --git a/vagrant/ovsdb-devstack/README.md b/vagrant/ovsdb-devstack/README.md
deleted file mode 100644 (file)
index 70db039..0000000
--- a/vagrant/ovsdb-devstack/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-ovsdb-devstack can be used to take an already converted Rackspace native
-base image into a usuable DevStack base image for ODL DevStack testing.
-
-Please see the rackspace-convert-base vagrant setup for creation of the
-needed base image.
-
-This vagrant expects (by default) a personal image named
-
-'Fedora 20 (Heisenbug) - Vagrant ready'
-
-To spin up and utilize.
-
-$ RSIMAGE='${baseimage_name}' vagrant up --provider=rackspace
-
-Will execute this vagrant against a differently named base image
-
-$ RSRESEAL=true vagrant up --provider=rackspace
-
-NOTE: resealing will cause the vagrant to run the resealing operation.
-This operation will intentionally destroy current SSH pubkeys installed
-on the system as well as reset log files and network configurations. You
-have been warned.

diff --git a/vagrant/ovsdb-devstack/Vagrantfile b/vagrant/ovsdb-devstack/Vagrantfile
deleted file mode 100644 (file)
index 0622a7a..0000000
--- a/vagrant/ovsdb-devstack/Vagrantfile
+++ /dev/null
@@ -1,85 +0,0 @@
-# -*- 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 openstack provider dummy box
-  config.vm.box = "dummy"
-  config.ssh.username = 'root'
-
-  # make sure to set the following in your
-  # ~/.vagrant.d/boxes/dummy/0/openstack/Vagrantfile
-  #
-  # os.openstack_auth_url
-  # os.endpoint_type
-  # os.flavor
-  # os.tenant_name
-  # os.username
-  # os.password
-  # os.networks
-  #
-  # If you are not using an SSH token / smartcard also set this
-  # os.key_name
-  # config.ssh.private_key_path -- set this outside the openstack block
-  #         in your base box
-  config.vm.provider :openstack do |os, override|
-    if ENV['BOX']
-      override.vm.box = ENV['BOX']
-    else
-      override.vm.box = 'dummy'
-    end
-    config.ssh.username = 'centos'
-    os.flavor = 'm1.small'
-
-    # require an IMAGE to be passed in
-    # IMAGE must be a human name and not an image ID!
-    if ENV['IMAGE']
-      os.image = ENV['IMAGE']
-    else
-      os.image = 'BAD IMAGE'
-      override.ssh.username = 'baduser'
-    end
-
-    case ENV['IMAGE']
-      when /.*ubuntu.*/i
-        override.ssh.username = 'ubuntu'
-
-      when /.*fedora.*/i
-        override.ssh.username = 'fedora'
-
-        # take care of the tty requirement by fedora for sudo
-        os.user_data = "#!/bin/bash
-/bin/sed -i 's/ requiretty/ !requiretty/' /etc/sudoers;"
-
-      when /.*centos.*/i
-        override.ssh.username = 'centos'
-
-        # take care of the tty requirement by centos for sudo
-        os.user_data = "#!/bin/bash
-/bin/sed -i 's/ requiretty/ !requiretty/' /etc/sudoers;"
-    end
-  end
-
-  # Explicitlly set default shared folder and load lib folder
-  config.vm.synced_folder ".", "/vagrant"
-  config.vm.synced_folder "../lib/", "/vagrant/lib"
-
-  # Do a full system update and enable enforcing if needed
-  config.vm.provision 'shell', path: '../lib/baseline.sh'
-
-  # run our bootstrapping
-  config.vm.provision 'shell', path: 'bootstrap.sh'
-
-  #################
-  # FINAL CLEANUP #
-  #################
-
-  # set RESEAL 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['RESEAL']
-    config.vm.provision 'shell', path: '../lib/system_reseal.sh'
-  end
-end

diff --git a/vagrant/ubuntu-mininet-ovs-2.3/Vagrantfile b/vagrant/ubuntu-mininet-ovs-2.3/Vagrantfile
deleted file mode 100644 (file)
index cb6b627..0000000
--- a/vagrant/ubuntu-mininet-ovs-2.3/Vagrantfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# -*- 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 openstack provider dummy box
-  config.vm.box = "dummy"
-  config.ssh.username = 'root'
-
-  # make sure to set the following in your
-  # ~/.vagrant.d/boxes/dummy/0/openstack/Vagrantfile
-  #
-  # os.openstack_auth_url
-  # os.endpoint_type
-  # os.flavor
-  # os.tenant_name
-  # os.username
-  # os.password
-  # os.networks
-  #
-  # If you are not using an SSH token / smartcard also set this
-  # os.key_name
-  # config.ssh.private_key_path -- set this outside the openstack block
-  #         in your base box
-  config.vm.provider :openstack do |os, override|
-    if ENV['BOX']
-      override.vm.box = ENV['BOX']
-    else
-      override.vm.box = 'dummy'
-    end
-    config.ssh.username = 'centos'
-    os.flavor = 'm1.small'
-
-    # require an IMAGE to be passed in
-    # IMAGE must be a human name and not an image ID!
-    if ENV['IMAGE']
-      os.image = ENV['IMAGE']
-    else
-      os.image = 'BAD IMAGE'
-      override.ssh.username = 'baduser'
-    end
-
-    case ENV['IMAGE']
-      when /.*ubuntu.*/i
-        override.ssh.username = 'ubuntu'
-
-      when /.*fedora.*/i
-        override.ssh.username = 'fedora'
-
-        # take care of the tty requirement by fedora for sudo
-        os.user_data = "#!/bin/bash
-/bin/sed -i 's/ requiretty/ !requiretty/' /etc/sudoers;"
-
-      when /.*centos.*/i
-        override.ssh.username = 'centos'
-
-        # take care of the tty requirement by centos for sudo
-        os.user_data = "#!/bin/bash
-/bin/sed -i 's/ requiretty/ !requiretty/' /etc/sudoers;"
-    end
-  end
-
-  # Explicitlly set default shared folder and load lib folder
-  config.vm.synced_folder ".", "/vagrant"
-  config.vm.synced_folder "../lib/", "/vagrant/lib"
-
-  # Do a full system update and enable enforcing if needed
-  config.vm.provision 'shell', path: '../lib/baseline.sh'
-
-  # run our bootstrapping
-  config.vm.provision 'shell', path: 'bootstrap.sh'
-
-
-  #################
-  # 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/Vagrantfile b/vagrant/ubuntu-mininet/Vagrantfile
deleted file mode 100644 (file)
index cb6b627..0000000
--- a/vagrant/ubuntu-mininet/Vagrantfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# -*- 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 openstack provider dummy box
-  config.vm.box = "dummy"
-  config.ssh.username = 'root'
-
-  # make sure to set the following in your
-  # ~/.vagrant.d/boxes/dummy/0/openstack/Vagrantfile
-  #
-  # os.openstack_auth_url
-  # os.endpoint_type
-  # os.flavor
-  # os.tenant_name
-  # os.username
-  # os.password
-  # os.networks
-  #
-  # If you are not using an SSH token / smartcard also set this
-  # os.key_name
-  # config.ssh.private_key_path -- set this outside the openstack block
-  #         in your base box
-  config.vm.provider :openstack do |os, override|
-    if ENV['BOX']
-      override.vm.box = ENV['BOX']
-    else
-      override.vm.box = 'dummy'
-    end
-    config.ssh.username = 'centos'
-    os.flavor = 'm1.small'
-
-    # require an IMAGE to be passed in
-    # IMAGE must be a human name and not an image ID!
-    if ENV['IMAGE']
-      os.image = ENV['IMAGE']
-    else
-      os.image = 'BAD IMAGE'
-      override.ssh.username = 'baduser'
-    end
-
-    case ENV['IMAGE']
-      when /.*ubuntu.*/i
-        override.ssh.username = 'ubuntu'
-
-      when /.*fedora.*/i
-        override.ssh.username = 'fedora'
-
-        # take care of the tty requirement by fedora for sudo
-        os.user_data = "#!/bin/bash
-/bin/sed -i 's/ requiretty/ !requiretty/' /etc/sudoers;"
-
-      when /.*centos.*/i
-        override.ssh.username = 'centos'
-
-        # take care of the tty requirement by centos for sudo
-        os.user_data = "#!/bin/bash
-/bin/sed -i 's/ requiretty/ !requiretty/' /etc/sudoers;"
-    end
-  end
-
-  # Explicitlly set default shared folder and load lib folder
-  config.vm.synced_folder ".", "/vagrant"
-  config.vm.synced_folder "../lib/", "/vagrant/lib"
-
-  # Do a full system update and enable enforcing if needed
-  config.vm.provision 'shell', path: '../lib/baseline.sh'
-
-  # run our bootstrapping
-  config.vm.provision 'shell', path: 'bootstrap.sh'
-
-
-  #################
-  # 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