Merge "Also install ipaddr to robot system on CSIT start"
authorLuis Gomez <ecelgp@gmail.com>
Fri, 9 Oct 2015 01:33:54 +0000 (01:33 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 9 Oct 2015 01:33:54 +0000 (01:33 +0000)
jenkins-scripts/autorelease.sh
jenkins-scripts/ubuntu-docker-ovs.sh [new file with mode: 0644]
jjb/integration/integration-test-jobs.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services-more-lithium-redesign.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-flow-services-more.yaml [deleted file]
jjb/ovsdb/ovsdb.cfg
jjb/ovsdb/ovsdb.yaml
vagrant/gbp-ubuntu-docker-ovs-node/Vagrantfile [new file with mode: 0644]
vagrant/gbp-ubuntu-docker-ovs-node/bootstrap.sh [new file with mode: 0644]

index a02d8f2ba7adc1ce984ae9ec7188272c71aa6b53..6731e7ec062c9232b7a23f8c68141914e3121d72 100755 (executable)
@@ -2,6 +2,6 @@
 
 # Format and mount rackspace data disk
 mkfs -t ext3 /dev/xvde1
-mkdir /opt/jenkins/workspace
-mount /dev/xvde1 /opt/jenkins/workspace
-chown jenkins:jenkins /opt/jenkins/workspace
+mkdir /w/workspace
+mount /dev/xvde1 /w/workspace
+chown jenkins:jenkins /w/workspace
diff --git a/jenkins-scripts/ubuntu-docker-ovs.sh b/jenkins-scripts/ubuntu-docker-ovs.sh
new file mode 100644 (file)
index 0000000..4b442d9
--- /dev/null
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# add user jenkins to docker group
+/usr/sbin/usermod -a -G docker jenkins
+
+# pull docker images
+docker pull alagalah/odlpoc_ovs230
+
+# vim: sw=2 ts=2 sts=2 et :
+
index 630e6111bfd5b1fb64548a8947cdd676e3f0a3c0..f627a8ca37de8b4dbae808bfba1f9255e1c51d56 100644 (file)
@@ -35,8 +35,6 @@
                 nic-csit-1node-basic-only-{stream},
                 openflowplugin-csit-1node-flow-services-only-{stream},
                 openflowplugin-csit-1node-flow-services-all-{stream},
-                openflowplugin-csit-1node-flow-services-more-only-{stream},
-                openflowplugin-csit-1node-flow-services-more-all-{stream},
                 openflowplugin-csit-1node-scalability-only-{stream},
                 openflowplugin-csit-1node-scalability-all-{stream},
                 openflowplugin-csit-1node-cbench-performance-only-{stream},
@@ -84,8 +82,6 @@
                 nic-csit-1node-basic-only-{stream},
                 openflowplugin-csit-1node-flow-services-only-{stream},
                 openflowplugin-csit-1node-flow-services-all-{stream},
-                openflowplugin-csit-1node-flow-services-more-only-{stream},
-                openflowplugin-csit-1node-flow-services-more-all-{stream},
                 openflowplugin-csit-1node-scalability-only-{stream},
                 openflowplugin-csit-1node-scalability-all-{stream},
                 openflowplugin-csit-1node-cbench-performance-only-{stream},
 
     builders:
         - integration-install-robotframework
+        - inject:
+            properties-file: 'env.properties'
         - integration-get-slave-addresses
         - inject:
             properties-file: 'slave_addresses.txt'
         - inject:
             properties-file: 'bundle_vars.txt'
         - integration-deploy-controller-run-test
+        - integration-cleanup-tmp
 
     publishers:
         - integration-robot:
diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-more-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-more-lithium-redesign.yaml
deleted file mode 100644 (file)
index d22bb0a..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-- project:
-    name: openflowplugin-csit-flow-services-more-lithium-redesign
-    jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'flow-services-more-lithium-redesign'
-
-    # Project branches
-    stream:
-        - beryllium:
-            branch: 'master'
-        - stable-lithium:
-            branch: 'stable/lithium'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li'
-
-    # Robot custom options
-    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
deleted file mode 100644 (file)
index d4b4cc8..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-- project:
-    name: openflowplugin-csit-flow-services-more
-    jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'flow-services-more'
-
-    # Project branches
-    stream:
-        - beryllium:
-            branch: 'master'
-        - stable-lithium:
-            branch: 'stable/lithium'
-
-    install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui'
-
-    # Robot custom options
-    robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
index 800047c36eed0a50b261c330d02e6e53f9d6610a..3d5cc928acd19c52aa784d7a1cd7ce245ea6e60b 100644 (file)
@@ -1,9 +1,9 @@
 STREAMS:
-- clustering-lithium:
-    branch: topic/lithium/clustering
+- clustering-netvirt-lithium:
+    branch: topic/lithium/net-virt-clustering
     jdks: openjdk7
-- clustering-master:
-    branch: topic/master/clustering
+- clustering-netvirt-master:
+    branch: topic/master/net-virt-clustering
     jdks: openjdk7
 - neutron-yang-migration:
     branch: topic/master/neutron-yang-migration
index 855485fc03c48a47f2b1dd0f959ef4904690fdfe..a74cf3b3c9086a41f512dc7d013ea44004544cb6 100644 (file)
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - clustering-lithium:
-            branch: 'topic/lithium/clustering'
+        - clustering-netvirt-lithium:
+            branch: 'topic/lithium/net-virt-clustering'
             jdk: openjdk7
             jdks:
                 - openjdk7
-        - clustering-master:
-            branch: 'topic/master/clustering'
+        - clustering-netvirt-master:
+            branch: 'topic/master/net-virt-clustering'
             jdk: openjdk7
             jdks:
                 - openjdk7
diff --git a/vagrant/gbp-ubuntu-docker-ovs-node/Vagrantfile b/vagrant/gbp-ubuntu-docker-ovs-node/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/gbp-ubuntu-docker-ovs-node/bootstrap.sh b/vagrant/gbp-ubuntu-docker-ovs-node/bootstrap.sh
new file mode 100644 (file)
index 0000000..831a2d9
--- /dev/null
@@ -0,0 +1,32 @@
+#!/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
+
+echo "---> Installing Group Based Policy requirements"
+apt-get install -y software-properties-common -qq
+apt-get install -y python-software-properties -qq
+apt-get install -y python-pip -qq
+apt-get install -y python-virtualenv -qq
+apt-get install -y git-core git -qq
+apt-get install -y curl -qq
+apt-get install -y bridge-utils -qq
+
+# docker
+curl -sSL https://get.docker.com/ | sh
+
+# configure docker networking so that it does not conflict with LF internal networks
+# configure docker daemon to listen on port 5555 enabling remote managment
+cat <<EOL > /etc/default/docker
+# /etc/default/docker
+DOCKER_OPTS='-H unix:///var/run/docker.sock -H tcp://0.0.0.0:5555 --bip=10.250.0.254/24'
+EOL
+ip link set dev docker0 down
+brctl delbr docker0
+restart docker
+
+# OVS
+curl https://raw.githubusercontent.com/pritesh/ovs/nsh-v8/third-party/start-ovs-deb.sh | bash