From: Anil Belur Date: Thu, 31 Aug 2017 11:27:30 +0000 (+0000) Subject: Merge "Find major version from stream, avoid mismatches" X-Git-Tag: release/nitrogen~96 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=7c2608254d8a510175c659fd39f566a942908854;hp=e641a775e7a25ef101999ea03d68b4a1038b8979;p=releng%2Fbuilder.git 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 index 000000000..dc8753728 --- /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 <> \${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 5b1dad871..a7bea22a4 100644 --- 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 89e41122f..cf0525e29 100644 --- 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 47831a176..c81cb25cf 100644 --- 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 4517c0aff..2c1e79f52 100644 --- 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 811782701..d9cea002f 100644 --- 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 3a9f5436c..1bfd92caa 100644 --- 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