From: Jamo Luhrsen Date: Wed, 23 Jan 2019 19:10:24 +0000 (+0000) Subject: Merge "Revert "Reduce amount of robot minions allowed"" X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=cfad36d6090b4086cdcdc3a08c7ff733d6e98664;hp=6e50b1236251e5924ab1d2ccf0c21d16c390f7df;p=releng%2Fbuilder.git Merge "Revert "Reduce amount of robot minions allowed"" --- diff --git a/global-jjb b/global-jjb index 8ed761356..ba3f1f932 160000 --- a/global-jjb +++ b/global-jjb @@ -1 +1 @@ -Subproject commit 8ed761356296d6dfb78f01bbe44d5bbb75be11a1 +Subproject commit ba3f1f932f671039373402b81640f7be2cde9bb8 diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index afafe62d7..48faad2e1 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -5,11 +5,11 @@ - 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 diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index 327989f05..a17b29adc 100644 --- a/jjb/autorelease/autorelease-templates.yaml +++ b/jjb/autorelease/autorelease-templates.yaml @@ -181,7 +181,6 @@ - shell: | mkdir -p archives/ cp *.log *.prop $_ - - lf-provide-maven-settings-cleanup publishers: - opendaylight-infra-notify-status diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index 31daa55df..82b640e10 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -23,9 +23,8 @@ 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 @@ -55,8 +54,7 @@ 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 @@ -80,9 +78,8 @@ 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 @@ -94,6 +91,7 @@ mvn-params: > -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec + -P!karaf project: 'bgpcep' project-name: 'bgpcep' diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml index 8f91a7f7b..cc01016fb 100644 --- a/jjb/defaults.yaml +++ b/jjb/defaults.yaml @@ -85,22 +85,6 @@ # 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: '' diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index 4036ef22c..6aad10ae9 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -11,6 +11,9 @@ 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' diff --git a/jjb/integration/common-functions.sh b/jjb/integration/common-functions.sh index 2c466d220..7082b2a5b 100644 --- a/jjb/integration/common-functions.sh +++ b/jjb/integration/common-functions.sh @@ -21,6 +21,7 @@ function print_common_env() { cat << EOF common-functions environment: MAVENCONF: ${MAVENCONF} +ACTUALFEATURES: ${ACTUALFEATURES} FEATURESCONF: ${FEATURESCONF} CUSTOMPROP: ${CUSTOMPROP} LOGCONF: ${LOGCONF} @@ -29,6 +30,7 @@ CONTROLLERMEM: ${CONTROLLERMEM} AKKACONF: ${AKKACONF} MODULESCONF: ${MODULESCONF} MODULESHARDSCONF: ${MODULESHARDSCONF} +SUITES: ${SUITES} EOF } @@ -90,8 +92,9 @@ function configure_karaf_log() { 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 @@ -117,6 +120,73 @@ function configure_karaf_log() { 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 diff --git a/jjb/integration/csit-jobs-neon.lst b/jjb/integration/csit-jobs-neon.lst index 61a08907c..9d95f6b5b 100644 --- a/jjb/integration/csit-jobs-neon.lst +++ b/jjb/integration/csit-jobs-neon.lst @@ -60,4 +60,5 @@ ovsdb-csit-1node-upstream-southbound-all-neon, 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, diff --git a/jjb/integration/csit-jobs-oxygen.lst b/jjb/integration/csit-jobs-oxygen.lst index f6a99cd32..d39a0326e 100644 --- a/jjb/integration/csit-jobs-oxygen.lst +++ b/jjb/integration/csit-jobs-oxygen.lst @@ -74,7 +74,6 @@ sxp-csit-1node-filtering-all-oxygen, 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, diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index 8a63b58a9..004b1e796 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -25,26 +25,19 @@ # 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, @@ -182,8 +175,9 @@ 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 @@ -193,7 +187,7 @@ sxp-merge-{stream}, transportpce-merge-{stream}, tsdr-merge-{stream}, - unimgr-merge-{stream}, + unimgr-merge-{stream} - project: name: distribution-release diff --git a/jjb/integration/integration-apex-run-tests.sh b/jjb/integration/integration-apex-run-tests.sh index 2b4fc1ba3..14f9f4a8a 100644 --- a/jjb/integration/integration-apex-run-tests.sh +++ b/jjb/integration/integration-apex-run-tests.sh @@ -12,6 +12,10 @@ print_job_parameters 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} diff --git a/jjb/integration/integration-compare-distributions.sh b/jjb/integration/integration-compare-distributions.sh index eb2df1c06..87ad52100 100644 --- a/jjb/integration/integration-compare-distributions.sh +++ b/jjb/integration/integration-compare-distributions.sh @@ -47,9 +47,8 @@ NEW_DISTRO="$(find $WORKSPACE -name "${KARAF_ARTIFACT}*.zip")" 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 diff --git a/jjb/integration/integration-deploy-controller-run-test.sh b/jjb/integration/integration-deploy-controller-run-test.sh index b123a2f57..788da938b 100755 --- a/jjb/integration/integration-deploy-controller-run-test.sh +++ b/jjb/integration/integration-deploy-controller-run-test.sh @@ -55,6 +55,7 @@ robot -N ${TESTPLAN} \ -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} \ diff --git a/jjb/integration/integration-macros-heat.yaml b/jjb/integration/integration-macros-heat.yaml new file mode 100644 index 000000000..87cb7f372 --- /dev/null +++ b/jjb/integration/integration-macros-heat.yaml @@ -0,0 +1,199 @@ +--- +################ +# 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' diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index b533504f1..b9e448a03 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -285,126 +285,6 @@ # 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 diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 3b35071b1..50b821a59 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -69,6 +69,24 @@ 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}' @@ -83,6 +101,13 @@ 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: @@ -115,14 +140,10 @@ 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' @@ -142,6 +163,8 @@ robot_other_files: '' robot-pass-threshold: 100.0 robot-unstable-threshold: 0.0 + - lf-stack-delete: + openstack-cloud: '{openstack-cloud}' - lf-infra-publish @@ -156,7 +179,15 @@ # 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 # @@ -176,6 +207,13 @@ 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: @@ -210,14 +248,10 @@ 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' @@ -378,6 +412,8 @@ 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: @@ -408,6 +444,13 @@ 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: @@ -439,7 +482,15 @@ # 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 # @@ -459,6 +510,13 @@ 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: @@ -493,14 +551,10 @@ 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' @@ -521,6 +575,8 @@ robot_other_files: '' robot-pass-threshold: 100.0 robot-unstable-threshold: 0.0 + - lf-stack-delete: + openstack-cloud: '{openstack-cloud}' - lf-infra-publish @@ -535,7 +591,15 @@ # 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 # @@ -555,6 +619,13 @@ 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: @@ -589,14 +660,10 @@ 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' @@ -758,6 +825,8 @@ 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: @@ -788,6 +857,13 @@ 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: @@ -819,7 +895,16 @@ # 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 # @@ -839,6 +924,13 @@ 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: @@ -866,14 +958,10 @@ 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' @@ -923,6 +1011,8 @@ robot_other_files: '' robot-pass-threshold: 100.0 robot-unstable-threshold: 0.0 + - lf-stack-delete: + openstack-cloud: '{openstack-cloud}' - lf-infra-publish @@ -937,7 +1027,22 @@ # 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 # @@ -957,6 +1062,19 @@ 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: @@ -1102,20 +1220,10 @@ 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' @@ -1138,6 +1246,8 @@ - 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: @@ -1170,6 +1280,19 @@ 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: @@ -1316,7 +1439,22 @@ # 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 # @@ -1336,6 +1474,19 @@ 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: @@ -1485,20 +1636,10 @@ 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' @@ -1521,6 +1662,8 @@ - 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: @@ -1553,6 +1696,19 @@ 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: @@ -1701,6 +1857,8 @@ id: inttest-patch-test <<: *inttest_csit_common + build-timeout: 720 + parameters: - opendaylight-infra-parameters: os-cloud: '{os-cloud}' @@ -1794,6 +1952,7 @@ predefined-parameters: | BUNDLE_URL=$BUNDLE_URL GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_PROJECT=$GERRIT_PROJECT GERRIT_REFSPEC=$GERRIT_REFSPEC KARAF_VERSION=$KARAF_VERSION @@ -1814,7 +1973,9 @@ # 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 # @@ -1834,6 +1995,16 @@ 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: @@ -1888,17 +2059,10 @@ 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 @@ -1919,6 +2083,8 @@ - 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: @@ -1951,6 +2117,16 @@ 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: diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 40475f69a..b1b6c24d7 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -196,6 +196,11 @@ 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: diff --git a/jjb/integration/multipatch-distribution.sh b/jjb/integration/multipatch-distribution.sh index 82220dff3..5a189d4f4 100755 --- a/jjb/integration/multipatch-distribution.sh +++ b/jjb/integration/multipatch-distribution.sh @@ -5,12 +5,13 @@ set -e # 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 @@ -167,28 +168,49 @@ fi # 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 diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index 1ff72034e..4d5492db0 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -11,6 +11,9 @@ rtd-token: 181be9dd804e4969b9f318a6f1988e3cbee9d9a8 - odl-maven-jobs + java-version: + - openjdk8 + - openjdk11 stream: neon project: 'lispflowmapping' project-name: 'lispflowmapping' diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml index 030eb082e..7b7c25a5c 100644 --- a/jjb/mdsal/mdsal.yaml +++ b/jjb/mdsal/mdsal.yaml @@ -2,8 +2,7 @@ - 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 diff --git a/jjb/netvirt/netvirt-csit-multi-apex.yaml b/jjb/netvirt/netvirt-csit-multi-apex.yaml index 9647cc22f..005558ef5 100644 --- a/jjb/netvirt/netvirt-csit-multi-apex.yaml +++ b/jjb/netvirt/netvirt-csit-multi-apex.yaml @@ -19,6 +19,8 @@ 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' diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml index da2e6d827..8dbcaa052 100644 --- a/jjb/odlparent/odlparent.yaml +++ b/jjb/odlparent/odlparent.yaml @@ -92,7 +92,10 @@ - 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' diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index 3b30d6118..7805f8dbc 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -12,6 +12,9 @@ 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' diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml index 071b82f45..521a9098e 100644 --- a/jjb/ovsdb/ovsdb-sonar.yaml +++ b/jjb/ovsdb/ovsdb-sonar.yaml @@ -75,13 +75,13 @@ - 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' @@ -91,7 +91,7 @@ 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 diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index a62d9800a..c8c482541 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -11,6 +11,9 @@ 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' diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml index 9cea36fac..007a20e42 100644 --- a/jjb/packaging/packaging.yaml +++ b/jjb/packaging/packaging.yaml @@ -68,7 +68,7 @@ - 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 @@ -210,10 +210,10 @@ 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 @@ -235,7 +235,7 @@ # 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 @@ -243,7 +243,7 @@ # 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 @@ -292,10 +292,10 @@ 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 @@ -303,7 +303,7 @@ # 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 @@ -331,7 +331,7 @@ # 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 @@ -339,7 +339,7 @@ # 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 @@ -353,7 +353,7 @@ # 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 @@ -361,7 +361,7 @@ # 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 diff --git a/jjb/packaging/test-puppet.sh b/jjb/packaging/test-puppet.sh index 1f4d97c37..c0aace6c0 100644 --- a/jjb/packaging/test-puppet.sh +++ b/jjb/packaging/test-puppet.sh @@ -15,22 +15,32 @@ sudo yum install -y ruby-devel gcc-c++ zlib-devel patch redhat-rpm-config make r # 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" diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml index ba5479ee1..8b35fbf77 100644 --- a/jjb/releng-jobs.yaml +++ b/jjb/releng-jobs.yaml @@ -29,7 +29,7 @@ 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 diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml index d735b4876..715afe353 100644 --- a/jjb/releng-templates-java.yaml +++ b/jjb/releng-templates-java.yaml @@ -21,7 +21,7 @@ - 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 diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml index 3cb0856e0..c137ab7b6 100644 --- a/jjb/sxp/sxp-csit-basic.yaml +++ b/jjb/sxp/sxp-csit-basic.yaml @@ -17,13 +17,13 @@ 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' diff --git a/jjb/sxp/sxp-csit-binding-origin.yaml b/jjb/sxp/sxp-csit-binding-origin.yaml index a46a8d1a4..3fe2e5be5 100644 --- a/jjb/sxp/sxp-csit-binding-origin.yaml +++ b/jjb/sxp/sxp-csit-binding-origin.yaml @@ -17,13 +17,13 @@ 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: diff --git a/jjb/sxp/sxp-csit-cluster-routing.yaml b/jjb/sxp/sxp-csit-cluster-binding.yaml similarity index 63% rename from jjb/sxp/sxp-csit-cluster-routing.yaml rename to jjb/sxp/sxp-csit-cluster-binding.yaml index 723c3e4a2..09e2f7132 100644 --- a/jjb/sxp/sxp-csit-cluster-routing.yaml +++ b/jjb/sxp/sxp-csit-cluster-binding.yaml @@ -1,6 +1,6 @@ --- - project: - name: sxp-csit-routing + name: sxp-csit-cluster-binding jobs: - inttest-csit-3node @@ -8,7 +8,7 @@ project: 'sxp' # The functionality under test - functionality: 'routing' + functionality: 'cluster-binding' # Project branches stream: @@ -17,25 +17,20 @@ 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: '' diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml index 700753c24..781ba19c3 100644 --- a/jjb/sxp/sxp-csit-clustering.yaml +++ b/jjb/sxp/sxp-csit-clustering.yaml @@ -17,13 +17,13 @@ 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' diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml index 9bd243f7b..a443ff176 100644 --- a/jjb/sxp/sxp-csit-filtering.yaml +++ b/jjb/sxp/sxp-csit-filtering.yaml @@ -17,13 +17,13 @@ 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' diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml index be41e1948..b02734dfa 100644 --- a/jjb/sxp/sxp-csit-performance.yaml +++ b/jjb/sxp/sxp-csit-performance.yaml @@ -17,13 +17,13 @@ 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' diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index 55bec1ec2..ed1806bab 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -17,13 +17,13 @@ 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' diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index deb7b97d6..c84828118 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -9,6 +9,10 @@ rtd-token: 4a78556e59ce3ef35e61e2fa19ebae049acf6d5d - odl-maven-jobs + java-version: + - openjdk8 + - openjdk11 + stream: neon project: 'sxp' project-name: 'sxp' diff --git a/jjb/telemetry/telemetry-csit-basic.yaml b/jjb/telemetry/telemetry-csit-basic.yaml new file mode 100644 index 000000000..b7f9829a6 --- /dev/null +++ b/jjb/telemetry/telemetry-csit-basic.yaml @@ -0,0 +1,27 @@ +--- +- 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: '' diff --git a/jjb/telemetry/telemetry.yaml b/jjb/telemetry/telemetry.yaml index f3342b272..c14d5a77c 100644 --- a/jjb/telemetry/telemetry.yaml +++ b/jjb/telemetry/telemetry.yaml @@ -4,6 +4,11 @@ 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' diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index 920b4e294..b02bb5ee0 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -7,6 +7,7 @@ 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' diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml index 73e939660..c99554fd9 100644 --- a/jjb/yangtools/yangtools.yaml +++ b/jjb/yangtools/yangtools.yaml @@ -87,6 +87,7 @@ 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' diff --git a/packer/provision/kubernetes.yaml b/packer/provision/kubernetes.yaml index ecf9e5f21..fbd554bcb 100644 --- a/packer/provision/kubernetes.yaml +++ b/packer/provision/kubernetes.yaml @@ -6,6 +6,10 @@ 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 diff --git a/tox.ini b/tox.ini index cf80a1dd7..285f26627 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 1.6 -envlist = coala,docs,pep8,prefix,robot +envlist = coala,docs,jjb-version,pep8,prefix,robot skipsdist = true [testenv:coala] @@ -23,7 +23,7 @@ commands = sphinx-build -b html -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs [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}