Merge "Create jjb for yang-push"

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index 478c942a9befab051f088ae5739b891b727fdcee..846de68dd1a713422427245514ce1885251a97e6 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -19,7 +19,7 @@
             scope: 'only'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-adsal-compatibility,odl-nsf-all'
+    install-features: 'odl-openflowplugin-flow-services-ui'
 
     # Robot custom options
     robot-options: ''

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-beryllium.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-beryllium.yaml
new file mode 100644 (file)
index 0000000..43a6de2
--- /dev/null
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-beryllium.yaml
@@ -0,0 +1,31 @@
+- project:
+    name: openflowplugin-csit-flow-services-beryllium
+    jobs:
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'flow-services'
+
+    # Project branches
+    stream:
+        - beryllium:
+            branch: 'master'
+
+    install:
+        - only:
+            scope: 'only'
+        - all:
+            scope: 'all'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui'
+
+    # Robot custom options
+    robot-options: '-e adsal'
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium.yaml
similarity index 90%
rename from jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
rename to jjb/openflowplugin/openflowplugin-csit-flow-services-lithium.yaml
index 6eb00a186a6c2cd9b638a429f68a3d5ffb076151..5c60f3874b8b9bbabdb55511e9721a58b8389e97 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-flow-services
+    name: openflowplugin-csit-flow-services-lithium
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-1node-{functionality}-{stream}'
@@ -12,8 +12,6 @@
 
     # Project branches
     stream:
-        - beryllium:
-            branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-more-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-more-lithium-redesign.yaml
index e208b1504be524a0a01166b79c7cab883da37634..d22bb0a60f1f73d22d9786192cb0a7d21a5d36b7 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-more-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-more-lithium-redesign.yaml
@@ -24,7 +24,7 @@
     install-features: 'odl-openflowplugin-flow-services-ui-li'
 
     # Robot custom options
-    robot-options: '-e adsal'
+    robot-options: ''
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-more.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-more.yaml
index 9db1756bb603d06ae3751674e1f2feddf0b80a50..a71b8ebe59afd949005374615c446151e06a2687 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-more.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-more.yaml
@@ -24,7 +24,7 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-adsal-compatibility,odl-nsf-all'
+    install-features: 'odl-openflowplugin-flow-services-ui'
 
     # Robot custom options
     robot-options: ''

diff --git a/vagrant/integration-robotframework/bootstrap.sh b/vagrant/integration-robotframework/bootstrap.sh
index c088f9cd266b5e30b7c015899192ae071681c7d5..f384118f2c0865c7ea93cb14b4d12e50578d33c8 100644 (file)
--- a/vagrant/integration-robotframework/bootstrap.sh
+++ b/vagrant/integration-robotframework/bootstrap.sh
@@ -11,7 +11,13 @@ yum install -q -y java-1.7.0-openjdk-devel git perl-XML-XPath
 
 # The following are known requirements for our robotframework environments
 yum install -q -y python-{devel,importlib,requests,setuptools,virtualenv,docker-py} \
-    robotframework{,-{httplibrary,requests,sshlibrary}}
+    robotframework{,-{httplibrary,requests,sshlibrary}} scapy
+
+# Install `udpreplay` to be used for (lispflowmapping) performance tests
+yum install -q -y libpcap-devel boost-devel
+git clone https://github.com/ska-sa/udpreplay.git &> /dev/null
+cd udpreplay
+make &> /dev/null && cp udpreplay /usr/local/bin
 
 # 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

diff --git a/vagrant/lib/lf-networking/confignetwork.pp b/vagrant/lib/lf-networking/confignetwork.pp
index b6cdd8aacb783fd9c027603c8e2258366b5e645a..e60df0cdf986b2efe6564a0b8c258b0b6cee2051 100644 (file)
--- a/vagrant/lib/lf-networking/confignetwork.pp
+++ b/vagrant/lib/lf-networking/confignetwork.pp
@@ -91,7 +91,10 @@ resolv_conf:
 }
 
 file_line { 'add_resolver':
-  path  => '/etc/cloud/cloud.cfg.d/10_rackspace.cfg',
+  path       => $::operatingsystem ? {
+    'Ubuntu' => '/etc/cloud/cloud.cfg',
+    default  => '/etc/cloud/cloud.cfg.d/10_rackspace.cfg',
+  },
   line  => ' - resolv_conf',
   after => ' - update_etc_hosts',
 }
@@ -115,6 +118,13 @@ case $::operatingsystem {
       content => "#!/bin/sh\nip route add default via ${router} dev eth0",
       mode    => '0755',
     }
+
+    file { '/etc/resolvconf/resolv.conf.d/tail':
+      content => "# opendaylight dns
+nameserver ${ns1}
+nameserver ${ns2}
+",
+    }
   }
   default: {
     notice ("${::operatingsystem} is not supported by this configuration")