Merge "Ignore all Vim tmp files in .gitignore"
authorAndrew Grimberg <agrimberg@linuxfoundation.org>
Tue, 3 Nov 2015 17:54:33 +0000 (17:54 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 3 Nov 2015 17:54:33 +0000 (17:54 +0000)
15 files changed:
jenkins-scripts/mininet-ubuntu.sh [new file with mode: 0755]
jenkins-scripts/ubuntu-docker-ovs.sh
jjb/aaa/aaa.yaml
jjb/armoury/armoury.yaml
jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
jjb/netconf/netconf-userfeatures.yaml [moved from jjb/controller/controller-csit-netconf.yaml with 51% similarity]
jjb/netide/netide.yaml
jjb/next/next.yaml
jjb/openflowplugin/openflowplugin-csit-clustering.yaml
jjb/snbi/snbi.yaml
jjb/tsdr/tsdr.yaml
jjb/usc/usc.cfg
jjb/usc/usc.yaml
vagrant/ubuntu-mininet/Vagrantfile [new file with mode: 0644]
vagrant/ubuntu-mininet/bootstrap.sh [new file with mode: 0644]

diff --git a/jenkins-scripts/mininet-ubuntu.sh b/jenkins-scripts/mininet-ubuntu.sh
new file mode 100755 (executable)
index 0000000..0b925bb
--- /dev/null
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# make sure we don't require tty for sudo operations
+cat <<EOF >/etc/sudoers.d/89-jenkins-user-defaults
+Defaults:jenkins !requiretty
+jenkins     ALL = NOPASSWD: ALL
+EOF
+
+# disable the firewall
+/bin/bash ./disable_firewall.sh
index 4c579478e97e0029e994ee97ee153e3d90e515f8..34f4c9b4c0a778883a82f9df0c136a8e50c645bb 100755 (executable)
@@ -19,7 +19,10 @@ jenkins     ALL=NOPASSWD: /usr/bin/ovs-vsctl
 jenkins     ALL=NOPASSWD: /usr/bin/ovs-ofctl
 jenkins     ALL=NOPASSWD: /usr/bin/ovs-dpctl
 jenkins     ALL=NOPASSWD: /sbin/ip
-jenkins     ALL=NOPASSWD: /var/run/netns
+jenkins     ALL=NOPASSWD: /bin/mkdir
+jenkins     ALL=NOPASSWD: /bin/ln
+jenkins     ALL=NOPASSWD: /bin/rm
+jenkins     ALL=NOPASSWD: /etc/init.d/openvswitch-switch
 EOF
 
 # vim: sw=2 ts=2 sts=2 et :
index 31881d47ab62f39bd49ced6ce884549fce6c4949..6f43ecb50d221032f6f731cf1fff881a5b2daf96 100644 (file)
@@ -23,6 +23,7 @@
             jdk: openjdk7
             jdks:
                 - openjdk7
+                - openjdk8
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
index 3840296bffe4d91425e99b3e7bb2317ba6a05ebf..0ba675db76f70782bed379c9e7e7e6a4ceaae715 100644 (file)
@@ -23,6 +23,7 @@
             jdk: openjdk7
             jdks:
                 - openjdk7
+                - openjdk8
 
     project: 'armoury'
 
index 59d34c17ad66ebd17998fb349cc393197c5d0fe7..4f8ac1b76f3aee25ed5d987c78621561af7dad63 100644 (file)
     install-features: 'odl-restconf,odl-bgpcep-pcep-all,odl-bgpcep-bgp-all,odl-netconf-connector-all,odl-bgpcep-data-change-counter'
 
     # Robot custom options
-    # Currently timeout values are calculated based on number of target prefixes
-    # and do not take into account test environment performance variation.
-    # FIXME: Add a new parameter to the test suite which allows to modify timeout if needed
-    robot-options: '-v COUNT:1000000 -v INSERT:10 -v WITHDRAW:9 -v PREFILL:10 -v UPDATE:single'
+    # Increase the TEST_DURATION_MULTIPLIER if the test runs in slower test environment or more complex scenario is chosen
+    robot-options: '-v COUNT:1000000 -v INSERT:10 -v WITHDRAW:9 -v PREFILL:10 -v UPDATE:single -v TEST_DURATION_MULTIPLIER:4'
 
     # Trigger jobs (daily)
     schedule: 'H H * * *'
similarity index 51%
rename from jjb/controller/controller-csit-netconf.yaml
rename to jjb/netconf/netconf-userfeatures.yaml
index 5ee1c4c33163e184b11a4f86957229fb356afc03..ec87dcf5ce5b1b882e5196d95ed68f64e2dbe36f 100644 (file)
@@ -1,14 +1,14 @@
 - project:
-    name: controller-csit-netconf
+    name: netconf-csit-userfeatures
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
-    project: 'controller'
+    project: 'netconf'
 
     # The functionality under test
-    functionality: 'netconf'
+    functionality: 'userfeatures'
 
     # Project branches
     stream:
         - all:
             scope: 'all'
 
+    # Tools system configuration (formerly "mininet configuration")
+    mininet-image: 'rk-c-el6-mininet'
+    mininet-vms: 1
+
     # Features to install
-    install-features: 'odl-netconf-connector-all,odl-restconf-all'
+    install-features: 'odl-restconf,odl-netconf-mdsal,odl-netconf-connector-all'
 
     # Robot custom options
     robot-options: '-v NETOPEER_USER:root'
 
     # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream}'
+    trigger-jobs: 'odlparent-distribution-{stream},yangtools-distribution-{stream},controller-distribution-{stream},mdsal-distribution-{stream}'
index 88f337dd9e2e5b1aabec3a51260a6dd9b2431383..fa93a0c65fcc77ef67d19346d3de26a8ecb56d26 100644 (file)
@@ -23,6 +23,7 @@
             jdk: openjdk7
             jdks:
                 - openjdk7
+                - openjdk8
 
     project: 'netide'
 
index d3891c21dbb7def8c96dc279f7323cc7d9025f8c..f4b8b5d428f54b8bd43c819406d7f32711ece632 100644 (file)
@@ -23,6 +23,7 @@
             jdk: openjdk7
             jdks:
                 - openjdk7
+                - openjdk8
 
     project: 'next'
 
index 846de68dd1a713422427245514ce1885251a97e6..e45214bdbe583c82fb52c3c62f1c839866b46e29 100644 (file)
@@ -19,7 +19,7 @@
             scope: 'only'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui'
+    install-features: 'odl-openflowplugin-flow-services-ui-li'
 
     # Robot custom options
     robot-options: ''
index cbecd9a8dc567b2c54a297ff72ffe665f78705f6..953354f3f6689a6ee55d768017b340166ec6d0f4 100644 (file)
@@ -23,6 +23,7 @@
             jdk: openjdk7
             jdks:
                 - openjdk7
+                - openjdk8
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
index 321b3da350177aa24c52b9d8a2e5ed012c5825a3..30eb25ab47fea049851054e5fe70a31f715dfd98 100644 (file)
@@ -23,6 +23,7 @@
             jdk: openjdk7
             jdks:
                 - openjdk7
+                - openjdk8
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
index 691d27ac24b9fd2a9d7deb7ef3c371ec1fe82908..a1883b379f8a5afcc38cfc655dd39bc271a216e5 100644 (file)
@@ -4,5 +4,5 @@ STREAMS:
     jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8,openjdk7
 DEPENDENCIES: controller,yangtools,odlparent
index b2a9cf573f0c4a49b41851dead69e306fd1209e7..bc09b1873bebdd4a3cca29160c01c1329d0f9246 100644 (file)
                 - openjdk8
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
+                - openjdk7
 
     project: 'usc'
 
diff --git a/vagrant/ubuntu-mininet/Vagrantfile b/vagrant/ubuntu-mininet/Vagrantfile
new file mode 100644 (file)
index 0000000..54b001f
--- /dev/null
@@ -0,0 +1,80 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby sw=2 ts=2 sts=2 et :
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  # root off of the rackspace provider dummy box
+  config.vm.box = "dummy"
+
+  # rackspace systems, even with cloud-init
+  # don't seem to have the cloud int user ${osname} (or similar)
+  # getting the ssh key for some reason, root does for sure
+  # so use that
+  config.ssh.username = 'root'
+
+  # Only baseline image should have config.ssh.pty = true
+  # Ensure we disable it.
+  config.ssh.pty = false
+
+  # make sure to set the following in your
+  # ~/.vagrant.d/boxes/dummy/0/rackspace/Vagrantfile
+  # rs.username
+  # rs.api_key
+  # rs.rackspace_region
+  #
+  # If you are not using an SSH token / smartcard also set this
+  # rs.key_name
+  # config.ssh.private_key_path -- set this outside the rackspace block
+  #         in your base box
+  config.vm.provider :rackspace do |rs|
+    # create these base builds always on the smallest system possible
+    rs.flavor = 'general1-1'
+
+    # allow for switching to ORD cloud but default to DFW
+    if (ENV['RSREGION'] == 'ord')
+      rs.rackspace_region = :ord
+    else
+      rs.rackspace_region = :dfw
+    end
+
+    # Default the Ubuntu 14.04 - Vagrant ready image unless overriden by a RSIMAGE
+    # environment variable
+    if ENV['RSIMAGE']
+      rs.image = ENV['RSIMAGE']
+    else
+      rs.image = 'Ubuntu 14.04 - Vagrant ready'
+    end
+  end
+
+  # Explicitlly set default shared folder and load lib folder
+  config.vm.synced_folder ".", "/vagrant"
+  config.vm.synced_folder "../lib/", "/vagrant/lib"
+
+  # run our bootstrapping for the system
+  config.vm.provision 'shell', path: 'bootstrap.sh'
+
+
+  #################
+  # LF NETWORKING #
+  #################
+
+  if ENV['LFNETWORK']
+    # reconfigure the network setup to support our special private setup
+    config.vm.provision 'shell', path: '../lib/lf-networking/configure_lf_infra.sh',
+      args: ENV['RSSUBDOMAIN']
+  end
+
+
+  #################
+  # FINAL CLEANUP #
+  #################
+
+  # set RSRESEAL to... anything if you want to snap an image of this box
+  # not setting the environment variable will cause the system to come
+  # up fully and not be in a resealable state
+  if ENV['RSRESEAL']
+    config.vm.provision 'shell', path: '../lib/system_reseal.sh'
+  end
+end
diff --git a/vagrant/ubuntu-mininet/bootstrap.sh b/vagrant/ubuntu-mininet/bootstrap.sh
new file mode 100644 (file)
index 0000000..324c56d
--- /dev/null
@@ -0,0 +1,97 @@
+#!/bin/bash
+
+# vim: sw=4 ts=4 sts=4 et tw=72 :
+
+echo "---> Updating operating system"
+apt-get update -qq
+apt-get upgrade -y --force-yes -qq
+
+# To handle the prompt style that is expected all over the environment
+# with how use use robotframework we need to make sure that it is
+# consistent for any of the users that are created during dynamic spin
+# ups
+echo 'PS1="[\u@\h \W]> "' >> /etc/skel/.bashrc
+
+# Install mininet
+# apt-get install -y --force-yes -qq mininet
+
+# Install mininet with OF13 patch
+cd /tmp
+cat > newOptions.patch <<EOF
+--- mininet/node.py     2014-09-12 13:48:03.165628683 +0100
++++ mininet/node.py     2014-09-12 13:50:39.021630236 +0100
+@@ -952,6 +952,10 @@
+            datapath: userspace or kernel mode (kernel|user)"""
+         Switch.__init__( self, name, **params )
+         self.failMode = failMode
++        protKey = 'protocols'
++        if self.params and protKey in self.params:
++               print 'have protcol params!'
++               self.opts += protKey + '=' + self.params[protKey]
+         self.datapath = datapath
+
+     @classmethod
+@@ -1027,8 +1031,9 @@
+         if self.datapath == 'user':
+             self.cmd( 'ovs-vsctl set bridge', self,'datapath_type=netdev' )
+         int( self.dpid, 16 ) # DPID must be a hex string
++        print 'OVSswitch opts: ',self.opts
+         self.cmd( 'ovs-vsctl -- set Bridge', self,
+-                  'other_config:datapath-id=' + self.dpid )
++                  self.opts+' other_config:datapath-id=' + self.dpid )
+         self.cmd( 'ovs-vsctl set-fail-mode', self, self.failMode )
+         for intf in self.intfList():
+             if not intf.IP():
+EOF
+
+git clone git://github.com/mininet/mininet
+cd mininet/
+git checkout -b 2.1.0 2.1.0
+git apply -p0 < ../newOptions.patch
+cd ./util
+./install.sh -nfv
+
+# Install CPqD
+apt-get install -y --force-yes -qq build-essential cmake flex
+apt-get install -y --force-yes -qq libpcre++-dev libxerces-c-dev libpcap-dev libboost-all-dev
+
+cd /tmp
+wget -nc http://de.archive.ubuntu.com/ubuntu/pool/main/b/bison/bison_2.5.dfsg-2.1_amd64.deb \
+         http://de.archive.ubuntu.com/ubuntu/pool/main/b/bison/libbison-dev_2.5.dfsg-2.1_amd64.deb
+
+dpkg -i bison_2.5.dfsg-2.1_amd64.deb libbison-dev_2.5.dfsg-2.1_amd64.deb
+rm bison_2.5.dfsg-2.1_amd64.deb libbison-dev_2.5.dfsg-2.1_amd64.deb
+
+wget -nc http://www.nbee.org/download/nbeesrc-jan-10-2013.zip
+unzip nbeesrc-jan-10-2013.zip
+cd nbeesrc-jan-10-2013/src
+cmake .
+make
+cp ../bin/libn*.so /usr/local/lib
+ldconfig
+cp -R ../include/* /usr/include/
+cd ../..
+
+git clone https://github.com/CPqD/ofsoftswitch13.git
+cd ofsoftswitch13
+./boot.sh
+./configure
+make
+make install
+cd ..
+
+# cbench installation for running openflow performance tests
+
+OF_DIR=$HOME/openflow  # Directory that contains OpenFlow code
+OFLOPS_DIR=$HOME/oflops  # Directory that contains oflops repo
+
+apt-get install -y --force-yes -qq libsnmp-dev libpcap-dev libconfig-dev
+
+git clone git://gitosis.stanford.edu/openflow.git $OF_DIR
+git clone https://github.com/andi-bigswitch/oflops.git $OFLOPS_DIR
+
+cd $OFLOPS_DIR
+./boot.sh
+./configure --with-openflow-src-dir=$OF_DIR
+make
+make install
\ No newline at end of file