-Subproject commit 8ed761356296d6dfb78f01bbe44d5bbb75be11a1
+Subproject commit ba3f1f932f671039373402b81640f7be2cde9bb8
- autorelease-branch-cut
- 'autorelease-generate-release-notes-{stream}'
- 'autorelease-release-{stream}':
- build-node: centos7-autorelease-8c-32g
+ build-node: centos7-autorelease-4c-16g
- 'autorelease-update-submodules-{stream}'
- 'autorelease-update-validate-jobs-{stream}'
- 'autorelease-version-bump-{stream}':
- build-node: centos7-autorelease-8c-32g
+ build-node: centos7-autorelease-4c-16g
- '{project-name}-validate-autorelease-{stream}'
- gerrit-tox-verify
- shell: |
mkdir -p archives/
cp *.log *.prop $_
- - lf-provide-maven-settings-cleanup
publishers:
- opendaylight-infra-notify-status
odlparent-merge-{stream},
yangtools-merge-{stream},
controller-merge-{stream},
- mdsal-merge-{stream},
- tcpmd5-merge-{stream}
- email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
+ mdsal-merge-{stream}
+ email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal]'
# Used by the release job
staging-profile-id: 9427a05049030
yangtools-merge-{stream},
controller-merge-{stream},
mdsal-merge-{stream},
- tcpmd5-merge-{stream}
- email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
+ email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal]'
# Used by the release job
staging-profile-id: 9427a05049030
odlparent-merge-{stream},
yangtools-merge-{stream},
controller-merge-{stream},
- mdsal-merge-{stream},
- tcpmd5-merge-{stream}
- email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
+ mdsal-merge-{stream}
+ email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal]'
# Used by the release job
staging-profile-id: 9427a05049030
mvn-params: >
-Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
-Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
+ -P!karaf
project: 'bgpcep'
project-name: 'bgpcep'
# CSIT images configuration
openstack_queens_system_image: ZZCI - CentOS 7 - devstack-queens - 20181101-190143.891
openstack_pike_system_image: ZZCI - CentOS 7 - devstack-pike - 20171208-1649
- stack-template: csit-2-instance-type.yaml
- docker_system_count: 1
- docker_system_flavor: odl-standard-1
- docker_system_image: ZZCI - CentOS 7 - docker - 20180723-235456.035
- odl_system_count: 1
- odl_system_flavor: odl-highcpu-4
- odl_system_image: ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956
- openstack_system_count: 1
- openstack_system_flavor: odl-standard-4
- openstack_system_image: ZZCI - CentOS 7 - devstack - 20180911-204116.460
- openstack_system2_count: 0
- openstack_system2_flavor: odl-standard-1
- openstack_system2_image: ZZCI - CentOS 7 - devstack - 20180911-204116.460
- tools_system_count: 1
- tools_system_flavor: odl-highcpu-2
- tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514
# Default Robot framework options
robot-options: ''
rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f
- odl-maven-jobs
+ csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+ block_on_csit: false
+
stream: neon
project: 'genius'
project-name: 'genius'
cat << EOF
common-functions environment:
MAVENCONF: ${MAVENCONF}
+ACTUALFEATURES: ${ACTUALFEATURES}
FEATURESCONF: ${FEATURESCONF}
CUSTOMPROP: ${CUSTOMPROP}
LOGCONF: ${LOGCONF}
AKKACONF: ${AKKACONF}
MODULESCONF: ${MODULESCONF}
MODULESHARDSCONF: ${MODULESHARDSCONF}
+SUITES: ${SUITES}
EOF
}
fi
# 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."
+ # 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
echo "controllerdebugmap: ${controllerdebugmap}"
if [ -n "${controllerdebugmap}" ]; then
cat ${LOGCONF}
} # function configure_karaf_log()
+function configure_karaf_log_for_apex() {
+ # TODO: add the extra steps to this function to do any extra work
+ # in this apex environment like we do in our standard environment.
+ # EX: log size, rollover, etc.
+
+ # Modify ODL Log Levels, if needed, for new distribution. This will modify
+ # the control nodes hiera data which will be used during the puppet deploy
+ # 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."
+
+ local -r controller_ip=$1
+
+ unset IFS
+ # shellcheck disable=SC2153
+ echo "CONTROLLERDEBUGMAP: ${CONTROLLERDEBUGMAP}"
+ if [ -n "${CONTROLLERDEBUGMAP}" ]; then
+ logging_config='\"opendaylight::log_levels\": {'
+ for kv in ${CONTROLLERDEBUGMAP}; do
+ module="${kv%%:*}"
+ level="${kv#*:}"
+ echo "module: $module, level: $level"
+ # shellcheck disable=SC2157
+ if [ -n "${module}" ] && [ -n "${level}" ]; then
+ orgmodule="org.opendaylight.${module}"
+ logging_config="${logging_config} \\\"${orgmodule}\\\": \\\"${level}\\\","
+ fi
+ done
+ # replace the trailing comma with a closing brace followed by trailing comma
+ logging_config=${logging_config%,}" },"
+ echo $logging_config
+
+ # fine a sane line number to inject the custom logging json
+ lineno=$(ssh $OPENSTACK_CONTROL_NODE_1_IP "sudo grep -Fn 'opendaylight::log_mechanism' /etc/puppet/hieradata/service_configs.json" | awk -F: '{print $1}')
+ ssh $controller_ip "sudo sed -i \"${lineno}i ${logging_config}\" /etc/puppet/hieradata/service_configs.json"
+ ssh $controller_ip "sudo cat /etc/puppet/hieradata/service_configs.json"
+ fi
+} # function configure_karaf_log_for_apex()
+
+function configure_odl_features_for_apex() {
+
+ # if the environment variable $ACTUALFEATURES is not null, then rewrite
+ # the puppet config file with the features given in that variable, otherwise
+ # this function is a noop
+
+ local -r controller_ip=$1
+ local -r config_file=/etc/puppet/hieradata/service_configs.json
+
+cat > /tmp/set_odl_features.sh << EOF
+sudo jq '.["opendaylight::extra_features"] |= []' $config_file > tmp.json && mv tmp.json $config_file
+for feature in $(echo $ACTUALFEATURES | sed "s/,/ /g"); do
+ sudo jq --arg jq_arg \$feature '.["opendaylight::extra_features"] |= . + [\$jq_arg]' $config_file > tmp && mv tmp $config_file;
+done
+echo "Modified puppet-opendaylight service_configs.json..."
+cat $config_file
+EOF
+
+ echo "Feature configuration script..."
+ cat /tmp/set_odl_features.sh
+
+ if [ -n "${ACTUALFEATURES}" ]; then
+ scp /tmp/set_odl_features.sh $controller_ip:/tmp/set_odl_features.sh
+ ssh $controller_ip "sudo bash /tmp/set_odl_features.sh"
+ fi
+
+} # function configure_odl_features_for_apex()
+
function get_os_deploy() {
local -r num_systems=${1:-$NUM_OPENSTACK_SYSTEM}
case ${num_systems} in
ovsdb-csit-3node-upstream-clustering-only-neon,
sfc-csit-3node-docker-full-deploy-all-neon,
sfc-csit-3node-rest-basic-all-neon,
+telemetry-csit-1node-basic-all-neon,
yangtools-csit-1node-system-only-neon,
sxp-csit-1node-performance-all-oxygen,
sxp-csit-1node-topology-all-oxygen,
sxp-csit-3node-clustering-all-oxygen,
-sxp-csit-3node-routing-all-oxygen,
tsdr-csit-1node-cassandra-datastore-only-oxygen,
tsdr-csit-1node-elasticsearch-datastore-only-oxygen,
tsdr-csit-1node-hbase-datastore-all-oxygen,
# Self-Managed projects repos and features:
sm-repos: >
mvn:org.opendaylight.sxp/features-sxp//xml/features,
- mvn:org.opendaylight.tsdr/features-tsdr//xml/features
+ mvn:org.opendaylight.telemetry/features-telemetry//xml/features
sm-features: >
odl-sxp-routing,
- odl-tsdr-core,
- odl-tsdr-openflow-statistics-collector,
- odl-tsdr-netflow-statistics-collector,
- odl-tsdr-restconf-collector,
- odl-tsdr-syslog-collector,
- odl-tsdr-controller-metrics-collector,
- odl-tsdr-cassandra,
- odl-tsdr-hbase,
- odl-tsdr-hsqldb,
- odl-tsdr-elasticsearch
+ odl-telemetry-collector,
+ odl-telemetry-configurator,
+ odl-telemetry-all
- fluorine:
branch: 'stable/fluorine'
karaf-version: odl
# Self-Managed projects repos and features:
sm-repos: >
mvn:org.opendaylight.sxp/features-sxp//xml/features,
- mvn:org.opendaylight.transportpce/features-transportpce//xml/features,
+ mvn:org.opendaylight.transportpce/features-transportpce//xml/features
sm-features: >
odl-sxp-routing,
odl-transportpce,
dependencies: >
distribution-merge-managed-{stream},
sxp-merge-{stream},
+ telemetry-merge-{stream},
tsdr-merge-{stream},
- unimgr-merge-{stream},
+ unimgr-merge-{stream}
- fluorine:
branch: 'stable/fluorine'
karaf-version: odl
sxp-merge-{stream},
transportpce-merge-{stream},
tsdr-merge-{stream},
- unimgr-merge-{stream},
+ unimgr-merge-{stream}
- project:
name: distribution-release
get_os_deploy
+configure_karaf_log_for_apex $OPENSTACK_CONTROL_NODE_1_IP
+get_features
+configure_odl_features_for_apex $OPENSTACK_CONTROL_NODE_1_IP
+
# Swap out the ODL distribution
DISTRO_UNDER_TEST=/tmp/odl.tar.gz
wget --progress=dot:mega ${ACTUAL_BUNDLE_URL}
NEW_DISTRO_BASENAME="$(basename "$NEW_DISTRO")"
cp $NEW_DISTRO /tmp/
cd /tmp/ || exit
-# get the name of the folder which will be extracted to
-EXTRACTED_FOLDER=$(unzip $NEW_DISTRO_BASENAME | grep 'creating:' | grep -v '/.' | cut -d' ' -f5-)
-mv $EXTRACTED_FOLDER distro_new
+unzip $NEW_DISTRO_BASENAME
+mv $BUNDLEFOLDER distro_new
git clone https://git.opendaylight.org/gerrit/p/integration/test.git
cd test/tools/distchanges || exit
-v CONTROLLER:${ODL_SYSTEM_IP} \
-v CONTROLLER_USER:${USER} \
-v GERRIT_BRANCH:${GERRIT_BRANCH} \
+ -v GERRIT_PROJECT:${GERRIT_PROJECT} \
-v GERRIT_REFSPEC:${GERRIT_REFSPEC} \
-v JAVA_HOME:${JAVA_HOME} \
-v JDKVERSION:${JDKVERSION} \
--- /dev/null
+---
+################
+# Stack 2 Type #
+################
+
+# The parameter and builder macros are meant to be used together. Job templates
+# that want to use the Stack 2 Type must declare both the parameter and builder
+# component.
+
+- parameter:
+ name: integration-stack-2-type
+ parameters:
+ - string:
+ name: VM_0_COUNT
+ default: '{vm_0_count}'
+ description: 'Number of systems to spawn for vm 0'
+ - string:
+ name: VM_0_FLAVOR
+ default: '{vm_0_flavor}'
+ description: 'VM flavor to use for vm 0'
+ - string:
+ name: VM_0_IMAGE
+ default: '{vm_0_image}'
+ description: 'VM image to use for vm 0'
+ - string:
+ name: VM_1_COUNT
+ default: '{vm_1_count}'
+ description: 'Number of systems to spawn for vm 1'
+ - string:
+ name: VM_1_FLAVOR
+ default: '{vm_1_flavor}'
+ description: 'VM flavor to use for vm 1'
+ - string:
+ name: VM_1_IMAGE
+ default: '{vm_1_image}'
+ description: 'VM image to use for vm 1'
+
+- builder:
+ name: integration-stack-2-type
+ builders:
+ - lf-stack-create:
+ openstack-cloud: '{openstack-cloud}'
+ openstack-heat-template: '{openstack-heat-template}'
+ openstack-heat-template-dir: '{openstack-heat-template-dir}'
+ openstack-heat-parameters: |
+ vm_0_count: '$VM_0_COUNT'
+ vm_0_flavor: '$VM_0_FLAVOR'
+ vm_0_image: '$VM_0_IMAGE'
+ vm_1_count: '$VM_1_COUNT'
+ vm_1_flavor: '$VM_1_FLAVOR'
+ vm_1_image: '$VM_1_IMAGE'
+
+################
+# Stack 3 Type #
+################
+
+# The parameter and builder macros are meant to be used together. Job templates
+# that want to use the Stack 3 Type must declare both the parameter and builder
+# component.
+
+- parameter:
+ name: integration-stack-3-type
+ parameters:
+ - string:
+ name: VM_0_COUNT
+ default: '{vm_0_count}'
+ description: 'Number of systems to spawn for vm 0'
+ - string:
+ name: VM_0_FLAVOR
+ default: '{vm_0_flavor}'
+ description: 'VM flavor to use for vm 0'
+ - string:
+ name: VM_0_IMAGE
+ default: '{vm_0_image}'
+ description: 'VM image to use for vm 0'
+ - string:
+ name: VM_1_COUNT
+ default: '{vm_1_count}'
+ description: 'Number of systems to spawn for vm 1'
+ - string:
+ name: VM_1_FLAVOR
+ default: '{vm_1_flavor}'
+ description: 'VM flavor to use for vm 1'
+ - string:
+ name: VM_1_IMAGE
+ default: '{vm_1_image}'
+ description: 'VM image to use for vm 1'
+ - string:
+ name: VM_2_COUNT
+ default: '{vm_2_count}'
+ description: 'Number of systems to spawn for vm 2'
+ - string:
+ name: VM_2_FLAVOR
+ default: '{vm_2_flavor}'
+ description: 'VM flavor to use for vm 2'
+ - string:
+ name: VM_2_IMAGE
+ default: '{vm_2_image}'
+ description: 'VM image to use for vm 2'
+
+- builder:
+ name: integration-stack-3-type
+ builders:
+ - lf-stack-create:
+ openstack-cloud: '{openstack-cloud}'
+ openstack-heat-template: '{openstack-heat-template}'
+ openstack-heat-template-dir: '{openstack-heat-template-dir}'
+ openstack-heat-parameters: |
+ vm_0_count: '$VM_0_COUNT'
+ vm_0_flavor: '$VM_0_FLAVOR'
+ vm_0_image: '$VM_0_IMAGE'
+ vm_1_count: '$VM_1_COUNT'
+ vm_1_flavor: '$VM_1_FLAVOR'
+ vm_1_image: '$VM_1_IMAGE'
+ vm_2_count: '$VM_2_COUNT'
+ vm_2_flavor: '$VM_2_FLAVOR'
+ vm_2_image: '$VM_2_IMAGE'
+
+################
+# Stack 4 Type #
+################
+
+# The parameter and builder macros are meant to be used together. Job templates
+# that want to use the Stack 4 Type must declare both the parameter and builder
+# component.
+
+- parameter:
+ name: integration-stack-4-type
+ parameters:
+ - string:
+ name: VM_0_COUNT
+ default: '{vm_0_count}'
+ description: 'Number of systems to spawn for vm 0'
+ - string:
+ name: VM_0_FLAVOR
+ default: '{vm_0_flavor}'
+ description: 'VM flavor to use for vm 0'
+ - string:
+ name: VM_0_IMAGE
+ default: '{vm_0_image}'
+ description: 'VM image to use for vm 0'
+ - string:
+ name: VM_1_COUNT
+ default: '{vm_1_count}'
+ description: 'Number of systems to spawn for vm 1'
+ - string:
+ name: VM_1_FLAVOR
+ default: '{vm_1_flavor}'
+ description: 'VM flavor to use for vm 1'
+ - string:
+ name: VM_1_IMAGE
+ default: '{vm_1_image}'
+ description: 'VM image to use for vm 1'
+ - string:
+ name: VM_2_COUNT
+ default: '{vm_2_count}'
+ description: 'Number of systems to spawn for vm 2'
+ - string:
+ name: VM_2_FLAVOR
+ default: '{vm_2_flavor}'
+ description: 'VM flavor to use for vm 2'
+ - string:
+ name: VM_2_IMAGE
+ default: '{vm_2_image}'
+ description: 'VM image to use for vm 2'
+ - string:
+ name: VM_3_COUNT
+ default: '{vm_3_count}'
+ description: 'Number of systems to spawn for vm 3'
+ - string:
+ name: VM_3_FLAVOR
+ default: '{vm_3_flavor}'
+ description: 'VM flavor to use for vm 3'
+ - string:
+ name: VM_3_IMAGE
+ default: '{vm_3_image}'
+ description: 'VM image to use for vm 3'
+
+
+- builder:
+ name: integration-stack-4-type
+ builders:
+ - lf-stack-create:
+ openstack-cloud: '{openstack-cloud}'
+ openstack-heat-template: '{openstack-heat-template}'
+ openstack-heat-template-dir: '{openstack-heat-template-dir}'
+ openstack-heat-parameters: |
+ vm_0_count: '$VM_0_COUNT'
+ vm_0_flavor: '$VM_0_FLAVOR'
+ vm_0_image: '$VM_0_IMAGE'
+ vm_1_count: '$VM_1_COUNT'
+ vm_1_flavor: '$VM_1_FLAVOR'
+ vm_1_image: '$VM_1_IMAGE'
+ vm_2_count: '$VM_2_COUNT'
+ vm_2_flavor: '$VM_2_FLAVOR'
+ vm_2_image: '$VM_2_IMAGE'
+ vm_3_count: '$VM_3_COUNT'
+ vm_3_flavor: '$VM_3_FLAVOR'
+ vm_3_image: '$VM_3_IMAGE'
# Shell Scripts #
#################
-# Macro: integration-infra-stack
-# Operation: Sets environment and then calls opendaylight-infra-stack to spin
-# up csit lab using openstack-heat.
-# Used by: {project}-csit-* job templates
-
-- builder:
- name: integration-infra-stack
- builders:
- - integration-cleanup-workspace
- - shell: |
- #!/bin/bash
- # Setup openstack envirnoment file for use by
- # the opendaylight-infra-stack macro
- cat > $WORKSPACE/opendaylight-infra-environment.yaml << EOF
- parameters:
- vm_0_count: {vm_0_count}
- vm_0_flavor: {vm_0_flavor}
- vm_0_image: {vm_0_image}
- vm_1_count: {vm_1_count}
- vm_1_flavor: {vm_1_flavor}
- vm_1_image: {vm_1_image}
- EOF
- echo "Contents of opendaylight-infra-environment.yaml ..."
- cat $WORKSPACE/opendaylight-infra-environment.yaml
- - opendaylight-infra-stack:
- stack-template: '{stack-template}'
-
-# Macro: integration-infra-stack-3-type
-# Operation: Sets environment and then calls opendaylight-infra-stack to spin
-# up csit lab using openstack-heat.
-# Used by: {project}-csit-* job templates
-
-- builder:
- name: integration-infra-stack-3-type
- builders:
- - integration-cleanup-workspace
- - shell: |
- #!/bin/bash
- # Setup openstack envirnoment file for use by
- # the opendaylight-infra-stack macro
- cat > $WORKSPACE/opendaylight-infra-environment.yaml << EOF
- parameters:
- vm_0_count: {vm_0_count}
- vm_0_flavor: {vm_0_flavor}
- vm_0_image: {vm_0_image}
- vm_1_count: {vm_1_count}
- vm_1_flavor: {vm_1_flavor}
- vm_1_image: {vm_1_image}
- vm_2_count: {vm_2_count}
- vm_2_flavor: {vm_2_flavor}
- vm_2_image: {vm_2_image}
- EOF
- echo "Contents of opendaylight-infra-environment.yaml ..."
- cat $WORKSPACE/opendaylight-infra-environment.yaml
- - opendaylight-infra-stack:
- stack-template: 'csit-3-instance-type.yaml'
-
-# Macro: integration-apex-stack-3-type
-# Operation: Sets environment and then calls opendaylight-apex-stack to spin
-# up csit lab using openstack-heat.
-# Used by: {project}-csit-* apex related job templates
-
-- builder:
- name: integration-apex-stack-3-type
- builders:
- - integration-cleanup-workspace
- - shell: |
- #!/bin/bash
- # Setup openstack envirnoment file for use by
- # the opendaylight-infra-stack macro
- cat > $WORKSPACE/opendaylight-infra-environment.yaml << EOF
- parameters:
- vm_0_count: {vm_0_count}
- vm_0_flavor: {vm_0_flavor}
- vm_0_image: {vm_0_image}
- vm_1_count: {vm_1_count}
- vm_1_flavor: {vm_1_flavor}
- vm_1_image: {vm_1_image}
- vm_2_count: {vm_2_count}
- vm_2_flavor: {vm_2_flavor}
- vm_2_image: {vm_2_image}
- EOF
- echo "Contents of opendaylight-infra-environment.yaml ..."
- cat $WORKSPACE/opendaylight-infra-environment.yaml
- - opendaylight-apex-stack:
- stack-template: 'csit-apex-3-instance-type.yaml'
-
-# Macro: integration-infra-stack-4-type
-# Operation: Sets environment and then calls opendaylight-infra-stack to spin
-# up csit lab using openstack-heat.
-# Used by: {project}-csit-* job templates
-
-- builder:
- name: integration-infra-stack-4-type
- builders:
- - integration-cleanup-workspace
- - shell: |
- #!/bin/bash
- # Setup openstack envirnoment file for use by
- # the opendaylight-infra-stack macro
- cat > $WORKSPACE/opendaylight-infra-environment.yaml << EOF
- parameters:
- vm_0_count: {vm_0_count}
- vm_0_flavor: {vm_0_flavor}
- vm_0_image: {vm_0_image}
- vm_1_count: {vm_1_count}
- vm_1_flavor: {vm_1_flavor}
- vm_1_image: {vm_1_image}
- vm_2_count: {vm_2_count}
- vm_2_flavor: {vm_2_flavor}
- vm_2_image: {vm_2_image}
- vm_3_count: {vm_3_count}
- vm_3_flavor: {vm_3_flavor}
- vm_3_image: {vm_3_image}
- EOF
- echo "Contents of opendaylight-infra-environment.yaml ..."
- cat $WORKSPACE/opendaylight-infra-environment.yaml
- - opendaylight-infra-stack:
- stack-template: 'csit-4-instance-type.yaml'
-
# Macro: integration-get-apex-addresses
# Operation: this macro gets the IP addresses of the dynamic vms from apex snapshots
# Used by: {project}-csit-* apex related job templates
id: inttest-csit-verify-1node
<<: *inttest_csit_common
+ #####################
+ # Default variables #
+ #####################
+
+ openstack-cloud: vex
+ openstack-heat-template: csit-2-instance-type.yaml
+ openstack-heat-template-dir: openstack-hot
+
+ odl_system_flavor: 'odl-highcpu-4'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
+ tools_system_count: 1
+ tools_system_flavor: 'odl-highcpu-2'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514'
+
+ #####################
+ # Job configuration #
+ #####################
+
parameters:
- integration-csit-parameters:
archive-artifacts: '{archive-artifacts}'
debug-map: '{debug-map}'
install-features: '{install-features}'
use-features-boot: 'True'
+ - integration-stack-2-type:
+ vm_0_count: 1
+ vm_0_flavor: '{odl_system_flavor}'
+ vm_0_image: '{odl_system_image}'
+ vm_1_count: '{tools_system_count}'
+ vm_1_flavor: '{tools_system_flavor}'
+ vm_1_image: '{tools_system_image}'
- integration-distribution-branch:
branch: '{verify-branch}'
- integration-distribution-stream:
builders:
- lf-infra-pre-build
- - integration-infra-stack:
- stack-template: '{stack-template}'
- vm_0_count: '1'
- vm_0_flavor: '{odl_system_flavor}'
- vm_0_image: '{odl_system_image}'
- vm_1_count: '{tools_system_count}'
- vm_1_flavor: '{tools_system_flavor}'
- vm_1_image: '{tools_system_image}'
+ - integration-stack-2-type:
+ openstack-cloud: '{openstack-cloud}'
+ openstack-heat-template: '{openstack-heat-template}'
+ openstack-heat-template-dir: '{openstack-heat-template-dir}'
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
robot_other_files: ''
robot-pass-threshold: 100.0
robot-unstable-threshold: 0.0
+ - lf-stack-delete:
+ openstack-cloud: '{openstack-cloud}'
- lf-infra-publish
# Default variables #
#####################
- # TODO: Add default variables here.
+ openstack-cloud: vex
+ openstack-heat-template: csit-2-instance-type.yaml
+ openstack-heat-template-dir: openstack-hot
+
+ odl_system_flavor: 'odl-highcpu-4'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
+ tools_system_count: 1
+ tools_system_flavor: 'odl-highcpu-2'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514'
#####################
# Job configuration #
debug-map: '{debug-map}'
install-features: '{install-features}'
use-features-boot: 'True'
+ - integration-stack-2-type:
+ vm_0_count: 1
+ vm_0_flavor: '{odl_system_flavor}'
+ vm_0_image: '{odl_system_image}'
+ vm_1_count: '{tools_system_count}'
+ vm_1_flavor: '{tools_system_flavor}'
+ vm_1_image: '{tools_system_image}'
- integration-distribution-branch:
branch: '{branch}'
- integration-distribution-stream:
builders:
- lf-infra-pre-build
- - integration-infra-stack:
- stack-template: '{stack-template}'
- vm_0_count: '1'
- vm_0_flavor: '{odl_system_flavor}'
- vm_0_image: '{odl_system_image}'
- vm_1_count: '{tools_system_count}'
- vm_1_flavor: '{tools_system_flavor}'
- vm_1_image: '{tools_system_image}'
+ - integration-stack-2-type:
+ openstack-cloud: '{openstack-cloud}'
+ openstack-heat-template: '{openstack-heat-template}'
+ openstack-heat-template-dir: '{openstack-heat-template-dir}'
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
robot_other_files: ''
robot-pass-threshold: 100.0
robot-unstable-threshold: 0.0
+ - lf-stack-delete:
+ openstack-cloud: '{openstack-cloud}'
- lf-infra-publish
- job-template:
debug-map: '{debug-map}'
install-features: '{install-features}'
use-features-boot: 'True'
+ - integration-stack-2-type:
+ vm_0_count: 1
+ vm_0_flavor: '{odl_system_flavor}'
+ vm_0_image: '{odl_system_image}'
+ vm_1_count: '{tools_system_count}'
+ vm_1_flavor: '{tools_system_flavor}'
+ vm_1_image: '{tools_system_image}'
- integration-distribution-branch:
branch: '{branch}'
- integration-distribution-stream:
# Default variables #
#####################
- # TODO: Add default variables here
+ openstack-cloud: vex
+ openstack-heat-template: csit-2-instance-type.yaml
+ openstack-heat-template-dir: openstack-hot
+
+ odl_system_flavor: 'odl-highcpu-4'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
+ tools_system_count: 1
+ tools_system_flavor: 'odl-highcpu-2'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514'
#####################
# Job Configuration #
debug-map: '{debug-map}'
install-features: 'odl-jolokia,{install-features}'
use-features-boot: 'True'
+ - integration-stack-2-type:
+ vm_0_count: 3
+ vm_0_flavor: '{odl_system_flavor}'
+ vm_0_image: '{odl_system_image}'
+ vm_1_count: '{tools_system_count}'
+ vm_1_flavor: '{tools_system_flavor}'
+ vm_1_image: '{tools_system_image}'
- integration-distribution-branch:
branch: '{verify-branch}'
- integration-distribution-stream:
builders:
- lf-infra-pre-build
- - integration-infra-stack:
- stack-template: '{stack-template}'
- vm_0_count: '3'
- vm_0_flavor: '{odl_system_flavor}'
- vm_0_image: '{odl_system_image}'
- vm_1_count: '{tools_system_count}'
- vm_1_flavor: '{tools_system_flavor}'
- vm_1_image: '{tools_system_image}'
+ - integration-stack-2-type:
+ openstack-cloud: '{openstack-cloud}'
+ openstack-heat-template: '{openstack-heat-template}'
+ openstack-heat-template-dir: '{openstack-heat-template-dir}'
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
robot_other_files: ''
robot-pass-threshold: 100.0
robot-unstable-threshold: 0.0
+ - lf-stack-delete:
+ openstack-cloud: '{openstack-cloud}'
- lf-infra-publish
# Default variables #
#####################
- # TODO: Add default variables here
+ openstack-cloud: vex
+ openstack-heat-template: csit-2-instance-type.yaml
+ openstack-heat-template-dir: openstack-hot
+
+ odl_system_flavor: 'odl-highcpu-4'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
+ tools_system_count: 1
+ tools_system_flavor: 'odl-highcpu-2'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514'
#####################
# Job configuration #
debug-map: '{debug-map}'
install-features: 'odl-jolokia,{install-features}'
use-features-boot: 'True'
+ - integration-stack-2-type:
+ vm_0_count: 3
+ vm_0_flavor: '{odl_system_flavor}'
+ vm_0_image: '{odl_system_image}'
+ vm_1_count: '{tools_system_count}'
+ vm_1_flavor: '{tools_system_flavor}'
+ vm_1_image: '{tools_system_image}'
- integration-distribution-branch:
branch: '{branch}'
- integration-distribution-stream:
builders:
- lf-infra-pre-build
- - integration-infra-stack:
- stack-template: '{stack-template}'
- vm_0_count: '3'
- vm_0_flavor: '{odl_system_flavor}'
- vm_0_image: '{odl_system_image}'
- vm_1_count: '{tools_system_count}'
- vm_1_flavor: '{tools_system_flavor}'
- vm_1_image: '{tools_system_image}'
+ - integration-stack-2-type:
+ openstack-cloud: '{openstack-cloud}'
+ openstack-heat-template: '{openstack-heat-template}'
+ openstack-heat-template-dir: '{openstack-heat-template-dir}'
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
robot_other_files: ''
robot-pass-threshold: 100.0
robot-unstable-threshold: 0.0
+ - lf-stack-delete:
+ openstack-cloud: '{openstack-cloud}'
- lf-infra-publish
- job-template:
debug-map: '{debug-map}'
install-features: 'odl-jolokia,{install-features}'
use-features-boot: 'True'
+ - integration-stack-2-type:
+ vm_0_count: 3
+ vm_0_flavor: '{odl_system_flavor}'
+ vm_0_image: '{odl_system_image}'
+ vm_1_count: '{tools_system_count}'
+ vm_1_flavor: '{tools_system_flavor}'
+ vm_1_image: '{tools_system_image}'
- integration-distribution-branch:
branch: '{branch}'
- integration-distribution-stream:
# Default variables #
#####################
- # TODO: Add default variables here
+ openstack-cloud: vex
+ openstack-heat-template: csit-2-instance-type.yaml
+ openstack-heat-template-dir: openstack-hot
+
+ odl_system_count: 1
+ odl_system_flavor: 'odl-highcpu-4'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
+ docker_system_count: 1
+ docker_system_flavor: 'odl-standard-1'
+ docker_system_image: 'ZZCI - CentOS 7 - docker - 20180723-235456.035'
#####################
# Job Configuration #
debug-map: '{debug-map}'
install-features: 'odl-jolokia,{install-features}'
use-features-boot: 'True'
+ - integration-stack-2-type:
+ vm_0_count: 3
+ vm_0_flavor: '{odl_system_flavor}'
+ vm_0_image: '{odl_system_image}'
+ vm_1_count: '{docker_system_count}'
+ vm_1_flavor: '{docker_system_flavor}'
+ vm_1_image: '{docker_system_image}'
- integration-distribution-branch:
branch: '{branch}'
- integration-distribution-stream:
builders:
- lf-infra-pre-build
- - integration-infra-stack:
- stack-template: '{stack-template}'
- vm_0_count: '3'
- vm_0_flavor: '{odl_system_flavor}'
- vm_0_image: '{odl_system_image}'
- vm_1_count: '{docker_system_count}'
- vm_1_flavor: '{docker_system_flavor}'
- vm_1_image: '{docker_system_image}'
+ - integration-stack-2-type:
+ openstack-cloud: '{openstack-cloud}'
+ openstack-heat-template: '{openstack-heat-template}'
+ openstack-heat-template-dir: '{openstack-heat-template-dir}'
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
robot_other_files: ''
robot-pass-threshold: 100.0
robot-unstable-threshold: 0.0
+ - lf-stack-delete:
+ openstack-cloud: '{openstack-cloud}'
- lf-infra-publish
# Default variables #
#####################
- # TODO: Add default variables here
+ openstack-cloud: vex
+ openstack-heat-template: csit-4-instance-type.yaml
+ openstack-heat-template-dir: openstack-hot
+
+ odl_system_count: 1
+ odl_system_flavor: 'odl-highcpu-4'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
+ openstack_system_count: 1
+ openstack_system_flavor: 'odl-standard-4'
+ openstack_system_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
+ openstack_system2_count: 0
+ openstack_system2_flavor: 'odl-standard-1'
+ openstack_system2_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
+ tools_system_count: 1
+ tools_system_flavor: 'odl-highcpu-2'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514'
#####################
# Job configuration #
debug-map: '{debug-map}'
install-features: '{install-features}'
use-features-boot: '{use-features-boot}'
+ - integration-stack-4-type:
+ vm_0_count: '{odl_system_count}'
+ vm_0_flavor: '{odl_system_flavor}'
+ vm_0_image: '{odl_system_image}'
+ vm_1_count: '{openstack_system_count}'
+ vm_1_flavor: '{openstack_system_flavor}'
+ vm_1_image: '{openstack_system_image}'
+ vm_2_count: '{openstack_system2_count}'
+ vm_2_flavor: '{openstack_system2_flavor}'
+ vm_2_image: '{openstack_system2_image}'
+ vm_3_count: '{tools_system_count}'
+ vm_3_flavor: '{tools_system_flavor}'
+ vm_3_image: '{tools_system_image}'
- integration-distribution-branch:
branch: '{branch}'
- integration-distribution-stream:
builders:
- lf-infra-pre-build
- - integration-infra-stack-4-type:
- stack-template: '{stack-template}'
- vm_0_count: '{odl_system_count}'
- vm_0_flavor: '{odl_system_flavor}'
- vm_0_image: '{odl_system_image}'
- vm_1_count: '{openstack_system_count}'
- vm_1_flavor: '{openstack_system_flavor}'
- vm_1_image: '{openstack_system_image}'
- vm_2_count: '{openstack_system2_count}'
- vm_2_flavor: '{openstack_system2_flavor}'
- vm_2_image: '{openstack_system2_image}'
- vm_3_count: '{tools_system_count}'
- vm_3_flavor: '{tools_system_flavor}'
- vm_3_image: '{tools_system_image}'
+ - integration-stack-4-type:
+ openstack-cloud: '{openstack-cloud}'
+ openstack-heat-template: '{openstack-heat-template}'
+ openstack-heat-template-dir: '{openstack-heat-template-dir}'
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
- tempest_results.html
robot-pass-threshold: 100.0
robot-unstable-threshold: 0.0
+ - lf-stack-delete:
+ openstack-cloud: '{openstack-cloud}'
- lf-infra-publish
- job-template:
debug-map: '{debug-map}'
install-features: '{install-features}'
use-features-boot: '{use-features-boot}'
+ - integration-stack-4-type:
+ vm_0_count: '{odl_system_count}'
+ vm_0_flavor: '{odl_system_flavor}'
+ vm_0_image: '{odl_system_image}'
+ vm_1_count: '{openstack_system_count}'
+ vm_1_flavor: '{openstack_system_flavor}'
+ vm_1_image: '{openstack_system_image}'
+ vm_2_count: '{openstack_system2_count}'
+ vm_2_flavor: '{openstack_system2_flavor}'
+ vm_2_image: '{openstack_system2_image}'
+ vm_3_count: '{tools_system_count}'
+ vm_3_flavor: '{tools_system_flavor}'
+ vm_3_image: '{tools_system_image}'
- integration-distribution-branch:
branch: '{branch}'
- integration-distribution-stream:
# Default variables #
#####################
- # TODO: Add default variables here
+ openstack-cloud: vex
+ openstack-heat-template: csit-4-instance-type.yaml
+ openstack-heat-template-dir: openstack-hot
+
+ odl_system_count: 1
+ odl_system_flavor: 'odl-highcpu-4'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
+ openstack_system_count: 1
+ openstack_system_flavor: 'odl-standard-4'
+ openstack_system_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
+ openstack_system2_count: 0
+ openstack_system2_flavor: 'odl-standard-1'
+ openstack_system2_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
+ tools_system_count: 1
+ tools_system_flavor: 'odl-highcpu-2'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514'
#####################
# Job configuration #
debug-map: '{debug-map}'
install-features: '{install-features}'
use-features-boot: '{use-features-boot}'
+ - integration-stack-4-type:
+ vm_0_count: '{odl_system_count}'
+ vm_0_flavor: '{odl_system_flavor}'
+ vm_0_image: '{odl_system_image}'
+ vm_1_count: '{openstack_system_count}'
+ vm_1_flavor: '{openstack_system_flavor}'
+ vm_1_image: '{openstack_system_image}'
+ vm_2_count: '{openstack_system2_count}'
+ vm_2_flavor: '{openstack_system2_flavor}'
+ vm_2_image: '{openstack_system2_image}'
+ vm_3_count: '{tools_system_count}'
+ vm_3_flavor: '{tools_system_flavor}'
+ vm_3_image: '{tools_system_image}'
- integration-distribution-branch:
branch: '{branch}'
- integration-distribution-stream:
builders:
- lf-infra-pre-build
- - integration-infra-stack-4-type:
- stack-template: '{stack-template}'
- vm_0_count: '{odl_system_count}'
- vm_0_flavor: '{odl_system_flavor}'
- vm_0_image: '{odl_system_image}'
- vm_1_count: '{openstack_system_count}'
- vm_1_flavor: '{openstack_system_flavor}'
- vm_1_image: '{openstack_system_image}'
- vm_2_count: '{openstack_system2_count}'
- vm_2_flavor: '{openstack_system2_flavor}'
- vm_2_image: '{openstack_system2_image}'
- vm_3_count: '{tools_system_count}'
- vm_3_flavor: '{tools_system_flavor}'
- vm_3_image: '{tools_system_image}'
+ - integration-stack-4-type:
+ openstack-cloud: '{openstack-cloud}'
+ openstack-heat-template: '{openstack-heat-template}'
+ openstack-heat-template-dir: '{openstack-heat-template-dir}'
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
- tempest_results.html
robot-pass-threshold: 100.0
robot-unstable-threshold: 0.0
+ - lf-stack-delete:
+ openstack-cloud: '{openstack-cloud}'
- lf-infra-publish
- job-template:
debug-map: '{debug-map}'
install-features: '{install-features}'
use-features-boot: '{use-features-boot}'
+ - integration-stack-4-type:
+ vm_0_count: '{odl_system_count}'
+ vm_0_flavor: '{odl_system_flavor}'
+ vm_0_image: '{odl_system_image}'
+ vm_1_count: '{openstack_system_count}'
+ vm_1_flavor: '{openstack_system_flavor}'
+ vm_1_image: '{openstack_system_image}'
+ vm_2_count: '{openstack_system2_count}'
+ vm_2_flavor: '{openstack_system2_flavor}'
+ vm_2_image: '{openstack_system2_image}'
+ vm_3_count: '{tools_system_count}'
+ vm_3_flavor: '{tools_system_flavor}'
+ vm_3_image: '{tools_system_image}'
- integration-distribution-branch:
branch: '{branch}'
- integration-distribution-stream:
id: inttest-patch-test
<<: *inttest_csit_common
+ build-timeout: 720
+
parameters:
- opendaylight-infra-parameters:
os-cloud: '{os-cloud}'
predefined-parameters: |
BUNDLE_URL=$BUNDLE_URL
GERRIT_BRANCH=$GERRIT_BRANCH
+ GERRIT_PROJECT=$GERRIT_PROJECT
GERRIT_REFSPEC=$GERRIT_REFSPEC
KARAF_VERSION=$KARAF_VERSION
# Default variables #
#####################
- # TODO: Add default variables here
+ openstack-cloud: vex
+ openstack-heat-template: csit-apex-3-instance-type.yaml
+ openstack-heat-template-dir: openstack-hot
#####################
# Job configuration #
debug-map: '{debug-map}'
install-features: '{install-features}'
use-features-boot: '{use-features-boot}'
+ - integration-stack-3-type:
+ vm_0_count: '{apex_controller_count}'
+ vm_0_flavor: '{apex_controller_flavor}'
+ vm_0_image: '{apex_controller_image}'
+ vm_1_count: 1
+ vm_1_flavor: '{apex_compute_0_flavor}'
+ vm_1_image: '{apex_compute_0_image}'
+ vm_2_count: 1
+ vm_2_flavor: '{apex_compute_1_flavor}'
+ vm_2_image: '{apex_compute_1_image}'
- integration-distribution-branch:
branch: '{branch}'
- integration-distribution-stream:
builders:
- lf-infra-pre-build
- - integration-apex-stack-3-type:
- stack-template: '{stack-template}'
- vm_0_count: '{apex_controller_count}'
- vm_0_flavor: '{apex_controller_flavor}'
- vm_0_image: '{apex_controller_image}'
- vm_1_count: '1'
- vm_1_flavor: '{apex_compute_0_flavor}'
- vm_1_image: '{apex_compute_0_image}'
- vm_2_count: '1'
- vm_2_flavor: '{apex_compute_1_flavor}'
- vm_2_image: '{apex_compute_1_image}'
+ - integration-stack-3-type:
+ openstack-cloud: '{openstack-cloud}'
+ openstack-heat-template: '{openstack-heat-template}'
+ openstack-heat-template-dir: '{openstack-heat-template-dir}'
- integration-install-robotframework
- integration-detect-variables
- integration-install-common-functions
- tempest_results.html
robot-pass-threshold: 100.0
robot-unstable-threshold: 0.0
+ - lf-stack-delete:
+ openstack-cloud: '{openstack-cloud}'
- lf-infra-publish
- job-template:
debug-map: '{debug-map}'
install-features: '{install-features}'
use-features-boot: '{use-features-boot}'
+ - integration-stack-3-type:
+ vm_0_count: '{apex_controller_count}'
+ vm_0_flavor: '{apex_controller_flavor}'
+ vm_0_image: '{apex_controller_image}'
+ vm_1_count: 1
+ vm_1_flavor: '{apex_compute_0_flavor}'
+ vm_1_image: '{apex_compute_0_image}'
+ vm_2_count: 1
+ vm_2_flavor: '{apex_compute_1_flavor}'
+ vm_2_image: '{apex_compute_1_image}'
- integration-distribution-branch:
branch: '{branch}'
- integration-distribution-stream:
BUNDLE_URL=$BUNDLE_URL
KARAF_VERSION=$KARAF_VERSION
+ wrappers:
+ - lf-infra-wrappers:
+ build-timeout: 1440
+ jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
publishers:
- opendaylight-infra-generate-csit-status-report
- email-notification:
# create a fresh empty place to build this custom distribution
BUILD_DIR=${WORKSPACE}/patch_tester
DISTRIBUTION_BRANCH_TO_BUILD=$DISTROBRANCH #renaming variable for clarity
-MAVEN_OPTIONS="$(echo --show-version \
+MAVEN_OPTIONS="${MAVEN_PARAMS} \
+ --show-version \
--batch-mode \
-Djenkins \
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
-Dmaven.repo.local=/tmp/r \
- -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r)"
+ -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r"
rm -rf $BUILD_DIR
mkdir -p $BUILD_DIR
# 2. Extract project MSI version from mdsal project
# 3. Replace version in patch by MSI version
# Otherwise release the MRI project
+
if [[ -d "odlparent" ]]; then
if [[ -d "mdsal" ]]; then
- # Extract patch and MSI used version
+ # Extract patch and MSI used odlparent version
patch_version="$(xpath ./odlparent/odlparent-lite/pom.xml '/project/version/text()' 2> /dev/null)"
msi_version="$(xpath ./mdsal/pom.xml '/project/parent/version/text()' 2> /dev/null)"
- # Replace version
+ # Replace odlparent version
find ./odlparent -name "*.xml" -print0 | xargs -0 sed -i "s/${patch_version}/${msi_version}/g"
+ echo "odlparent project version changed to ${msi_version}"
else
- # Release project
+ # Release odlparent
find ./odlparent -name "*.xml" -print0 | xargs -0 sed -i 's/-SNAPSHOT//g'
+ odlparent_version=${patch_version%"-SNAPSHOT"}
+ echo "odlparent project version changed to ${odlparent_version}"
fi
fi
if [[ -d "yangtools" ]]; then
- if [[ -d "mdsal" ]]; then
- # Extract patch and MSI used version
+ if [[ -d "mdsal" ]]; then
+ # Adjust yangtools and odlparent version to mdsal
+ # Extract patch and MSI used yangtools version
patch_version="$(xpath ./yangtools/pom.xml '/project/version/text()' 2> /dev/null)"
- msi_version="$(xpath ./mdsal/binding/yang-binding/pom.xml '/project/dependencyManagement/dependencies/dependency/version/text()' 2> /dev/null)"
- # Replace version
+ msi_version="$(xpath ./mdsal/dom/dom-parent/pom.xml '/project/dependencyManagement/dependencies/dependency[artifactId="yangtools-artifacts"]/version/text()' 2> /dev/null)"
+ # Replace yangtools version
find ./yangtools -name "*.xml" -print0 | xargs -0 sed -i "s/${patch_version}/${msi_version}/g"
+ echo "yangtools project version changed to ${msi_version}"
+ # Extract patch and MSI used odlparent version
+ patch_version="$(xpath ./yangtools/pom.xml '/project/parent/version/text()' 2> /dev/null)"
+ msi_version="$(xpath ./mdsal/pom.xml '/project/parent/version/text()' 2> /dev/null)"
+ # Replace odlparent version
+ find ./yangtools -name "*.xml" -print0 | xargs -0 sed -i "s/${patch_version}/${msi_version}/g"
+ echo "yangtools project odlparent version changed to ${msi_version}"
else
- # Release project
+ # Release yangtools and adjust odlparent version if required
find ./yangtools -name "*.xml" -print0 | xargs -0 sed -i 's/-SNAPSHOT//g'
+ yangtools_version=${patch_version%"-SddNAPSHOT"}
+ echo "yangtools project version changed to ${yangtools_version}"
+ if [[ -d "odlparent" ]]; then
+ # Extract odlparent version from odlparent
+ patch_version="$(xpath ./yangtools/pom.xml '/project/parent/version/text()' 2> /dev/null)"
+ # Replace odlparent version
+ find ./yangtools -name "*.xml" -print0 | xargs -0 sed -i "s/${patch_version}/${odlparent_version}/g"
+ echo "yangtools project odlparent version changed to ${odlparent_version}"
+ fi
fi
fi
rtd-token: 181be9dd804e4969b9f318a6f1988e3cbee9d9a8
- odl-maven-jobs
+ java-version:
+ - openjdk8
+ - openjdk11
stream: neon
project: 'lispflowmapping'
project-name: 'lispflowmapping'
- project:
name: mdsal-master
jobs:
- - '{project-name}-maven-javadoc-jobs':
- mvn-version: 'mvn33'
+ - '{project-name}-maven-javadoc-jobs'
- '{project-name}-rtd-jobs':
build-node: centos7-builder-2c-2g
project-pattern: mdsal
topology: '1node'
+ install-features: 'odl-netvirt-openstack, decanter-collector-jmx, decanter-appender-elasticsearch, odl-mdsal-trace'
+
public-bridge: 'br-datacentre'
public-physical-network: 'datacentre'
odl-snat-mode: 'conntrack'
- project:
name: odlparent-sonar
jobs:
- - gerrit-maven-sonar
+ - gerrit-maven-sonar:
+ mvn-params: >
+ -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
+ -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
project: 'odlparent'
project-name: 'odlparent'
rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f
- odl-maven-jobs
+ csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+ block_on_csit: false
+
stream: neon
project: 'openflowplugin'
project-name: 'openflowplugin'
- inject:
properties-file: env.properties
- maven-target:
- maven-version: 'mvn33'
+ maven-version: 'mvn35'
pom: 'pom.xml'
goals: >
verify -V -B -Pintegrationtest -Dsonar
-Dskip.karaf.featureTest=true
-Dovsdb.controller.address=${{CONTROLLER_IP}}
- Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+ -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
properties:
- 'ovsdbserver.ipaddress=127.0.0.1'
- 'ovsdbserver.port=6641'
global-settings: 'global-settings'
global-settings-type: cfp
- maven-target:
- maven-version: 'mvn33'
+ maven-version: 'mvn35'
# We should switch to the recommended configuration of sonar once
# JJB adds support for configurating the Sonar wrapper:
# http://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner+for+Jenkins
rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be
- odl-maven-jobs
+ csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+ block_on_csit: false
+
stream: neon
project: 'ovsdb'
project-name: 'ovsdb'
- string:
name: DOWNLOAD_URL
# yamllint disable-line rule:line-length
- default: 'https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.2/karaf-0.8.2.tar.gz'
+ default: 'https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.4/karaf-0.8.4.tar.gz'
description: 'URL to ODL tarball artifact to repackage into RPM'
- string:
name: CHANGELOG_NAME
build-timeout: '{build-timeout}'
builders:
- # Test Oxygen SR3 release tarball
+ # Test Oxygen SR4 release tarball
- inject:
# yamllint disable-line rule:line-length
- properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.3/karaf-0.8.3.tar.gz'
+ properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.4/karaf-0.8.4.tar.gz'
- shell: !include-raw-escape: build-rpm.sh
- install-test-uninstall-rpm
# NB: This will need to be updated as old builds expire
- inject:
# yamllint disable-line rule:line-length
- properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2473/org/opendaylight/integration/karaf/0.10.0/karaf-0.10.0.tar.gz'
+ properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2620/org/opendaylight/integration/karaf/0.10.0/karaf-0.10.0.tar.gz'
- shell: !include-raw-escape: build-rpm.sh
- install-test-uninstall-rpm
# NB: This will need to be updated as old builds expire
- inject:
# yamllint disable-line rule:line-length
- properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.10.0-SNAPSHOT/karaf-0.10.0-20181119.131156-18.zip'
+ properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.10.0-SNAPSHOT/karaf-0.10.0-20190103.173010-50.zip'
- shell: !include-raw-escape: build-rpm.sh
- install-test-uninstall-rpm
build-timeout: '{build-timeout}'
builders:
- # Test Oxygen SR3 release tarball
+ # Test Oxygen SR4 release tarball
- inject:
# yamllint disable-line rule:line-length
- properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.3/karaf-0.8.3.tar.gz'
+ properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.4/karaf-0.8.4.tar.gz'
- shell: !include-raw-escape: build-rpm.sh
- install-test-uninstall-rpm
# NB: This will need to be updated as old builds expire
- inject:
# yamllint disable-line rule:line-length
- properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2472/org/opendaylight/integration/karaf/0.8.4/karaf-0.8.4.tar.gz'
+ properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2622/org/opendaylight/integration/karaf/0.8.5/karaf-0.8.5.tar.gz'
- shell: !include-raw-escape: build-rpm.sh
- install-test-uninstall-rpm
# NB: This will need to be updated as old builds expire
- inject:
# yamllint disable-line rule:line-length
- properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2474/org/opendaylight/integration/karaf/0.9.1/karaf-0.9.1.tar.gz'
+ properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2621/org/opendaylight/integration/karaf/0.9.2/karaf-0.9.2.tar.gz'
- shell: !include-raw-escape: build-rpm.sh
- install-test-uninstall-rpm
# NB: This will need to be updated as old builds expire
- inject:
# yamllint disable-line rule:line-length
- properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.9.1-SNAPSHOT/karaf-0.9.1-20181112.140627-11.zip'
+ properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.9.2-SNAPSHOT/karaf-0.9.2-20181222.162905-8.zip'
- shell: !include-raw-escape: build-rpm.sh
- install-test-uninstall-rpm
# NB: This will need to be updated as old builds expire
- inject:
# yamllint disable-line rule:line-length
- properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2473/org/opendaylight/integration/karaf/0.10.0/karaf-0.10.0.tar.gz'
+ properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2620/org/opendaylight/integration/karaf/0.10.0/karaf-0.10.0.tar.g'
- shell: !include-raw-escape: build-rpm.sh
- install-test-uninstall-rpm
# NB: This will need to be updated as old builds expire
- inject:
# yamllint disable-line rule:line-length
- properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.10.0-SNAPSHOT/karaf-0.10.0-20181119.131156-18.zip'
+ properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.10.0-SNAPSHOT/karaf-0.10.0-20190103.173010-50.zip'
- shell: !include-raw-escape: build-rpm.sh
- install-test-uninstall-rpm
# Install RVM to help build recent version of Ruby
# The ruby_dep gem requires >=2.2.5, 2.0.0 is the latest pre-packaged for CentOS
-gpg2 --keyserver hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
+gpg2 --keyserver hkp://pool.sks-keyservers.net --recv-keys \
+ 409B6B1796C275462A1703113804BB82D39DC0E3 \
+ 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
curl -L get.rvm.io | bash -s stable
# Expected by RVM, seems required to make RVM functions (`rvm use`) available
# Silence absurdly verbose rvm output by temporally not echoing commands
set +x
+# Source line has a non-zero exit somewhere, that RVM doesn't mean to indicate
+# a real failure, but causes our jobs to fail when fail-on-errors is enabled.
+set +e
# shellcheck disable=SC1090
source "$HOME/.rvm/scripts/rvm"
-rvm install 2.4.0
+set -e
+rvm install 2.6.0
set -x
ruby --version
# This has to be done as a login shell to get rvm fns
# https://rvm.io/support/faq#what-shell-login-means-bash-l
# http://superuser.com/questions/306530/run-remote-ssh-command-with-full-login-shell
-bash -lc "rvm use 2.4.0 --default"
+bash -lc "rvm use 2.6.0 --default"
ruby --version
+# Update RubyGems using itself, as OS package may be old
+# Ran into RubyGems 2.x installed by OS, 3.x required by Bundler in INTPAK-230
+gem update --system
+
# Install gems dependencies of puppet-opendaylight via Bundler
gem install bundler
echo export PATH="\\$PATH:/usr/local/bin" >> "$HOME/.bashrc"
build-node: centos7-builder-2c-2g
archive-artifacts: '**/*.log'
build-timeout: 30
- jjb-version: 2.8.0
+ jjb-version: 2.9.1
- project:
name: builder-openstack
- gerrit-maven-stage:
sign-artifacts: true
mvn-central: true
- ossrh-profile-id: 7edbe315063867
+ ossrh-profile-id: 6386ebbbf3a563
- gerrit-maven-verify
- gerrit-maven-verify-dependencies:
build-timeout: 180
trigger-jobs: '{project}-merge-{stream}'
karaf-version: 'odl'
# yamllint disable-line rule:line-length
- repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+ repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
- fluorine:
branch: 'stable/fluorine'
trigger-jobs: '{project}-merge-{stream}'
karaf-version: 'odl'
# yamllint disable-line rule:line-length
- repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+ repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features'
- oxygen:
branch: 'stable/oxygen'
trigger-jobs: '{project}-merge-{stream}'
karaf-version: 'odl'
# yamllint disable-line rule:line-length
- repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+ repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
- fluorine:
branch: 'stable/fluorine'
trigger-jobs: '{project}-merge-{stream}'
karaf-version: 'odl'
# yamllint disable-line rule:line-length
- repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+ repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features'
install:
- all:
---
- project:
- name: sxp-csit-routing
+ name: sxp-csit-cluster-binding
jobs:
- inttest-csit-3node
project: 'sxp'
# The functionality under test
- functionality: 'routing'
+ functionality: 'cluster-binding'
# Project branches
stream:
trigger-jobs: '{project}-merge-{stream}'
karaf-version: 'odl'
# yamllint disable-line rule:line-length
- repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+ repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
- fluorine:
branch: 'stable/fluorine'
trigger-jobs: '{project}-merge-{stream}'
karaf-version: 'odl'
# yamllint disable-line rule:line-length
- repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
- - oxygen:
- branch: 'stable/oxygen'
+ repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features'
install:
- all:
scope: 'all'
# Features to install
- install-features: 'odl-restconf,odl-sxp-controller,odl-sxp-routing'
-
- # Tools VMs:
- tools_system_count: 2
+ install-features: 'odl-restconf,odl-sxp-controller'
# Robot custom options:
robot-options: ''
trigger-jobs: '{project}-merge-{stream}'
karaf-version: 'odl'
# yamllint disable-line rule:line-length
- repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+ repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
- fluorine:
branch: 'stable/fluorine'
trigger-jobs: '{project}-merge-{stream}'
karaf-version: 'odl'
# yamllint disable-line rule:line-length
- repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+ repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features'
- oxygen:
branch: 'stable/oxygen'
trigger-jobs: '{project}-merge-{stream}'
karaf-version: 'odl'
# yamllint disable-line rule:line-length
- repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+ repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
- fluorine:
branch: 'stable/fluorine'
trigger-jobs: '{project}-merge-{stream}'
karaf-version: 'odl'
# yamllint disable-line rule:line-length
- repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+ repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features'
- oxygen:
branch: 'stable/oxygen'
trigger-jobs: '{project}-merge-{stream}'
karaf-version: 'odl'
# yamllint disable-line rule:line-length
- repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+ repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
- fluorine:
branch: 'stable/fluorine'
trigger-jobs: '{project}-merge-{stream}'
karaf-version: 'odl'
# yamllint disable-line rule:line-length
- repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+ repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features'
- oxygen:
branch: 'stable/oxygen'
trigger-jobs: '{project}-merge-{stream}'
karaf-version: 'odl'
# yamllint disable-line rule:line-length
- repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+ repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
- fluorine:
branch: 'stable/fluorine'
trigger-jobs: '{project}-merge-{stream}'
karaf-version: 'odl'
# yamllint disable-line rule:line-length
- repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+ repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features'
- oxygen:
branch: 'stable/oxygen'
rtd-token: 4a78556e59ce3ef35e61e2fa19ebae049acf6d5d
- odl-maven-jobs
+ java-version:
+ - openjdk8
+ - openjdk11
+
stream: neon
project: 'sxp'
project-name: 'sxp'
--- /dev/null
+---
+- project:
+ name: telemetry-csit-basic
+ jobs:
+ - inttest-csit-1node
+ - inttest-csit-verify-1node
+
+ # The project name
+ project: 'telemetry'
+
+ # The functionality under test
+ functionality: 'basic'
+
+ # Project branches
+ stream:
+ - neon:
+ branch: 'master'
+
+ install:
+ - all:
+ scope: 'all'
+
+ # Features to install
+ install-features: 'odl-telemetry-all'
+
+ # Robot custom options
+ robot-options: ''
jobs:
- 'odl-maven-jobs'
- '{project-name}-integration-{stream}'
+ - '{project-name}-rtd-jobs':
+ build-node: centos7-builder-2c-2g
+ project-pattern: telemetry
+ rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-telemetry/57583/
+ rtd-token: 694bcbf8e0b45b3c4e53174c6e5773ca351e1efb
stream: neon
project: 'telemetry'
project-pattern: transportpce
rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-transportpce/47688/
rtd-token: 6f37ba63226bdcc6c823ee455e62237cf68813fd
+ - gerrit-tox-verify
- odl-maven-jobs
project: 'transportpce'
mvn-params: >
-Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
-Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
+ -Dskip.karaf.featureTest=true
project: 'yangtools'
project-name: 'yangtools'
openvswitch_version: 2.8.2
openvswitch_checksum: sha256:87b4a7e7134a44ce1f808d3415a2244b4518c2b0b2a42fa2f8231e592f13103d
k8s_version: 1.9.4
+ openvswitch_package_cache: /opt/cache/ovs
+ golang_package_cache: /opt/cache/golang
+ golang_version: 1.11.4
+ golang_checksum: sha256:fb26c30e6a04ad937bbc657a1b5bba92f80096af1e8ee6da6430c045a8db3a5b
pre_tasks:
- include_role: name=lfit.system-update
[tox]
minversion = 1.6
-envlist = coala,docs,pep8,prefix,robot
+envlist = coala,docs,jjb-version,pep8,prefix,robot
skipsdist = true
[testenv:coala]
[testenv:jenkins-jobs]
deps =
- jenkins-job-builder=={env:JJB_VERSION:2.7.0}
+ jenkins-job-builder=={env:JJB_VERSION:2.9.1}
commands =
jenkins-jobs {posargs:--help}
Code Review / releng / builder.git / commitdiff