Merge "Find major version from stream, avoid mismatches"

diff --git a/jjb/generate-csit-status-report.sh b/jjb/generate-csit-status-report.sh
new file mode 100644 (file)
index 0000000..dc87537
--- /dev/null
+++ b/jjb/generate-csit-status-report.sh
@@ -0,0 +1,67 @@
+#!/bin/bash
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2017 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+# Create a python script to parse a Jenkins build for sub-project status
+
+script=$(mktemp)
+
+cat > $script <<EOF
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2017 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+
+__author__ = 'Thanh Ha'
+
+
+import sys
+
+from bs4 import BeautifulSoup
+import requests
+
+
+build_url = sys.argv[1]
+urlparse = requests.utils.urlparse(build_url)
+jenkins_url = "{}://{}".format(urlparse.scheme, urlparse.netloc)
+
+page = requests.get(build_url)
+soup = BeautifulSoup(page.text, 'html.parser')
+links = soup.findAll("a", { "class" : "model-link" })
+
+_file = open('csit_failed_tests.txt', 'w+')
+
+for link in links:
+    if link.img and (link.img['alt'] == 'Unstable' or
+                     link.img['alt'] == 'Failed' or
+                     link.img['alt'] == 'Aborted'):
+
+        url = link['href']
+        project = url.split('/')[3].split('-')[0]
+        _file.write("{}\t{}{}\n".format(project, jenkins_url, url))
+
+_file.close()
+EOF
+
+virtualenv --quiet "/tmp/v/jenkins"
+# shellcheck source=/tmp/v/jenkins/bin/activate disable=SC1091
+source "/tmp/v/jenkins/bin/activate"
+pip install --quiet --upgrade pip
+pip install --quiet --upgrade tox beautifulsoup4 requests
+
+echo python "$script" "$BUILD_URL"
+python "$script" "$BUILD_URL"
+
+mkdir -p "$WORKSPACE/archives"
+mv csit_failed_tests.txt "$WORKSPACE/archives"

diff --git a/jjb/integration/csit-jobs-boron.lst b/jjb/integration/csit-jobs-boron.lst
index ea72dcd4ff4786dbaa862bd98950f639f099ef8b..a798ff273d3effd15c0823cdeb0032053167ce5d 100644 (file)
--- a/jjb/integration/csit-jobs-boron.lst
+++ b/jjb/integration/csit-jobs-boron.lst
@@ -99,9 +99,17 @@ netvirt-csit-3node-openstack-ocata-upstream-learn-boron,
 netvirt-csit-3node-openstack-ocata-upstream-stateful-boron,
 netvirt-csit-3node-openstack-ocata-upstream-stateful-snat-conntrack-boron,
 netvirt-csit-3node-openstack-ocata-upstream-transparent-boron,
+netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-learn-boron,
+netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-stateful-boron,
 netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-transparent-boron,
+netvirt-csit-hwvtep-1node-openstack-newton-upstream-learn-boron,
+netvirt-csit-hwvtep-1node-openstack-newton-upstream-stateful-boron,
 netvirt-csit-hwvtep-1node-openstack-newton-upstream-transparent-boron,
+netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-learn-boron,
+netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-stateful-boron,
 netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-transparent-boron,
+netvirt-csit-hwvtep-3node-openstack-newton-upstream-learn-boron,
+netvirt-csit-hwvtep-3node-openstack-newton-upstream-stateful-boron,
 netvirt-csit-hwvtep-3node-openstack-newton-upstream-transparent-boron,
 netvirt-legacy-csit-1node-openstack-basic-all-boron,
 netvirt-legacy-csit-1node-openstack-basic-only-boron,

diff --git a/jjb/integration/csit-jobs-carbon.lst b/jjb/integration/csit-jobs-carbon.lst
index 6e199079a2c81bce742f0e67ff2429a6a33e26b3..018e67cd1b4a5c8f2a811d5083d5826d0453a27f 100644 (file)
--- a/jjb/integration/csit-jobs-carbon.lst
+++ b/jjb/integration/csit-jobs-carbon.lst
@@ -107,9 +107,17 @@ netvirt-csit-3node-openstack-ocata-upstream-learn-carbon,
 netvirt-csit-3node-openstack-ocata-upstream-stateful-carbon,
 netvirt-csit-3node-openstack-ocata-upstream-stateful-snat-conntrack-carbon,
 netvirt-csit-3node-openstack-ocata-upstream-transparent-carbon,
+netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-learn-carbon,
+netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-stateful-carbon,
 netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-transparent-carbon,
+netvirt-csit-hwvtep-1node-openstack-newton-upstream-learn-carbon,
+netvirt-csit-hwvtep-1node-openstack-newton-upstream-stateful-carbon,
 netvirt-csit-hwvtep-1node-openstack-newton-upstream-transparent-carbon,
+netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-learn-carbon,
+netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-stateful-carbon,
 netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-transparent-carbon,
+netvirt-csit-hwvtep-3node-openstack-newton-upstream-learn-carbon,
+netvirt-csit-hwvtep-3node-openstack-newton-upstream-stateful-carbon,
 netvirt-csit-hwvtep-3node-openstack-newton-upstream-transparent-carbon,
 nic-csit-1node-basic-all-carbon,
 nic-csit-1node-basic-only-carbon,

diff --git a/jjb/integration/csit-jobs-nitrogen.lst b/jjb/integration/csit-jobs-nitrogen.lst
index be0e03f8e05a2cb92638c381d8b7e8e16cac305d..e0daa41f41490d6bb59c9ec9b5df39780d43c051 100644 (file)
--- a/jjb/integration/csit-jobs-nitrogen.lst
+++ b/jjb/integration/csit-jobs-nitrogen.lst
@@ -101,9 +101,17 @@ netvirt-csit-3node-openstack-ocata-upstream-learn-nitrogen,
 netvirt-csit-3node-openstack-ocata-upstream-stateful-nitrogen,
 netvirt-csit-3node-openstack-ocata-upstream-stateful-snat-conntrack-nitrogen,
 netvirt-csit-3node-openstack-ocata-upstream-transparent-nitrogen,
+netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-learn-nitrogen,
+netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-stateful-nitrogen,
 netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-transparent-nitrogen,
+netvirt-csit-hwvtep-1node-openstack-newton-upstream-learn-nitrogen,
+netvirt-csit-hwvtep-1node-openstack-newton-upstream-stateful-nitrogen,
 netvirt-csit-hwvtep-1node-openstack-newton-upstream-transparent-nitrogen,
+netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-learn-nitrogen,
+netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-stateful-nitrogen,
 netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-transparent-nitrogen,
+netvirt-csit-hwvtep-3node-openstack-newton-upstream-learn-nitrogen,
+netvirt-csit-hwvtep-3node-openstack-newton-upstream-stateful-nitrogen,
 netvirt-csit-hwvtep-3node-openstack-newton-upstream-transparent-nitrogen,
 nic-csit-1node-basic-all-nitrogen,
 nic-csit-1node-basic-only-nitrogen,

diff --git a/jjb/integration/csit-jobs-oxygen.lst b/jjb/integration/csit-jobs-oxygen.lst
index 5cd8fa82e32fda623ab2d2e93f683cfc030754b2..393f32d0561d0b3b8a1f943ad61b4fb27fa8163d 100644 (file)
--- a/jjb/integration/csit-jobs-oxygen.lst
+++ b/jjb/integration/csit-jobs-oxygen.lst
@@ -98,9 +98,17 @@ netvirt-csit-3node-openstack-ocata-upstream-learn-oxygen,
 netvirt-csit-3node-openstack-ocata-upstream-stateful-oxygen,
 netvirt-csit-3node-openstack-ocata-upstream-stateful-snat-conntrack-oxygen,
 netvirt-csit-3node-openstack-ocata-upstream-transparent-oxygen,
+netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-learn-oxygen,
+netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-stateful-oxygen,
 netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-transparent-oxygen,
+netvirt-csit-hwvtep-1node-openstack-newton-upstream-learn-oxygen,
+netvirt-csit-hwvtep-1node-openstack-newton-upstream-stateful-oxygen,
 netvirt-csit-hwvtep-1node-openstack-newton-upstream-transparent-oxygen,
+netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-learn-oxygen,
+netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-stateful-oxygen,
 netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-transparent-oxygen,
+netvirt-csit-hwvtep-3node-openstack-newton-upstream-learn-oxygen,
+netvirt-csit-hwvtep-3node-openstack-newton-upstream-stateful-oxygen,
 netvirt-csit-hwvtep-3node-openstack-newton-upstream-transparent-oxygen,
 nic-csit-1node-basic-all-oxygen,
 nic-csit-1node-basic-only-oxygen,

diff --git a/jjb/integration/integration-deploy-controller-run-test.sh b/jjb/integration/integration-deploy-controller-run-test.sh
index 7e3a7beb6b3ae297e445d39a50d4bfea3a5f3636..04a4c8f597fef8c4b9e3cbd5e8a3148346682a63 100644 (file)
--- a/jjb/integration/integration-deploy-controller-run-test.sh
+++ b/jjb/integration/integration-deploy-controller-run-test.sh
@@ -69,6 +69,19 @@ sed -ie 's/log4j.appender.out.maxBackupIndex=10/log4j.appender.out.maxBackupInde
 # FIXME: Make log size limit configurable from build parameter.
 sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=30GB/g' \${LOGCONF}
 echo "log4j.logger.org.opendaylight.yangtools.yang.parser.repo.YangTextSchemaContextResolver = WARN" >> \${LOGCONF}
+# Add custom logging levels
+# CONTROLLERDEBUGMAP is expected to be a key:value map of space separated values like "module:level module2:level2"
+# where module is abbreviated and does not include org.opendaylight
+unset IFS
+if [ -n "${CONTROLLERDEBUGMAP}" ]; then
+    for kv in ${CONTROLLERDEBUGMAP}; do
+        module=\${kv%%:*}
+        level=\${kv#*:}
+        if [ -n \${module} ] && [ -n \${level} ]; then
+            echo "log4j.logger.org.opendaylight.\${module} = \${level}" >> \${LOGCONF}
+        fi
+    done
+fi
 cat \${LOGCONF}
 
 echo "Configure java home and max memory..."

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 5b1dad87199fedd92cefe00370211015511dbd07..a7bea22a49013158ff19fdd150c254bab716f4a1 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -51,6 +51,18 @@
           default: '{controller-features}'
           description: 'Features to install in the controller separated by comma'
 
+- parameter:
+    name: integration-controller-debug-map
+    parameters:
+      - string:
+          name: CONTROLLERDEBUGMAP
+          default: '{controller-debug-map}'
+          description: |
+              Key:Value map of debugs to enable on the controller separated by spaces.
+              The module should not include org.opendaylight.
+              The levels must be one of: ERROR, WARN, INFO, DEBUG, TRACE.
+              (ex. ovsdb.lib:ERROR netvirt.vpnservice:INFO)
+
 - parameter:
     name: integration-distribution-stream
     parameters:

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 89e41122f3e980c6bdd90a6e26c1d7537367e3bc..cf0525e290eb2d45517e014c0f928aca447d6ae5 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1007,6 +1007,8 @@
           bundle-url: '{bundle-url}'
       - integration-controller-features:
           controller-features: '{install-features}'
+      - integration-controller-debug-map:
+          controller-debug-map: '{debug-map}'
       - integration-test-options:
           test-options: '{robot-options}'
       - integration-test-plan:
@@ -1192,6 +1194,8 @@
           bundle-url: '{bundle-url}'
       - integration-controller-features:
           controller-features: '{install-features}'
+      - integration-controller-debug-map:
+          controller-debug-map: '{debug-map}'
       - integration-test-options:
           test-options: '{robot-options}'
       - integration-test-plan:

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 47831a176a0841e21a3e466c33036f9e104ffc4e..c81cb25cfb3ac3a2803896e51d712eed60aeb6ba 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -202,9 +202,11 @@
               KARAF_VERSION=$KARAF_VERSION
 
     publishers:
+      - opendaylight-infra-generate-csit-status-report
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[integration]'
+      - lf-infra-publish
 
 # Template: integration-sanity-test-{stream}
 # Goal: Verify a distribution through sanity test

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 4517c0affc31ba245fb6197f722838b2ad04bc52..2c1e79f52ad48b353d337562971ad15be94cc4b0 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -26,6 +26,12 @@
       - upstream-transparent:
           schedule: ''
           sg-mode: 'transparent'
+      - upstream-stateful:
+          schedule: ''
+          sg-mode: 'stateful'
+      - upstream-learn:
+          schedule: ''
+          sg-mode: 'learn'
       - gate-transparent:
           schedule: ''
           sg-mode: 'transparent'
@@ -59,7 +65,7 @@
 
     tools_system_count: 2
 
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-26 - 20170829-0548'
 
     enable-networking-l2gw: 'yes'
 

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 811782701b5516282bf73394900f06da36466114..d9cea002fdab5e4d1827a74fe891da0b9bbf9cf2 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -76,6 +76,7 @@
     # Default Robot framework options
     robot-options: ''
     trigger-jobs: ''
+    debug-map: ''
 
     # Data for csit-verify jobs
     # Branch for "last" version detection

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 3a9f5436c626550c2299b2d66a7912fa949b07ca..1bfd92caa7b2fbd5c126c304278dea691852ff78 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -649,3 +649,13 @@
               {mvn-opts}
           java-opts:
             - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+
+- publisher:
+    name: opendaylight-infra-generate-csit-status-report
+    publishers:
+      - postbuildscript:
+          builders:
+            - shell: !include-raw: generate-csit-status-report.sh
+          script-only-if-succeeded: false
+          script-only-if-failed: false
+          mark-unstable-if-failed: false