From: Andrew Grimberg Date: Tue, 22 Sep 2015 14:34:27 +0000 (+0000) Subject: Merge "Create autorelease GT for site patches" X-Git-Tag: release/beryllium~512 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=0e348577f3d6f01198540ca7692fa234d42515ba;hp=4000c5094e824ca0124e2508c18290d2a9a7f507;p=releng%2Fbuilder.git Merge "Create autorelease GT for site patches" --- diff --git a/.gitignore b/.gitignore index a4ce88164..2cf4dca4e 100644 --- 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 5952c3244..893a04118 100755 --- 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 index 000000000..032c63d93 --- /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 c06bb2d5c..c9d31488c 100755 --- 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 3fbcd03f2..96eec7cd9 100755 --- 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 88dc83a69..26feb1d32 100755 --- 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 b4010f508..0d58aaf1e 100644 --- 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 0fd2f00de..31881d47a 100644 --- 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 335b8bdde..a9b907d29 100644 --- 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 07c4eb01d..9b2d23e99 100644 --- 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 4e7c0ed6c..280cf2937 100644 --- 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 3db2390d3..e05232f07 100644 --- 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 17c879569..2d1a4ff37 100644 --- 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 fb1059a72..f56cde1a9 100644 --- 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 8abdb9708..af1387513 100644 --- 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 a6bd3183f..c3127452e 100644 --- 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 b130b6968..2535ec7ab 100644 --- 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 c947497e0..a7b08ffbc 100644 --- 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 827cdf279..4eaa62c3b 100644 --- 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 6f6f848d4..847589e7e 100644 --- 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 6f64194a6..b557244ca 100644 --- 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 77db9db0b..4fa342c70 100644 --- 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 77eecbbe7..99fdc2dca 100644 --- 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 8d85b2a66..ccf7acc60 100644 --- 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 d3ef9cd66..5c09ecdbd 100644 --- 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 d0e9994a2..e26d23dee 100644 --- 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 1abceffd9..caf57691d 100644 --- 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 545808a36..0e8a23366 100644 --- 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 635b540de..febc1b346 100644 --- 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 26f782677..dc95a8bf5 100644 --- 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 7f35e0975..ea34e193d 100644 --- 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 4bdb41780..e538f2076 100644 --- 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 0ba2bbba6..a8825ace8 100644 --- 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 c59c510fd..b7815c7fc 100644 --- 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 0c3e6e3bb..eeb78bd66 100644 --- 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 3921d3265..88f337dd9 100644 --- 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 a986cdea5..74adb3296 100644 --- 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 b0557e8d8..d3891c21d 100644 --- 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 bd7d705ba..cc44d7063 100644 --- 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 ce56cd201..fb1e37caf 100644 --- 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 1ae7a9fda..d7b943000 100644 --- 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 df3ffb606..6288f6cec 100644 --- 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 cc4d3a272..052ecb248 100644 --- 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 b5df42b1b..9722d05b5 100644 --- 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 34a4bf4c3..7e8da50ac 100644 --- 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 cb02b3b30..be94aa540 100644 --- 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 aaad7d9bf..1aecbc477 100644 --- 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 0996063ff..d889dccde 100644 --- 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 040de5c9d..6216a98ae 100644 --- 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 efa8e971e..11bc33c3c 100644 --- 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 df2d8f28c..087529a71 100644 --- 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 537c67fcf..9e02770fa 100644 --- 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 9f136157a..2fa87272e 100644 --- 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 b73e8e31d..7a706e6d6 100644 --- 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 b32303601..cbecd9a8d 100644 --- 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 0d9094bfa..30c659bcd 100644 --- 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 40aa7e9d1..fd660b4fb 100644 --- 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 55bad376a..f4704f0dc 100644 --- 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 da586dca9..29950c1bc 100644 --- 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 ff93db542..207a39a7d 100644 --- 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 c1deb0506..0562e55c6 100644 --- 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 237b62f4d..321b3da35 100644 --- 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 92e9c82ff..167bc4d2c 100644 --- 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 8795dcb79..f0dfe91cd 100644 --- 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 63e56cd5a..b2a9cf573 100644 --- 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 b9bf2618e..a651080af 100644 --- 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 602da9c59..317a88bdf 100644 --- 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 ae70b1f3d..ec1f5fde6 100644 --- 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 6010b9c2c..be2006d64 100644 --- 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 53a5006d0..46e61bfd5 100644 --- 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 index 07a053177..000000000 --- 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 <> /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 53a5006d0..46e61bfd5 100644 --- 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 index 07a053177..000000000 --- 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 <> /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 53a5006d0..46e61bfd5 100644 --- 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 index 07a053177..000000000 --- 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 <> /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 53a5006d0..9fa6a79fc 100644 --- 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 index 07a053177..000000000 --- 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 <> /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 781b4f526..06cac0f77 100644 --- 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 87d60c305..4b7dd86ac 100644 --- 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 "********************************************"