Merge "Add ovsdb patch test job"

diff --git a/jenkins-scripts/robot.sh b/jenkins-scripts/robot.sh
index ecb371cf38610cbb6ec0e81af310e07b04aab642..31e81622ca51b3f7b4f631c8cf65ac34d9fe260f 100755 (executable)
--- a/jenkins-scripts/robot.sh
+++ b/jenkins-scripts/robot.sh
@@ -3,7 +3,7 @@
 # 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: /usr/bin/sshuttle, /usr/bin/kill, /usr/sbin/iptables
+jenkins     ALL = NOPASSWD: ALL
 EOF
 
 yum clean all

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index c976845af116913720bb828529f6d4cf48a94b7e..1c35df72e57e85cb73f8151b250b19ae70126e1a 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -30,7 +30,7 @@
 
     # Features to install
     # *-all is for Lithium and Beryllium, without -all is for Lithium and Boron.
-    install-features: 'odl-restconf,odl-bgpcep-pcep-all,odl-bgpcep-bgp-all,odl-bgpcep-bgp,odl-bgpcep-pcep,odl-netconf-connector-all,odl-bgpcep-bmp'
+    install-features: 'odl-restconf,odl-bgpcep-pcep-all,odl-bgpcep-bgp-all,odl-bgpcep-bgp,odl-bgpcep-pcep,odl-netconf-connector-all,odl-bgpcep-bmp,odl-jolokia'
 
     # Robot custom options
     robot-options: ''

diff --git a/jjb/eman/eman-csit-model.yaml b/jjb/eman/eman-csit-model.yaml
new file mode 100644 (file)
index 0000000..d984486
--- /dev/null
+++ b/jjb/eman/eman-csit-model.yaml
@@ -0,0 +1,32 @@
+- project:
+    name: eman-csit-model
+    jobs:
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
+
+    # The project name
+    project: 'eman'
+
+    # The functionality under test
+    functionality: 'model'
+
+    # Project branches
+    stream:
+        - boron:
+            branch: 'master'
+            jre: 'openjdk8'
+
+    install:
+        - only:
+            scope: 'only'
+        - all:
+            scope: 'all'
+
+    # Features to install
+    install-features: 'odl-restconf,odl-mdsal-apidocs,odl-eman-ui'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'eman-distribution-{stream}'

diff --git a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
index ce128be455e23d2874facf250b1a5970ec1ddde3..1480b46de698875f5b9b2560c1d6e1dbc3aa38b2 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
@@ -443,9 +443,11 @@ pybot -N ${TESTPLAN} -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} -v W
 
 echo "Tests Executed"
 DEVSTACK_TEMPEST_DIR="/opt/stack/tempest"
-ssh ${OPENSTACK_CONTROL_NODE_IP} "sudo sh -c '${DEVSTACK_TEMPEST_DIR}/.tox/tempest/bin/subunit-1to2 < ${DEVSTACK_TEMPEST_DIR}/.testrepository/0 > ${DEVSTACK_TEMPEST_DIR}/subunit_log.txt'"
-ssh ${OPENSTACK_CONTROL_NODE_IP} "sudo sh -c '${DEVSTACK_TEMPEST_DIR}/.tox/tempest/bin/python ${DEVSTACK_TEMPEST_DIR}/.tox/tempest/lib/python2.7/site-packages/os_testr/subunit2html.py ${DEVSTACK_TEMPEST_DIR}/subunit_log.txt ${DEVSTACK_TEMPEST_DIR}/tempest_results.html'"
-scp ${OPENSTACK_CONTROL_NODE_IP}:${DEVSTACK_TEMPEST_DIR}/tempest_results.html ${WORKSPACE}/
+if $(ssh ${OPENSTACK_CONTROL_NODE_IP} "sudo sh -c '[ -f ${DEVSTACK_TEMPEST_DIR}/.testrepository/0]"); then # if Tempest results exist
+    ssh ${OPENSTACK_CONTROL_NODE_IP} "sudo sh -c '${DEVSTACK_TEMPEST_DIR}/.tox/tempest/bin/subunit-1to2 < ${DEVSTACK_TEMPEST_DIR}/.testrepository/0 > ${DEVSTACK_TEMPEST_DIR}/subunit_log.txt'"
+    ssh ${OPENSTACK_CONTROL_NODE_IP} "sudo sh -c '${DEVSTACK_TEMPEST_DIR}/.tox/tempest/bin/python ${DEVSTACK_TEMPEST_DIR}/.tox/tempest/lib/python2.7/site-packages/os_testr/subunit2html.py ${DEVSTACK_TEMPEST_DIR}/subunit_log.txt ${DEVSTACK_TEMPEST_DIR}/tempest_results.html'"
+    scp ${OPENSTACK_CONTROL_NODE_IP}:${DEVSTACK_TEMPEST_DIR}/tempest_results.html ${WORKSPACE}/
+fi
 collect_logs_and_exit
 
 true  # perhaps Jenkins is testing last exit code

diff --git a/jjb/netvirt/include-raw-setup-docker.sh b/jjb/netvirt/include-raw-setup-docker.sh
index 2191c52aba2835cb70c64f3f237c331b49897f1d..c3ffa0fe68e02c500b70812b4710b6459ffde7b6 100644 (file)
--- a/jjb/netvirt/include-raw-setup-docker.sh
+++ b/jjb/netvirt/include-raw-setup-docker.sh
@@ -22,10 +22,6 @@ echo "---> Starting OVS $OVS_VERSION"
 /usr/bin/docker pull vpickard/openvswitch:$OVS_VERSION
 CID=$(/usr/bin/docker run -p 6641:6640 --privileged=true -d -i -t vpickard/openvswitch:$OVS_VERSION /usr/bin/supervisord)
 REALCID=`echo $CID | rev | cut -d ' ' -f 1 | rev`
-echo "---> Waiting to start OVS HW VTEP Emulator"
-sleep 5
-echo "---> Starting OVS HW VTEP Emulator"
-/usr/bin/docker exec $REALCID supervisorctl start ovs-vtep
 echo "CID=$REALCID" > env.properties
 echo "OVS_VERSION=${OVS_VERSION}" >> env.properties
 CONTROLLER_IP=`facter ipaddress`

diff --git a/jjb/netvirt/include-setup-hwvtep-docker.sh b/jjb/netvirt/include-setup-hwvtep-docker.sh
new file mode 100644 (file)
index 0000000..ed0f9c4
--- /dev/null
+++ b/jjb/netvirt/include-setup-hwvtep-docker.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+echo "---> Configuring OVS for HW VTEP Emulator"
+/usr/bin/docker exec $CID supervisorctl stop ovsdb-server
+/usr/bin/docker exec $CID supervisorctl start ovsdb-server-vtep
+/usr/bin/docker exec $CID ovs-vsctl add-br br-vtep
+/usr/bin/docker exec $CID ovs-vsctl add-port br-vtep eth0
+/usr/bin/docker exec $CID vtep-ctl add-ps br-vtep
+/usr/bin/docker exec $CID vtep-ctl add-port br-vtep eth0
+/usr/bin/docker exec $CID vtep-ctl set Physical_Switch br-vtep tunnel_ips=192.168.254.20
+/usr/bin/docker exec $CID vtep-ctl set-manager ptcp:6640
+sleep 5
+echo "---> Starting OVS HW VTEP Emulator"
+/usr/bin/docker exec $CID supervisorctl start ovs-vtep
+sleep 5

diff --git a/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml
index 05b2c12b278fca9cd11a3a8d0d169f3dbbbb97c5..a2f96288fb3dbcd81c4508a9bb7ed981befb6a4b 100644 (file)
--- a/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml
@@ -27,7 +27,7 @@
 
     openstack-vms: 3
 
-    install-features: 'odl-ovsdb-openstack'
+    install-features: 'odl-ovsdb-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
 
     schedule: 'H H * * *'
 

diff --git a/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
index 92f393df99517e1db793b7286d767e2489e2667d..f60426cea7b49b8c170ee13ade787132d3d06308 100644 (file)
--- a/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
@@ -27,7 +27,7 @@
 
     openstack-vms: 4
 
-    install-features: 'odl-ovsdb-openstack'
+    install-features: 'odl-ovsdb-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
 
     schedule: 'H H * * *'
 

diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml
index d50617f543237658c0e667d3eb5649b12a86cb35..42791179b72692a5d4ae079bf99086f8c53acebc 100644 (file)
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -18,7 +18,68 @@
                 - openjdk8
 
     project: 'netvirt'
-    archive-artifacts: 'docker-ovs-*.log'
+    archive-artifacts: '*.log'
+
+- builder:
+    name: netvirt-run-it
+    builders:
+        - maven-target:
+            maven-version: '{maven-version}'
+            pom: '{pomFile}'
+            goals: '-V -B verify -l {logfile} -Pintegrationtest -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -Dovsdb.controller.address=${{CONTROLLER_IP}}'
+            properties:
+                - 'ovsdbserver.ipaddress=127.0.0.1'
+                - 'ovsdbserver.port=6641'
+                - 'ovsdb.userspace.enabled=yes'
+                - 'maven.repo.local=/tmp/r'
+                - 'org.ops4j.pax.url.mvn.localRepository=/tmp/r'
+                - 'stream={stream}'
+            java-opts:
+                - '-Xmx1024m -XX:MaxPermSize=256m'
+            settings: 'netvirt-settings'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
+
+- builder:
+    name: run-net-virt-it
+    builders:
+        - netvirt-run-it:
+            maven-version: '{maven-version}'
+            stream: '{stream}'
+            pomFile: 'openstack/net-virt-it/pom.xml'
+            logfile: '{OVS_VERSION}-net-virt-IT.log'
+
+- builder:
+    name: run-netvirt-sfc-it
+    builders:
+        - netvirt-run-it:
+            maven-version: '{maven-version}'
+            stream: '{stream}'
+            pomFile: 'openstack/net-virt-sfc/it/pom.xml'
+            logfile: '{OVS_VERSION}-netvirt-sfc-IT.log'
+
+- builder:
+    name: run-netvirt-it
+    builders:
+        - inject:
+            properties-content: OVS_VERSION={OVS_VERSION}
+        - shell:
+            !include-raw-escape:
+                - include-raw-setup-docker.sh
+        - inject:
+            properties-file: env.properties
+        - run-net-virt-it:
+            OVS_VERSION: '{OVS_VERSION}'
+            maven-version: '{maven-version}'
+            stream: '{stream}'
+        - run-netvirt-sfc-it:
+            OVS_VERSION: '{OVS_VERSION}'
+            maven-version: '{maven-version}'
+            stream: '{stream}'
+        - shell:
+            !include-raw-escape:
+                - include-raw-cleanup-docker.sh
 
 - job-template:
     name: 'netvirt-daily-full-integration-{stream}'
@@ -27,29 +88,10 @@
     #     stream:    release stream (eg. stable-lithium or beryllium)
     #     branch:    git branch (eg. stable/lithium or master)
 
-    project-type: matrix
-    node: matrix_master
-    description: 'Integration tests for the netvirt project against different versions of OVS and branches. This job runs nightly. '
-    execution-strategy:
-        sequential: true
-
-    axes:
-        - axis:
-            type: user-defined
-            name: 'OVS_VERSION'
-            values:
-                - 2.3.3
-                - 2.4.0
-                - 2.5.0
-        - axis:
-            type: jdk
-            values: '{obj:jdks}'
-
-        - axis:
-            type: slave
-            name: nodes
-            values:
-                - centos7-docker-2c-4g
+    project-type: freestyle
+    node: centos7-docker-2c-4g
+    jdk: '{jdk}'
+    description: 'Integration tests for the Netvirt project against different versions of OVS and branches. This job runs nightly. '
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -95,19 +137,11 @@
 
     builders:
         - wipe-org-opendaylight-repo
-        - shell:
-            !include-raw-escape:
-                - include-raw-setup-docker.sh
-        - inject:
-            properties-file: env.properties
         - maven-target:
             maven-version: '{mvn33}'
             pom: 'pom.xml'
-            goals: 'clean install dependency:tree -V -B verify -Pintegrationtest -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -Dovsdb.controller.address=${{CONTROLLER_IP}}'
+            goals: '-V -B -l build.log clean install dependency:tree -Pq -Dmaven.compile.fork=true'
             properties:
-                - 'ovsdbserver.ipaddress=127.0.0.1'
-                - 'ovsdbserver.port=6641'
-                - 'ovsdb.userspace.enabled=yes'
                 - 'maven.repo.local=/tmp/r'
                 - 'org.ops4j.pax.url.mvn.localRepository=/tmp/r'
                 - 'stream={stream}'
@@ -117,9 +151,14 @@
             settings-type: cfp
             global-settings: 'odl-global-settings'
             global-settings-type: cfp
-        - shell:
-            !include-raw-escape:
-                - include-raw-cleanup-docker.sh
+        - run-netvirt-it:
+            maven-version: '{mvn33}'
+            stream: '{stream}'
+            OVS_VERSION: '2.4.0'
+        - run-netvirt-it:
+            maven-version: '{mvn33}'
+            stream: '{stream}'
+            OVS_VERSION: '2.5.0'
         - jacoco-nojava-workaround
 
     publishers:

diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml
index dea21204bb09997ece4464ee534274a84428f587..e6aac723b050a0ab60f011e6c384d527098d466a 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-clustering.yaml
+++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml
@@ -26,7 +26,7 @@
             scope: 'only'
 
     # Features to install
-    install-features: 'odl-ovsdb-southbound-impl-rest'
+    install-features: 'odl-ovsdb-southbound-impl-rest,decanter-collector-jmx,decanter-appender-elasticsearch'
 
     # Robot custom options
     robot-options: ''

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index 863c55435717589e1d39d654631fea674472ae10..5ef05ad31703198733e66450bbee25d4930f50aa 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -26,7 +26,7 @@
     archive-artifacts: '*.log'
 
 - builder:
-    name: run-it
+    name: ovsdb-run-it
     builders:
         - maven-target:
             maven-version: '{maven-version}'
@@ -49,7 +49,7 @@
 - builder:
     name: run-library-it
     builders:
-        - run-it:
+        - ovsdb-run-it:
             maven-version: '{maven-version}'
             stream: '{stream}'
             pomFile: 'library/it/pom.xml'
@@ -58,7 +58,7 @@
 - builder:
     name: run-southbound-it
     builders:
-        - run-it:
+        - ovsdb-run-it:
             maven-version: '{maven-version}'
             stream: '{stream}'
             pomFile: 'southbound/southbound-it/pom.xml'
@@ -67,7 +67,7 @@
 - builder:
     name: run-hwvtepsouthbound-it
     builders:
-        - run-it:
+        - ovsdb-run-it:
             maven-version: '{maven-version}'
             stream: '{stream}'
             pomFile: 'hwvtepsouthbound/hwvtepsouthbound-it/pom.xml'

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index af725dabc9dc26a3f15beee5dfe007ff09c41739..a350fd9ab42f73d80a79c50bf705073a9a4ccb13 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -58,11 +58,11 @@
                       pattern: jjb-templates/**
 
     builders:
+        - opendaylight-infra-pre-builders
         - shell: |
             pip freeze
             jenkins-jobs -l DEBUG test --recursive -o archives/job_output jjb/
             gzip archives/job_output/*
-
         - releng-check-unicode
 
     publishers:
@@ -122,6 +122,7 @@
 
 
     builders:
+        - opendaylight-infra-pre-builders
         - shell: |
             virtualenv $WORKSPACE/venv
             source $WORKSPACE/venv/bin/activate
@@ -188,6 +189,7 @@
                       pattern: jjb-templates/**
 
     builders:
+        - opendaylight-infra-pre-builders
         - shell: |
             pip freeze
             jenkins-jobs --version
@@ -236,6 +238,7 @@
         - timed: 'H H * * 0'
 
     builders:
+        - opendaylight-infra-pre-builders
         - shell: |
             jenkins-jobs --flush-cache update --recursive jjb/
 
@@ -272,6 +275,7 @@
         - timed: 'H H * * 1'
 
     builders:
+        - opendaylight-infra-pre-builders
         - shell:
             !include-raw-escape:
                 - include-raw-check-poms.sh

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 7bd3a04e76657cd10a139ec01720637f42c1c265..e8c072b29e79ac24fefa99b2f16a0ffe28c7cbb2 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -290,6 +290,19 @@
         - workspace-cleanup:
             fail-build: false
 
+- builder:
+    name: opendaylight-infra-pre-builders
+    builders:
+        - shell: |
+            if [ ! -z "$GERRIT_PATCHSET_REVISION" ]; then
+                LOG_MESSAGE="
+                    Logs for $JOB_NAME:
+                    https://logs.opendaylight.org/$SILO/$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER
+                    (note that logs will be unavailable until the job is completed running.)
+                "
+                ssh -p 29418 jenkins-$SILO@git.opendaylight.org gerrit review -m \"${LOG_MESSAGE}\" $GERRIT_PATCHSET_REVISION
+            fi
+
 - builder:
     name: wipe-org-opendaylight-repo
     builders:

diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml
index dda4674115dde2b91245c0373ddd397b30da9f46..2709065f0a6f626a9529873498545cf5403a9845 100644 (file)
--- a/jjb/releng-templates.yaml
+++ b/jjb/releng-templates.yaml
@@ -55,10 +55,10 @@
         - releng-stage-release
 
     publishers:
-        - archive-artifacts:
-            artifacts: '*.log'
         - email-notification:
             email-prefix: '[releng]'
+        - archive-build:
+            maven-version: '{mvn33}'
 
 
 - job-template:
@@ -108,6 +108,8 @@
     publishers:
         - email-notification:
             email-prefix: '[releng]'
+        - archive-build:
+            maven-version: '{mvn33}'
 
 # Python Related
 
@@ -193,6 +195,8 @@
     publishers:
         - email-notification:
             email-prefix: '[{project}]'
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: '{project-name}-merge-rtd-{stream}'
@@ -225,6 +229,8 @@
     publishers:
         - email-notification:
             email-prefix: '[{project}]'
+        - archive-build:
+            maven-version: '{mvn33}'
 
 # Node related
 
@@ -318,3 +324,5 @@
     publishers:
         - email-notification:
             email-prefix: '[{project}]'
+        - archive-build:
+            maven-version: '{mvn33}'

diff --git a/jjb/usecplugin/usecplugin-csit-basic.yaml b/jjb/usecplugin/usecplugin-csit-basic.yaml
index ef64a76ca63249dcee94efca48b1fe4138d0fe93..a611bead652c8194cc627bcd108bade72fd72451 100644 (file)
--- a/jjb/usecplugin/usecplugin-csit-basic.yaml
+++ b/jjb/usecplugin/usecplugin-csit-basic.yaml
@@ -26,7 +26,7 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf'
+    install-features: 'odl-restconf,odl-usecplugin-aaa,odl-usecplugin-openflow'
 
     # Robot custom options
     robot-options: ''