Merge "Updates of slaves to EL7"
authorThanh Ha <thanh.ha@linuxfoundation.org>
Wed, 27 May 2015 13:45:14 +0000 (13:45 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Wed, 27 May 2015 13:45:14 +0000 (13:45 +0000)
15 files changed:
jenkins-scripts/mininet-fedora.sh [new file with mode: 0755]
jenkins-scripts/mininet.sh
jjb/bgpcep/bgpcep-csit-userfeatures.yaml [moved from jjb/bgpcep/bgpcep-csit-userfeatures-master.yaml with 83% similarity]
jjb/bgpcep/bgpcep-python.yaml
jjb/integration/integration-jobs.yaml
jjb/integration/integration-patch-test-stable-lithium.yaml [new file with mode: 0644]
jjb/openflowplugin/openflowplugin-csit-flow-services-more-lithium-redesign.yaml [new file with mode: 0644]
jjb/openflowplugin/openflowplugin-csit-flow-services-more-master.yaml [new file with mode: 0644]
jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml
jjb/snmp4sdn/snmp4sdn.cfg
jjb/snmp4sdn/snmp4sdn.yaml
vagrant/basic-mininet-fedora-node/README.md [new file with mode: 0644]
vagrant/basic-mininet-fedora-node/Vagrantfile [new file with mode: 0644]
vagrant/basic-mininet-fedora-node/bootstrap.sh [new file with mode: 0644]
vagrant/basic-mininet-fedora-node/system_reseal.sh [new file with mode: 0644]

diff --git a/jenkins-scripts/mininet-fedora.sh b/jenkins-scripts/mininet-fedora.sh
new file mode 100755 (executable)
index 0000000..5fc0579
--- /dev/null
@@ -0,0 +1,12 @@
+#!/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
+
+# make sure the firewall is stopped
+service iptables stop
+
+# vim: sw=2 ts=2 sts=2 et :
index 7f7a20e6f5e1b5f38d8e53d1209121afedeb6b33..552c40315409ca32c516746ff7256b6254280f5d 100755 (executable)
@@ -11,6 +11,11 @@ EOF
 # built, they are now. Make sure they're install
 yum install -q -y netopeer-server-sl CPqD-ofsoftswitch13
 
+# netaddr and ipaddress libraries can be useful on this system as
+# some tests are starting to push pyhon scripts/tools to this VM
+# during CI tests
+yum install -q -y python-{ipaddress,netaddr}
+
 # the vagrant configuration for netopeer doesn't configure SSH correctly
 # as it uses and here document via echo and not cat fix that
 cat << EOSSH >> /etc/ssh/sshd_config
similarity index 83%
rename from jjb/bgpcep/bgpcep-csit-userfeatures-master.yaml
rename to jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index 81bb0b86532cd3b6a316a715d1e85187cf25c672..8442d11dd63c18806b88859b8ca7f003eae794a6 100644 (file)
@@ -1,7 +1,8 @@
 - project:
-    name: bgpcep-csit-userfeatures-master
+    name: bgpcep-csit-userfeatures
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-{functionality}-{stream}'
 
     # The project name
     project: 'bgpcep'
@@ -13,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:
index 894f5ef5eebd2ef62c5d9b3ea54a971d244d98ed..14fe151731c985bbf8fda15d6ac95e8d25934534 100644 (file)
@@ -8,6 +8,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     project: 'bgpcep'
     jdk: 'openjdk7'
index de07e1d60672debbfff3f59cf189cf312357de6a..63b243db64486ee34a3a84af520b8a7886d20372 100644 (file)
         - integration-bundleurl:
             bundleurl: 'last'
 
+    triggers:
+        - timed: 'H H * * *'
+
     builders:
         - trigger-builds:
             - project: '{csit-list}'
diff --git a/jjb/integration/integration-patch-test-stable-lithium.yaml b/jjb/integration/integration-patch-test-stable-lithium.yaml
new file mode 100644 (file)
index 0000000..23f3f20
--- /dev/null
@@ -0,0 +1,91 @@
+- project:
+    name: integration-job-patch-test-stable-lithium
+    jobs:
+        - 'integration-patch-test-stable-lithium'
+
+    jdk: 'openjdk7'
+
+- job-template:
+    name: 'integration-patch-test-stable-lithium'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+        - integration-patch-git-url
+
+    scm:
+        - integration-gerrit-scm:
+            credentials-id: '{ssh-credentials}'
+            branch: 'stable/lithium'
+        - integration-git-scm:
+            credentials-id: '{ssh-credentials}'
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - gerrit:
+            server-name: 'OpenDaylight'
+            trigger-on:
+                - comment-added-contains-event:
+                    comment-contains-value: 'test-integration'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: '**'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/stable/lithium'
+            skip-vote:
+                successful: true
+                failed: true
+                unstable: true
+                notbuilt: true
+
+    prebuilders:
+        - integration-get-bundle-url
+        - inject:
+            properties-file: 'bundle.txt'
+        - wipe-org-opendaylight-repo
+        - maven-target:
+            maven-version: '{mvn32}'
+            pom: '$GERRIT_PROJECT/pom.xml'
+            goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r source:jar javadoc:jar'
+            java-opts:
+                - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+            settings: '{integration-settings}'
+            global-settings: '{odl-global-settings}'
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'integration/pom.xml'
+        goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+        ignore-upstream-changes: true
+
+    postbuilders:
+        - trigger-builds:
+            - project: 'integration-distribution-test-master'
+              block: true
+              predefined-parameters:
+                  BUNDLEURL=$BUNDLEURL
+
+    publishers:
+        - email-notification:
+            email-prefix: '[integration]'
+
diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-more-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-more-lithium-redesign.yaml
new file mode 100644 (file)
index 0000000..cf65bde
--- /dev/null
@@ -0,0 +1,28 @@
+- project:
+    name: openflowplugin-csit-flow-services-more-lithium-redesign
+    jobs:
+        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'flow-services-more-lithium-redesign'
+
+    # Project branches
+    stream:
+        - master:
+            branch: 'master'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui-li'
+
+    # 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-more-master.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-more-master.yaml
new file mode 100644 (file)
index 0000000..986c54e
--- /dev/null
@@ -0,0 +1,29 @@
+- project:
+    name: openflowplugin-csit-flow-services-more-master
+    jobs:
+        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'flow-services-more'
+
+    # Project branches
+    stream:
+        - master:
+            branch: 'master'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-adsal-compatibility,odl-nsf-all'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
+
index 449667778659fcbf96e3c129a47eba939216b5e0..19ac1888979ab194776284a2e4ff501f8bdf3e2f 100644 (file)
@@ -25,5 +25,5 @@
     robot-options: ''
 
     # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
+    trigger-jobs: ''
 
index 55f4493e1837898dde603f8209ad34c80fabdacd..c4c115a32a00f3fa80d32ef748ac85e16d7637d5 100644 (file)
@@ -1 +1,8 @@
+BRANCHES:
+- master:
+    jdks: openjdk7
+- stable/helium:
+    jdks: openjdk7
+- stable/lithium:
+    jdks: openjdk7
 DEPENDENCIES: odlparent,controller,yangtools
index f593d16b1e68fd4893d9a55c5be7a5fe7e60b531..3217d05d5753955f86cb9e6e9adfb388df39f760 100644 (file)
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'snmp4sdn'
 
diff --git a/vagrant/basic-mininet-fedora-node/README.md b/vagrant/basic-mininet-fedora-node/README.md
new file mode 100644 (file)
index 0000000..16a6fe2
--- /dev/null
@@ -0,0 +1,23 @@
+basic-mininet-fedora-node can be used to take an already converted
+Rackspace native base image to a basic system with mininet and other
+test tools for use in the OpenDaylight build and testing environment
+
+Please see the rackspace-convert-base vagrant setup for creation of the
+needed base image.
+
+This vagrant expects (by default) a personal Rackspace image named
+
+'Fedora 21 - Vagrant ready'
+
+To spin up and utilize.
+
+$ RSIMAGE='${baseimagename}' vagrant up --provider=rackspace
+
+Will execute this vagrant against a differently named base image
+
+$ RSRESEAL=true vagrant up --provider=rackspace
+
+NOTE: resealing will cause the vagrant to run the resealing operation.
+This operation will intentionally destroy current SSH pubkeys installed
+on the system as well as reset log files and network configurations. You
+have been warned.
diff --git a/vagrant/basic-mininet-fedora-node/Vagrantfile b/vagrant/basic-mininet-fedora-node/Vagrantfile
new file mode 100644 (file)
index 0000000..f9476a8
--- /dev/null
@@ -0,0 +1,62 @@
+# -*- 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'
+
+  # Fedora and EL systems default to requiring tty for sudo
+  # This should have been disabled with the Vagrant ready
+  # base box conversion (see rackspace-convert-base vagrant)
+  # but just to be safe
+  config.ssh.pty = true
+
+  # 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 Fedora 21 - Vagrant ready image unless overriden by a RSIMAGE
+    # environment variable
+    if ENV['RSIMAGE']
+      rs.image = ENV['RSIMAGE']
+    else
+      rs.image = 'Fedora 21 - Vagrant ready'
+    end
+  end
+
+  # run our bootstrapping for the ovsdb-devstack system
+  config.vm.provision 'shell', path: 'bootstrap.sh'
+
+  # 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'
+  end
+end
diff --git a/vagrant/basic-mininet-fedora-node/bootstrap.sh b/vagrant/basic-mininet-fedora-node/bootstrap.sh
new file mode 100644 (file)
index 0000000..fcf2458
--- /dev/null
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# vim: sw=4 ts=4 sts=4 et tw=72 :
+
+# update os
+yum clean all
+yum update -q -y
+
+# install mininet
+git clone git://github.com/mininet/mininet
+cd mininet
+git checkout -b 2.2.1 2.2.1
+cd ..
+mininet/util/install.sh -nf
+
diff --git a/vagrant/basic-mininet-fedora-node/system_reseal.sh b/vagrant/basic-mininet-fedora-node/system_reseal.sh
new file mode 100644 (file)
index 0000000..ba54ce2
--- /dev/null
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# 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*
+
+echo "********************************************"
+echo "*   PLEASE SNAPSHOT IMAGE AT THIS TIME     *"
+echo "********************************************"