Merge "Create autorelease GT for site patches"

diff --git a/.gitignore b/.gitignore
index a4ce88164d1372ac78c66b2ce69a84f90c7084b9..2cf4dca4e23170044477b83070b53c5589231fca 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,6 @@ jjb/*/releng-*.yaml
 # Maven
 target/
 
+# Vagrant
+.vagrant
 

diff --git a/jenkins-scripts/controller.sh b/jenkins-scripts/controller.sh
index 5952c3244292ccd7946fa35987e04ca23f4b31cc..893a04118a9bd9c55ae2a4a6af833fa089e0e0b4 100755 (executable)
--- a/jenkins-scripts/controller.sh
+++ b/jenkins-scripts/controller.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # disable the firewall
-service iptables stop
+/bin/bash ./disable_firewall.sh
 
 # install sshpass
 yum install -y sshpass

diff --git a/jenkins-scripts/disable_firewall.sh b/jenkins-scripts/disable_firewall.sh
new file mode 100755 (executable)
index 0000000..032c63d
--- /dev/null
+++ b/jenkins-scripts/disable_firewall.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+OS=`facter operatingsystem`
+
+case "$OS" in
+    Fedora)
+        systemctl stop firewalld
+    ;;
+    CentOS|RedHat)
+        if [ `facter operatingsystemrelease | cut -d '.' -f1` -lt "7" ]; then
+            service iptables stop
+        else
+            systemctl stop firewalld
+        fi
+    ;;
+    *)
+        # nothing to do
+    ;;
+esac
+
+# vim: ts=4 ts=4 sts=4 et :

diff --git a/jenkins-scripts/mininet-fedora.sh b/jenkins-scripts/mininet-fedora.sh
index c06bb2d5cb62a8cd55f7aeb2bd896d443abebb56..c9d31488c9fbe983317031e45959e73492615daf 100755 (executable)
--- a/jenkins-scripts/mininet-fedora.sh
+++ b/jenkins-scripts/mininet-fedora.sh
@@ -13,9 +13,6 @@ semanage port -a -t openvswitch_port_t -p tcp 6640
 semanage permissive -a openvswitch_t
 
 # make sure the firewall is stopped
-service iptables stop
-
-# stop firewall
-systemctl stop firewalld
+/bin/bash disable_firewall.sh
 
 # vim: sw=2 ts=2 sts=2 et :

diff --git a/jenkins-scripts/mininet.sh b/jenkins-scripts/mininet.sh
index 3fbcd03f2d78e1e9e036a9799d2eb7b0e3f4c29a..96eec7cd9907e87cb064c2cc8ac6fc2ada906b65 100755 (executable)
--- a/jenkins-scripts/mininet.sh
+++ b/jenkins-scripts/mininet.sh
@@ -56,6 +56,6 @@ echo 'jenkins' | passwd -f --stdin jenkins
 echo 'root' | passwd -f --stdin root
 
 # make sure the firewall is stopped
-service iptables stop
+/bin/bash disable_firewall.sh
 
 # vim: sw=2 ts=2 sts=2 et :

diff --git a/jenkins-scripts/robot.sh b/jenkins-scripts/robot.sh
index 88dc83a69a2417be99fd35d0e1362aee171d9b15..26feb1d322df63602321ad041efc91963cc02989 100755 (executable)
--- a/jenkins-scripts/robot.sh
+++ b/jenkins-scripts/robot.sh
@@ -35,7 +35,7 @@ python setup.py install > /dev/null 2>&1
 ## Install netcat & docker-py
 yum install -y -q nc python-docker-py
 
-# disable firewall rules
+# make sure the firewall is stopped
 service iptables stop
 
 # vim: sw=2 ts=2 sts=2 et :

diff --git a/jjb-templates/distribution.yaml b/jjb-templates/distribution.yaml
index b4010f5081b16c9b860e97b259145f5c70b8074f..0d58aaf1e9ac88cd47c0c284955e76130f644a38 100644 (file)
--- a/jjb-templates/distribution.yaml
+++ b/jjb-templates/distribution.yaml
@@ -17,7 +17,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 0fd2f00de5f3833288c9f0d4eec2006605e607c3..31881d47ab62f39bd49ced6ce884549fce6c4949 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -301,7 +301,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml
index 335b8bdde6a8bd5a82a3c7ea782b910706720933..a9b907d2908f29471cc802f0bae9f219beae2ff1 100644 (file)
--- a/jjb/alto/alto.yaml
+++ b/jjb/alto/alto.yaml
@@ -296,7 +296,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/armoury/armoury.yaml b/jjb/armoury/armoury.yaml
index 07c4eb01d459c4fb1c62678b0c7ba07237a04687..9b2d23e9930a15022a78418f024ecbd3468fa913 100644 (file)
--- a/jjb/armoury/armoury.yaml
+++ b/jjb/armoury/armoury.yaml
@@ -301,7 +301,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index 4e7c0ed6ce7c4477434920d75fab382180a188f8..280cf2937641722489e7becdaac678b99aaa6d29 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -303,7 +303,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index 3db2390d339937e5f19f465ffc777b8119636bc2..e05232f077fc5046419459c71ec03e86aac02e8a 100644 (file)
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -296,7 +296,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml
index 17c8795690f6aab03278bea9f9498ddb984a9257..2d1a4ff37c170a8aa5b875d20ebe4c4a78e2aac6 100644 (file)
--- a/jjb/centinel/centinel.yaml
+++ b/jjb/centinel/centinel.yaml
@@ -292,7 +292,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index fb1059a727bcdf45c4def06192ee9cfc0f0d4748..f56cde1a90f603ff9ca48bb732eed9e2c37232f2 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -303,7 +303,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
index 8abdb97084dcdfa5df259e12ce263bbe618eb098..af1387513c0e372d60a5639a78c722bcc71d3894 100644 (file)
--- a/jjb/coretutorials/coretutorials.yaml
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -296,7 +296,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/defense4all/defense4all.yaml b/jjb/defense4all/defense4all.yaml
index a6bd3183f2944e7f45ecf145ed01c57d15475225..c3127452ec2225ca9b9aaeca11625d845c25e378 100644 (file)
--- a/jjb/defense4all/defense4all.yaml
+++ b/jjb/defense4all/defense4all.yaml
@@ -301,7 +301,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml
index b130b6968b1ca01f0883854c960ec9c49153eb72..2535ec7ab402fd2806240e4a9b97c5a646ff1836 100644 (file)
--- a/jjb/didm/didm.yaml
+++ b/jjb/didm/didm.yaml
@@ -296,7 +296,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/discovery/discovery.yaml b/jjb/discovery/discovery.yaml
index c947497e0c6651210f93bfeca250a28d3d22c2d4..a7b08ffbcd561f7d16c3c0ba0d31cb1b7b4b961d 100644 (file)
--- a/jjb/discovery/discovery.yaml
+++ b/jjb/discovery/discovery.yaml
@@ -291,7 +291,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index 827cdf2792bcaa62fd441cad9a45c1d6cc260ec5..4eaa62c3b36d910be75e85f8ffa1f1da25ee95b6 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -301,7 +301,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/docs/docs.yaml b/jjb/docs/docs.yaml
index 6f6f848d4b5a902cf3e8608abf365d8ea10fbac5..847589e7eadcdd2700fb20a31712ce3351bd4e04 100644 (file)
--- a/jjb/docs/docs.yaml
+++ b/jjb/docs/docs.yaml
@@ -301,7 +301,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index 6f64194a650d79e630d34c0c65775aacf65ef5aa..b557244cab74e9c72be12dfcd7950c5f6d86de36 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -301,7 +301,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 77db9db0b434aa25cd6fef3f17b2db31abf36e4a..4fa342c7016d924d0cd41788812dea77c9c3c6dc 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -161,7 +161,7 @@
                 count: '{controller-vms}'
                 stop-on-terminate: False
             - '{mininet-image}':
-                cloud-name: 'Rackspace DFW - Integration Dynamic Lab'
+                cloud-name: '{mininet-cloud-name}'
                 count: '{mininet-vms}'
                 stop-on-terminate: False
 

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 77eecbbe726a35179d432e8664540a57fe02c8a0..99fdc2dca4840a53bc063a46f38b89d96e96bd20 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -68,6 +68,7 @@
             controller-vms: 1
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
+            mininet-cloud-name: '{mininet-cloud-name}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -139,6 +140,7 @@
             controller-vms: 1
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
+            mininet-cloud-name: '{mininet-cloud-name}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -236,6 +238,7 @@
             controller-vms: 1
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
+            mininet-cloud-name: '{mininet-cloud-name}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -307,6 +310,7 @@
             controller-vms: 1
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
+            mininet-cloud-name: '{mininet-cloud-name}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -401,6 +405,7 @@
             controller-vms: 1
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
+            mininet-cloud-name: '{mininet-cloud-name}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -492,6 +497,7 @@
             controller-vms: 3
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
+            mininet-cloud-name: '{mininet-cloud-name}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -564,6 +570,7 @@
             controller-vms: 3
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
+            mininet-cloud-name: '{mininet-cloud-name}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -660,6 +667,7 @@
             controller-vms: 3
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
+            mininet-cloud-name: '{mininet-cloud-name}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 8d85b2a66e4ba299238d791cd546dec6691c1a2b..ccf7acc60e6520672493e5f4032288523941fe60 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -233,6 +233,7 @@
             controller-vms: 1
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
+            mininet-cloud-name: '{mininet-cloud-name}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -362,6 +363,10 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
+        - gerrit-project-parameter:
+            project: '$GERRIT_PROJECT'
+        - gerrit-refspec-parameter:
+            refspec: '$GERRIT_REFSPEC'
         - project-parameter:
             project: '$GERRIT_PROJECT'
         - integration-distribution-git-url
@@ -405,6 +410,9 @@
         - inject:
             properties-file: 'bundle.txt'
         - wipe-org-opendaylight-repo
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{yangtools-settings}'
         - maven-target:
             maven-version: '{mvn33}'
             pom: '$GERRIT_PROJECT/pom.xml'

diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
index d3ef9cd66b69b4af504d4a4d65d4e32677f22dba..5c09ecdbd0531910a86eb4379d43f0e138b59d21 100644 (file)
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -298,7 +298,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index d0e9994a2de3b755ab9163159bf57a5b6d58b4f1..e26d23dee6b67dd340092343ab77897702b21630 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -301,7 +301,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index 1abceffd956525ee5ca548c651ff9c58837e62a9..caf57691d31f784b213baabe033b87b43f45ef46 100644 (file)
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -296,7 +296,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-all.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
similarity index 90%
rename from jjb/lispflowmapping/lispflowmapping-csit-all.yaml
rename to jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
index 545808a3617e88e2b47a8541b5fead5c27eb20d7..0e8a2336663121a9de26e43d5142baa13e8b2249 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-all.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
@@ -22,7 +22,7 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-lispflowmapping-all,odl-restconf,odl-mdsal-apidocs'
+    install-features: 'odl-lispflowmapping-msmr'
 
     # Robot custom options
     robot-options: ''

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index 635b540de29e56d505cafa89252c0c8d96689300..febc1b34614cd17d3916ddc6a323ceae8a506cff 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -303,7 +303,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/mdsal/mdsal.cfg b/jjb/mdsal/mdsal.cfg
index 26f782677c9426a9015bf8f47586bbde7aa5e06c..dc95a8bf5700d397c03c2b06494501124c8f1d8d 100644 (file)
--- a/jjb/mdsal/mdsal.cfg
+++ b/jjb/mdsal/mdsal.cfg
@@ -2,6 +2,6 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
-MVN_GOALS: clean install -Dintegrationtests
-MVN_OPTS: -Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true
+MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmaven.compile.fork=true clean install -Dintegrationtests
+MVN_OPTS: -Xmx2048m -XX:MaxPermSize=1024m
 DEPENDENCIES: odlparent,yangtools

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 7f35e09751741af5c5115bb626a3533dccb3cb77..ea34e193dfc4f1e16838635fcad0a1a2281d0fbb 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -96,9 +96,9 @@
         - maven-target:
             maven-version: '{mvn33}'
             pom: 'pom.xml'
-            goals: 'clean install -Dintegrationtests -Dstream={stream}'
+            goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmaven.compile.fork=true clean install -Dintegrationtests -Dstream={stream}'
             java-opts:
-                - '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+                - '-Xmx2048m -XX:MaxPermSize=1024m'
             settings: '{mdsal-settings}'
             global-settings: '{odl-global-settings}'
 
@@ -161,8 +161,8 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -Dintegrationtests -Dmerge -Dstream={stream}'
-        maven-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmaven.compile.fork=true clean install -Dintegrationtests -Dmerge -Dstream={stream}'
+        maven-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
         settings: '{mdsal-settings}'
         global-settings: '{odl-global-settings}'
         post-step-run-condition: UNSTABLE
@@ -260,8 +260,8 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -Dintegrationtests'
-        maven-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmaven.compile.fork=true clean install -Dintegrationtests'
+        maven-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
         settings: '{mdsal-settings}'
         global-settings: '{odl-global-settings}'
 
@@ -292,7 +292,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:
@@ -388,8 +388,8 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -Dintegrationtests'
-        maven-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmaven.compile.fork=true clean install -Dintegrationtests'
+        maven-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
         settings: '{mdsal-settings}'
         global-settings: '{odl-global-settings}'
 
@@ -445,8 +445,8 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -Dintegrationtests -Dsonar'
-        maven-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmaven.compile.fork=true clean install -Dintegrationtests -Dsonar'
+        maven-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
         settings: '{mdsal-settings}'
         global-settings: '{odl-global-settings}'
 

diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml
index 4bdb41780202b075a30b05faba158918ea23d01a..e538f2076f0153537d186c6b25b071cf2e47e415 100644 (file)
--- a/jjb/messaging4transport/messaging4transport.yaml
+++ b/jjb/messaging4transport/messaging4transport.yaml
@@ -292,7 +292,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml
index 0ba2bbba6810ad4399cfd3acb540b120a9f471b7..a8825ace8b137fda1ac2a6504322aa41df31817b 100644 (file)
--- a/jjb/nemo/nemo.yaml
+++ b/jjb/nemo/nemo.yaml
@@ -292,7 +292,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/netconf/netconf.cfg b/jjb/netconf/netconf.cfg
index c59c510fdaf1bca074ff994a7fb36c06d7d6948c..b7815c7fc5d01c46c165cb33957e1070e7f6999e 100644 (file)
--- a/jjb/netconf/netconf.cfg
+++ b/jjb/netconf/netconf.cfg
@@ -2,6 +2,6 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
-MVN_GOALS: clean install -Pintegrationtests
+MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests
 MVN_OPTS: -Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true
 DEPENDENCIES: aaa,controller,odlparent,yangtools

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index 0c3e6e3bb2586158f3e7bfa70707c97babdd1415..eeb78bd66c07af82579e2fbcceebaa35f0738ca9 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -96,7 +96,7 @@
         - maven-target:
             maven-version: '{mvn33}'
             pom: 'pom.xml'
-            goals: 'clean install -Pintegrationtests -Dstream={stream}'
+            goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests -Dstream={stream}'
             java-opts:
                 - '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
             settings: '{netconf-settings}'
@@ -161,7 +161,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -Pintegrationtests -Dmerge -Dstream={stream}'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests -Dmerge -Dstream={stream}'
         maven-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
         settings: '{netconf-settings}'
         global-settings: '{odl-global-settings}'
@@ -260,7 +260,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -Pintegrationtests'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests'
         maven-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
         settings: '{netconf-settings}'
         global-settings: '{odl-global-settings}'
@@ -292,7 +292,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:
@@ -388,7 +388,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -Pintegrationtests'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests'
         maven-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
         settings: '{netconf-settings}'
         global-settings: '{odl-global-settings}'
@@ -445,7 +445,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -Pintegrationtests -Dsonar'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests -Dsonar'
         maven-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
         settings: '{netconf-settings}'
         global-settings: '{odl-global-settings}'

diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml
index 3921d32659c9b62cb4a40487a67c077db95896b5..88f337dd9e2e5b1aabec3a51260a6dd9b2431383 100644 (file)
--- a/jjb/netide/netide.yaml
+++ b/jjb/netide/netide.yaml
@@ -291,7 +291,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index a986cdea5e514785077d7d457bd60ef7eebb126d..74adb32963bbbb6280098a40e5ff0da8da11d4f9 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -298,7 +298,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml
index b0557e8d8f74a3328582e97296f663ef1ba576fe..d3891c21dbb7def8c96dc279f7323cc7d9025f8c 100644 (file)
--- a/jjb/next/next.yaml
+++ b/jjb/next/next.yaml
@@ -291,7 +291,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml
index bd7d705ba0c94c12134e5a19bca14a800a21ee58..cc44d706373809e9bed3b613335ba1e79632fbde 100644 (file)
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -296,7 +296,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/odlparent/odlparent.cfg b/jjb/odlparent/odlparent.cfg
index ce56cd201f0fca48419975acb13d38af5817c762..fb1e37caf2cdd9bed100adfd3e110678c800d16f 100644 (file)
--- a/jjb/odlparent/odlparent.cfg
+++ b/jjb/odlparent/odlparent.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - beryllium:
     branch: master
-    jdks: openjdk7
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 1ae7a9fda53648c53dd48f6f69ad49965d193111..d7b943000a33599b7eef9fbf57a183a2fcfd32d2 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -23,6 +23,7 @@
             jdk: openjdk7
             jdks:
                 - openjdk7
+                - openjdk8
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
@@ -301,7 +302,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index df3ffb60669fa7fa9d6f096b9135ee920c157cfa..6288f6ceca3e9eee0e8b066d60b615f853ef5206 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -292,7 +292,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml
index cc4d3a272430c807babaf4ea91f0bddabe2b2305..052ecb248d6fd2b8679a11868543deddbd6f8628 100644 (file)
--- a/jjb/ofextensions/circuitsw/circuitsw.yaml
+++ b/jjb/ofextensions/circuitsw/circuitsw.yaml
@@ -292,7 +292,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml
index b5df42b1baae6ef491a3b28edfbcd2719a3cd8ae..9722d05b5dbfa2bf0ec0056849d2525d04bba853 100644 (file)
--- a/jjb/openflowjava/openflowjava.yaml
+++ b/jjb/openflowjava/openflowjava.yaml
@@ -303,7 +303,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 34a4bf4c36bdc74c062bc12144a32d72a147b81a..7e8da50ac7dce57e64ebc4d99c5f1543493b0697 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -305,7 +305,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/ovsdb/ovsdb.cfg b/jjb/ovsdb/ovsdb.cfg
index cb02b3b30185649b6541231d759add9aa41ad619..be94aa540e624a4845ac94b17b0153f38c0f7080 100644 (file)
--- a/jjb/ovsdb/ovsdb.cfg
+++ b/jjb/ovsdb/ovsdb.cfg
@@ -1,7 +1,13 @@
 STREAMS:
+- clustering-lithium:
+    branch: topic/lithium/clustering
+    jdks: openjdk7
+- clustering-master:
+    branch: topic/master/clustering
+    jdks: openjdk7,openjdk8
 - neutron-yang-migration:
     branch: topic/master/neutron-yang-migration
-    jdks: openjdk7
+    jdks: openjdk7,openjdk8
 - routermanager:
     branch: topic/routermanager
     jdks: openjdk7

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index aaad7d9bfbf65623b52632ac5472ae35b47fa839..1aecbc477390158324f1126aaf732ca4262702b7 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -17,11 +17,23 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - clustering-lithium:
+            branch: 'topic/lithium/clustering'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+        - clustering-master:
+            branch: 'topic/master/clustering'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
         - neutron-yang-migration:
             branch: 'topic/master/neutron-yang-migration'
             jdk: openjdk7
             jdks:
                 - openjdk7
+                - openjdk8
         - routermanager:
             branch: 'topic/routermanager'
             jdk: openjdk7
@@ -310,7 +322,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml
index 0996063ff6667ffaaed9d93264b643db4cbe7022..d889dccde341200965d6ac2406438175aae9f033 100644 (file)
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -301,7 +301,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml
index 040de5c9d7269a52a545e6eea906080f1259c4fc..6216a98aecc17c487c4a07461991968cf12d09a6 100644 (file)
--- a/jjb/persistence/persistence.yaml
+++ b/jjb/persistence/persistence.yaml
@@ -298,7 +298,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index efa8e971ea79dd7968d79211330619c989a926d3..11bc33c3c1296a0777c9087da4b4af5572b272f3 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -97,3 +97,4 @@
     # Mininet configuration
     mininet-image: 'rk-c-el6-mininet'
     mininet-vms: 1
+    mininet-cloud-name: 'Rackspace DFW - Integration Dynamic Lab'

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index df2d8f28cca0a4abedc7cb3ffaf3ea808bf174d7..087529a71b37d3844ddafafe9fe3a0a0b1e0426f 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -16,6 +16,22 @@
             default: '{branch}'
             description: "JJB configured GERRIT_BRANCH parameter"
 
+- parameter:
+    name: gerrit-project-parameter
+    parameters:
+        - string:
+            name: GERRIT_PROJECT
+            default: '{project}'
+            description: "GERRIT_PROJECT parameter if not given by trigger"
+
+- parameter:
+    name: gerrit-refspec-parameter
+    parameters:
+        - string:
+            name: GERRIT_REFSPEC
+            default: '{refspec}'
+            description: "GERRIT_REFSPEC parameter if not given by trigger"
+
 - scm:
     name: git-scm
     scm:

diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml
index 537c67fcf57a53ccc7fcfc38de0539aff875e672..9e02770fad49e8b75255e1550ba475553010f710 100644 (file)
--- a/jjb/reservation/reservation.yaml
+++ b/jjb/reservation/reservation.yaml
@@ -296,7 +296,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
index 9f136157a65b967b6730350c97ee3272e967ca31..2fa87272ef48193d1bf479de4b4607fff88fc610 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
@@ -303,7 +303,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index b73e8e31d976f61f6f0f899ab819d642e0ff2013..7a706e6d6dc8090281f463ec48b373ec012caa41 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -301,7 +301,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml
index b323036011813117a8a54d1d5a1312b578cbba95..cbecd9a8dc567b2c54a297ff72ffe665f78705f6 100644 (file)
--- a/jjb/snbi/snbi.yaml
+++ b/jjb/snbi/snbi.yaml
@@ -301,7 +301,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml
index 0d9094bfa73e6017eb149b8defd20c3db732221a..30c659bcd67aea7ad3e1e44d820d64c78e54bf3e 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -298,7 +298,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index 40aa7e9d1e9bd18f0f5f2b9c15f862075fc22bb8..fd660b4fb2f53cce3431131c542a1cc6a0969f6c 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -301,7 +301,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index 55bad376ae452c97e1ef7d76a9301430c2ceba7b..f4704f0dcff8f2254f6bf62722b803ef34b3133f 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -301,7 +301,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/tcpmd5/tcpmd5.yaml b/jjb/tcpmd5/tcpmd5.yaml
index da586dca94d098844377d505f5263249855c2561..29950c1bcf4393136bfdead7314a4a48e9f4d2b2 100644 (file)
--- a/jjb/tcpmd5/tcpmd5.yaml
+++ b/jjb/tcpmd5/tcpmd5.yaml
@@ -303,7 +303,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/toolkit/toolkit.yaml b/jjb/toolkit/toolkit.yaml
index ff93db54255bce896b38edca92649c380e3d682f..207a39a7ddcc6baab78ae467cc55dca665e27982 100644 (file)
--- a/jjb/toolkit/toolkit.yaml
+++ b/jjb/toolkit/toolkit.yaml
@@ -291,7 +291,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml
index c1deb0506f236f1b29d5aac19bbacf0d67ef118e..0562e55c66908971869ced8d25e212b7d0974a47 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.yaml
+++ b/jjb/topoprocessing/topoprocessing.yaml
@@ -298,7 +298,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index 237b62f4d9391fb9c21904771e509a1651bce34a..321b3da350177aa24c52b9d8a2e5ed012c5825a3 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -296,7 +296,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml
index 92e9c82ff5dcac129040112e3a53b8f32c7794fb..167bc4d2c5a126e05241ec67bc0ad2e1d9294982 100644 (file)
--- a/jjb/ttp/ttp.yaml
+++ b/jjb/ttp/ttp.yaml
@@ -301,7 +301,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index 8795dcb792139f400fe0f8f109e49a3e7e3334a5..f0dfe91cd06c833d28d193b859c4d54ba80c7447 100644 (file)
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -292,7 +292,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index 63e56cd5afd13bef10f4747e1478f088fa57bd52..b2a9cf573f0c4a49b41851dead69e306fd1209e7 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -298,7 +298,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml
index b9bf2618e52744a255ced092cca14a6ebb8a5469..a651080af5a78343f51fb96bed11994381811dc8 100644 (file)
--- a/jjb/usecplugin/usecplugin.yaml
+++ b/jjb/usecplugin/usecplugin.yaml
@@ -292,7 +292,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/vpnservice/vpnservice.yaml b/jjb/vpnservice/vpnservice.yaml
index 602da9c592340fc6b6bcffa45a86aaca57d3cea3..317a88bdf8918b50e7a3f8f082fb79cbf6c8e3d8 100644 (file)
--- a/jjb/vpnservice/vpnservice.yaml
+++ b/jjb/vpnservice/vpnservice.yaml
@@ -296,7 +296,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index ae70b1f3d3618a31dbf2c87733b7278d45ed30bc..ec1f5fde6cfc5298b831fdd9bebc9916f79ea7a3 100644 (file)
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -303,7 +303,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 6010b9c2c926edd96d2aa11875bd8080d64c30ef..be2006d64b67ba5135a9ce4e8e50b0ea41e174b9 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -227,7 +227,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:

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

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

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

diff --git a/vagrant/basic-mininet-node/system_reseal.sh b/vagrant/basic-mininet-node/system_reseal.sh
deleted file mode 100644 (file)
index 07a0531..0000000
--- a/vagrant/basic-mininet-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/integration-robotframework/Vagrantfile b/vagrant/integration-robotframework/Vagrantfile
index 53a5006d06dea258dca25fd527c950917ada88ec..9fa6a79fc482b9e0fbf1ec233fee62eaaa301427 100644 (file)
--- a/vagrant/integration-robotframework/Vagrantfile
+++ b/vagrant/integration-robotframework/Vagrantfile
@@ -50,13 +50,33 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     end
   end
 
-  # run our bootstrapping for the ovsdb-devstack system
+  # 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 robotframework system
   config.vm.provision 'shell', path: 'bootstrap.sh'
 
+
+  #################
+  # LF NETWORKING #
+  #################
+
+  if ENV['LFNETWORK']
+    # reconfigure the network setup to support our special private setup
+    config.vm.provision 'shell', path: '../lib/lf-networking/configure_lf_infra.sh',
+      args: ENV['RSSUBDOMAIN']
+  end
+
+
+  #################
+  # FINAL CLEANUP #
+  #################
+
   # set RSRESEAL to... anything if you want to snap an image of this box
   # not setting the environment variable will cause the system to come
   # up fully and not be in a resealable state
   if ENV['RSRESEAL']
-    config.vm.provision 'shell', path: 'system_reseal.sh'
+    config.vm.provision 'shell', path: '../lib/system_reseal.sh'
   end
 end

diff --git a/vagrant/integration-robotframework/system_reseal.sh b/vagrant/integration-robotframework/system_reseal.sh
deleted file mode 100644 (file)
index 07a0531..0000000
--- a/vagrant/integration-robotframework/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/lf-networking/README.md b/vagrant/lib/lf-networking/README.md
similarity index 100%
rename from vagrant/lf-networking/README.md
rename to vagrant/lib/lf-networking/README.md

diff --git a/vagrant/lf-networking/Vagrantfile b/vagrant/lib/lf-networking/Vagrantfile
similarity index 100%
rename from vagrant/lf-networking/Vagrantfile
rename to vagrant/lib/lf-networking/Vagrantfile

diff --git a/vagrant/lf-networking/confignetwork.pp b/vagrant/lib/lf-networking/confignetwork.pp
similarity index 100%
rename from vagrant/lf-networking/confignetwork.pp
rename to vagrant/lib/lf-networking/confignetwork.pp

diff --git a/vagrant/lf-networking/configure_lf_infra.sh b/vagrant/lib/lf-networking/configure_lf_infra.sh
similarity index 96%
rename from vagrant/lf-networking/configure_lf_infra.sh
rename to vagrant/lib/lf-networking/configure_lf_infra.sh
index 781b4f5264977fc60364e515f56e34fcac5f55d1..06cac0f77109f20b3a8690ecd1d8205cbdefc353 100644 (file)
--- a/vagrant/lf-networking/configure_lf_infra.sh
+++ b/vagrant/lib/lf-networking/configure_lf_infra.sh
@@ -21,7 +21,7 @@ all_systems() {
     echo "subdomain=${SUBDOM}" > /etc/facter/facts.d/subdomain.txt
 
     # final bits
-    puppet apply /vagrant/confignetwork.pp
+    puppet apply /vagrant/lib/lf-networking/confignetwork.pp
 
 }
 

diff --git a/vagrant/lf-networking/system_reseal.sh b/vagrant/lib/system_reseal.sh
similarity index 98%
rename from vagrant/lf-networking/system_reseal.sh
rename to vagrant/lib/system_reseal.sh
index 87d60c30582aea2c0175b459ec40da351e827a27..4b7dd86ac6ed9b6f686dde349af365455fcc91e6 100644 (file)
--- a/vagrant/lf-networking/system_reseal.sh
+++ b/vagrant/lib/system_reseal.sh
@@ -36,6 +36,9 @@ EOINT
   fi
 fi
 
+# cleanup /vagrant
+rm -rf /vagrant
+
 echo "********************************************"
 echo "*   PLEASE SNAPSHOT IMAGE AT THIS TIME     *"
 echo "********************************************"