Merge "Preserve Karaf logs in autorelease jobs"
authorJamo Luhrsen <jluhrsen@redhat.com>
Thu, 15 Mar 2018 16:23:28 +0000 (16:23 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Thu, 15 Mar 2018 16:23:28 +0000 (16:23 +0000)
305 files changed:
.coafile
check_prefix.sh [new file with mode: 0755]
docs/_static/logo.png [new file with mode: 0644]
docs/cloud-images.rst
docs/conf.py
docs/conf.yaml [new file with mode: 0644]
docs/favicon.ico [new file with mode: 0644]
docs/index.rst
docs/jenkins.rst
docs/release-workflow.rst
docs/requirements.txt [new file with mode: 0644]
jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/odlvex/cloud.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/odlvex/ubuntu1604-docker-2c-2g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg [new file with mode: 0644]
jenkins-config/global-vars-releng.sh [new file with mode: 0644]
jenkins-config/global-vars-sandbox.sh [new file with mode: 0644]
jjb/aaa/aaa-csit-authn.yaml
jjb/aaa/aaa-csit-keystone.yaml
jjb/aaa/aaa-csit-tls.yaml
jjb/aaa/aaa-patch-test.yaml
jjb/aaa/aaa.yaml
jjb/alto/alto-csit-setup.yaml
jjb/alto/alto.yaml
jjb/atrium/atrium.yaml
jjb/autorelease/autorelease-macros.yaml
jjb/autorelease/autorelease-projects.yaml
jjb/autorelease/autorelease-templates.yaml
jjb/autorelease/autorelease-version-management.yaml
jjb/autorelease/branch-cut.sh [new file with mode: 0644]
jjb/autorelease/compare-autorelease-projects.sh [new file with mode: 0644]
jjb/autorelease/notify-build-failure.sh
jjb/autorelease/update-validate-autorelease-projects.sh
jjb/autorelease/validate-autorelease-oxygen.yaml
jjb/autorelease/version-bump.sh
jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml
jjb/bgpcep/bgpcep-csit-throughpcep.yaml
jjb/bgpcep/bgpcep-csit-userfeatures.yaml
jjb/bgpcep/bgpcep-patch-test.yaml
jjb/bgpcep/bgpcep.yaml
jjb/bier/bier-csit-basic.yaml
jjb/bier/bier.yaml
jjb/capwap/capwap-csit-ac.yaml
jjb/capwap/capwap.yaml
jjb/cardinal/cardinal.yaml
jjb/centinel/centinel-csit-basic.yaml
jjb/centinel/centinel.yaml
jjb/coe/coe-csit-openstack.yaml [deleted file]
jjb/coe/coe.yaml
jjb/controller/controller-csit-akka1.yaml
jjb/controller/controller-csit-clustering.yaml
jjb/controller/controller-csit-cs-chasing-leader.yaml
jjb/controller/controller-csit-cs-partnheal.yaml
jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
jjb/controller/controller-csit-dnb-noloss.yaml
jjb/controller/controller-csit-drb-partnheal.yaml
jjb/controller/controller-csit-drb-precedence.yaml
jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
jjb/controller/controller-csit-periodic-dsbenchmark.yaml
jjb/controller/controller-csit-rest-cars-perf.yaml
jjb/controller/controller-csit-rest-clust-cars-perf.yaml
jjb/controller/controller.yaml
jjb/copy-sandbox-logs.sh [new file with mode: 0644]
jjb/coretutorials/coretutorials.yaml
jjb/daexim/daexim-csit-basic.yaml
jjb/daexim/daexim-csit-clustering-basic.yaml
jjb/daexim/daexim.yaml
jjb/didm/didm-csit-discovery.yaml
jjb/didm/didm.yaml
jjb/dlux/dlux.yaml
jjb/dluxapps/dluxapps-csit-yangman.yaml
jjb/dluxapps/dluxapps.yaml
jjb/docs/docs-rtd.yaml
jjb/eman/eman.yaml
jjb/faas/faas.yaml
jjb/federation/federation.yaml
jjb/genius/genius-csit-genius.yaml
jjb/genius/genius-patch-test.yaml
jjb/genius/genius.yaml
jjb/global-jjb
jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
jjb/groupbasedpolicy/groupbasedpolicy.yaml
jjb/honeycomb/vbd/vbd.yaml
jjb/infrautils/infrautils-patch-test.yaml
jjb/infrautils/infrautils.yaml
jjb/integration/common-functions.sh [new file with mode: 0644]
jjb/integration/copy-common-functions.sh [new file with mode: 0644]
jjb/integration/csit-jobs-carbon.lst
jjb/integration/csit-jobs-fluorine.lst [new file with mode: 0644]
jjb/integration/csit-jobs-nitrogen.lst
jjb/integration/csit-jobs-oxygen.lst
jjb/integration/distribution/distribution-check-bootup.sh
jjb/integration/distribution/distribution-csit-userfeatures.yaml
jjb/integration/distribution/distribution-deploy-offline.sh
jjb/integration/distribution/distribution-deploy-verify.sh
jjb/integration/distribution/distribution-jobs.yaml
jjb/integration/distribution/distribution-macros.yaml
jjb/integration/distribution/distribution-templates.yaml
jjb/integration/distribution/distribution.yaml
jjb/integration/integration-configure-clustering.sh
jjb/integration/integration-deploy-controller-run-test.sh
jjb/integration/integration-deploy-openstack-run-test.sh
jjb/integration/integration-get-slave-addresses.sh
jjb/integration/integration-install-robotframework.sh
jjb/integration/integration-macros.yaml
jjb/integration/integration-start-cluster-run-test.sh
jjb/integration/integration-templates.yaml
jjb/integration/integration-test-jobs.yaml
jjb/integration/integration4-templates.yaml [deleted file]
jjb/integration/multipatch-distribution.sh
jjb/iotdm/iotdm-csit-basic.yaml
jjb/iotdm/iotdm.yaml
jjb/jsonrpc/jsonrpc-csit-basic.yaml
jjb/jsonrpc/jsonrpc.yaml
jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
jjb/l2switch/l2switch-csit-scalability.yaml
jjb/l2switch/l2switch-csit-switch.yaml
jjb/l2switch/l2switch-patch-test.yaml
jjb/l2switch/l2switch.yaml
jjb/lacp/lacp-csit-lacp.yaml
jjb/lacp/lacp.yaml
jjb/lf-infra/lf-infra-jobs.yaml
jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
jjb/lispflowmapping/lispflowmapping.yaml
jjb/mdsal/mdsal-csit-bindingv1.yaml
jjb/mdsal/mdsal.yaml
jjb/messaging4transport/messaging4transport-csit-basic.yaml
jjb/messaging4transport/messaging4transport.yaml
jjb/natapp/natapp-csit-basic.yaml
jjb/natapp/natapp.yaml
jjb/nemo/nemo-csit-engine.yaml
jjb/nemo/nemo.yaml
jjb/netconf/netconf-cluster-stress.yaml
jjb/netconf/netconf-clustering-scale.yaml
jjb/netconf/netconf-clustering.yaml
jjb/netconf/netconf-csit-callhome.yaml
jjb/netconf/netconf-patch-test.yaml
jjb/netconf/netconf-scale.yaml
jjb/netconf/netconf-userfeatures.yaml
jjb/netconf/netconf.yaml
jjb/netide/netide-csit-basic.yaml
jjb/netide/netide.yaml
jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
jjb/netvirt/netvirt-csit-multi-openstack.yaml
jjb/netvirt/netvirt-full-integration.yaml
jjb/netvirt/netvirt-patch-test.yaml
jjb/netvirt/netvirt.yaml
jjb/neutron/neutron.yaml
jjb/next/next.yaml
jjb/nic/nic-csit-basic.yaml
jjb/nic/nic.yaml
jjb/ocpplugin/ocpplugin-csit-basic.yaml
jjb/ocpplugin/ocpplugin-csit-scalability.yaml
jjb/ocpplugin/ocpplugin.yaml
jjb/odl-openstack-check-image-protection.sh [moved from jjb/opendaylight-infra-check-image-protection.sh with 91% similarity]
jjb/odl-openstack-cleanup-old-images.sh [moved from jjb/opendaylight-infra-cleanup-old-images.sh with 59% similarity]
jjb/odl-openstack-cleanup-orphaned-nodes.sh [moved from jjb/opendaylight-infra-cleanup-orphaned-nodes.sh with 86% similarity]
jjb/odl-openstack-cleanup-stale-nodes.sh [moved from jjb/opendaylight-infra-cleanup-stale-nodes.sh with 72% similarity]
jjb/odl-openstack-cleanup-stale-stacks.sh [moved from jjb/opendaylight-infra-cleanup-stale-stacks.sh with 96% similarity]
jjb/odl-openstack-install.sh [new file with mode: 0644]
jjb/odlparent/odlparent.yaml
jjb/of-config/of-config-csit-basic.yaml
jjb/of-config/of-config.yaml
jjb/ofextensions/circuitsw/circuitsw.yaml
jjb/opendaylight-infra-stack.sh
jjb/openflowjava/openflowjava.yaml
jjb/openflowplugin/openflowplugin-csit-cbench.yaml
jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
jjb/openflowplugin/openflowplugin-csit-clustering.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
jjb/openflowplugin/openflowplugin-csit-longevity.yaml
jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
jjb/openflowplugin/openflowplugin-csit-sanity.yaml
jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
jjb/openflowplugin/openflowplugin-csit-scale.yaml
jjb/openflowplugin/openflowplugin-patch-test.yaml
jjb/openflowplugin/openflowplugin.yaml
jjb/opflex/opflex-custom.yaml
jjb/opflex/opflex.yaml
jjb/ovil/ovil.yaml
jjb/ovsdb/ovsdb-csit-clustering.yaml
jjb/ovsdb/ovsdb-csit-southbound.yaml
jjb/ovsdb/ovsdb-full-integration.yaml
jjb/ovsdb/ovsdb-patch-test.yaml
jjb/ovsdb/ovsdb-sonar.yaml
jjb/ovsdb/ovsdb.yaml
jjb/p4plugin/p4plugin-csit-basic.yaml
jjb/p4plugin/p4plugin.yaml
jjb/packaging/build-rpm-snap-docker.sh [new file with mode: 0644]
jjb/packaging/build-rpm-snap.sh
jjb/packaging/build-rpm.sh
jjb/packaging/install-rpm.sh
jjb/packaging/packaging-macros.yaml [new file with mode: 0644]
jjb/packaging/packaging.yaml
jjb/packaging/start-odl.sh
jjb/packaging/test-ansible-deb.sh
jjb/packaging/test-ansible-rpm.sh
jjb/packaging/test-karaf-oxygensafe.expect [new file with mode: 0644]
jjb/packaging/test-karaf.expect
jjb/packaging/test-ports-nofeature.sh [new file with mode: 0644]
jjb/packaging/test-rest-ok.sh [new file with mode: 0644]
jjb/packaging/test-rpm-deps.sh
jjb/packaging/test-rpm-docker.sh [new file with mode: 0644]
jjb/packaging/uninstall-rpm.sh [new file with mode: 0644]
jjb/packetcable/packetcable-csit-pcmm.yaml
jjb/packetcable/packetcable.yaml
jjb/persistence/persistence.yaml
jjb/releng-defaults.yaml
jjb/releng-jobs.yaml
jjb/releng-macros.yaml
jjb/releng-packer-jobs.yaml
jjb/releng-templates-java.yaml
jjb/releng-templates.yaml
jjb/reservation/reservation.yaml
jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
jjb/sdninterfaceapp/sdninterfaceapp.yaml
jjb/sfc/sfc-csit-full-deploy.yaml
jjb/sfc/sfc-csit-rest-basic.yaml
jjb/sfc/sfc-patch-test.yaml
jjb/sfc/sfc-python.yaml
jjb/sfc/sfc.yaml
jjb/snbi/snbi.yaml
jjb/snmp/snmp.yaml
jjb/snmp4sdn/snmp4sdn.yaml
jjb/sxp/sxp-csit-basic.yaml
jjb/sxp/sxp-csit-cluster-routing.yaml
jjb/sxp/sxp-csit-clustering.yaml
jjb/sxp/sxp-csit-filtering.yaml
jjb/sxp/sxp-csit-performance.yaml
jjb/sxp/sxp-csit-topology.yaml
jjb/sxp/sxp.yaml
jjb/systemmetrics/systemmetrics.yaml
jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
jjb/topoprocessing/topoprocessing.yaml
jjb/transportpce/transportpce.yaml
jjb/tsdr/tsdr-csit-cassandra.yaml
jjb/tsdr/tsdr-csit-elasticsearch.yaml
jjb/tsdr/tsdr-csit-hbase.yaml
jjb/tsdr/tsdr-csit-hsqldb.yaml
jjb/tsdr/tsdr.yaml
jjb/ttp/ttp.yaml
jjb/unimgr/unimgr-csit-basic.yaml
jjb/unimgr/unimgr-csit-legato.yaml
jjb/unimgr/unimgr.yaml
jjb/usc/usc-csit-channel.yaml
jjb/usc/usc-csit-tcp.yaml
jjb/usc/usc.yaml
jjb/usecplugin/usecplugin-csit-basic.yaml
jjb/usecplugin/usecplugin.yaml
jjb/vtn/vtn-csit-3node-manager.yaml
jjb/vtn/vtn-csit-coordinator.yaml
jjb/vtn/vtn-csit-manager.yaml
jjb/vtn/vtn-manager-csit-1node-openstack.yaml
jjb/vtn/vtn-patch-test.yaml
jjb/vtn/vtn.yaml
jjb/yang-push/yang-push.yaml
jjb/yangide/yangide.yaml
jjb/yangtools/yangtools-csit-system.yaml
jjb/yangtools/yangtools.yaml
lf-ansible
openstack-hot/generic-server.yaml
packer/common-packer
packer/provision/builder.yaml [deleted file]
packer/provision/local-builder.yaml [new file with mode: 0644]
packer/provision/local-docker.yaml [new file with mode: 0644]
packer/provision/mininet-ovs-2.8.yaml [new file with mode: 0644]
packer/templates/builder.json [changed from file to symlink]
packer/templates/devstack-pre-pip-ocata.json
packer/templates/devstack-pre-pip-pike.json
packer/templates/devstack-pre-pip-queens.json [moved from packer/templates/devstack-pre-pip-newton.json with 59% similarity]
packer/templates/devstack.json
packer/templates/docker.json
packer/templates/gbp.json
packer/templates/mininet-ovs-2.5.json
packer/templates/mininet-ovs-2.6.json
packer/templates/mininet-ovs-2.8.json [new file with mode: 0644]
packer/vars/centos.json
packer/vars/ubuntu-14.04.json
packer/vars/ubuntu-16.04.json
scripts/branch_cut/branch_cut.awk
tox.ini

index 47cf0afb0b62d28f3efad57549d4f6ee72186348..f087a8e75323cbb718dfec277f19972ec4eaa01d 100644 (file)
--- a/.coafile
+++ b/.coafile
@@ -31,6 +31,7 @@ files = **.sh
 ignore = .git/**,
     .tox/**,
     jjb/global-jjb/**,
+    jenkins-config/**,
     jenkins-scripts/*-local-env.sh
 shell = bash
 indent_size = 4
diff --git a/check_prefix.sh b/check_prefix.sh
new file mode 100755 (executable)
index 0000000..87a8427
--- /dev/null
@@ -0,0 +1,19 @@
+#!/bin/bash
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2018 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+# Ensures that the prefix MUST be set to blank
+#
+# The production prefix MUST always be a blank string.
+
+if grep 'prefix:' jjb/releng-defaults.yaml | grep -v "''"; then
+    echo "ERROR: A non-blank prefix is defined in jjb/releng-defaults.yaml"
+    echo "The prefix MUST be set to blank '' in production!"
+    exit 1
+fi
diff --git a/docs/_static/logo.png b/docs/_static/logo.png
new file mode 100644 (file)
index 0000000..861e1af
Binary files /dev/null and b/docs/_static/logo.png differ
index f528fbbebee2a491a20bddcdcd8cf1a30f930516..001b7101681305742af7bf6d179e4cca9da21cdd 100644 (file)
@@ -1,9 +1,15 @@
 Following are the list of published images available to be used with Jenkins jobs.
 
+* ZZCI - CentOS 7 - autorelease - 20180125-2240
+* ZZCI - CentOS 7 - builder - 20180109-0417
+* ZZCI - CentOS 7 - builder - 20180110-1659
+* ZZCI - CentOS 7 - builder - 20180201-2139
 * ZZCI - CentOS 7 - devstack - 20171208-1648
 * ZZCI - CentOS 7 - devstack-ocata - 20171208-1649
 * ZZCI - CentOS 7 - devstack-pike - 20171208-1649
 * ZZCI - CentOS 7 - docker - 20171209-0317
+* ZZCI - CentOS 7 - docker - 20180109-0346
+* ZZCI - CentOS 7 - docker - 20180110-1659
 * ZZCI - CentOS 7 - java-builder - 20171206-1842
 * ZZCI - CentOS 7 - java-builder - 20171209-0032
 * ZZCI - CentOS 7 - robot - 20171207-1911
index a297541cad2684ddb0cf81b4485e90a9bc2e6b10..925316abfa248333bf07605e24fc4a9ad928c78e 100644 (file)
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2018 The Linux Foundation and others.
 #
-# OpenDaylight RelEng/Builder documentation build configuration file, created by
-# sphinx-quickstart on Thu May  5 10:17:10 2016.
-#
-# This file is execfile()d with the current directory set to its
-# containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-import sys
-import os
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
-
-# -- General configuration ------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
-# ones.
-extensions = []
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix(es) of source filenames.
-# You can specify multiple suffix as a list of string:
-# source_suffix = ['.rst', '.md']
-source_suffix = '.rst'
-
-# The encoding of source files.
-#source_encoding = 'utf-8-sig'
-
-# The master toctree document.
-master_doc = 'index'
-
-# General information about the project.
-project = 'OpenDaylight RelEng/Builder'
-copyright = '2016, Andrew Grimberg, Thanh Ha, Daniel Farell'
-author = 'Andrew Grimberg, Thanh Ha, Daniel Farell'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = '1.0.0'
-# The full version, including alpha/beta/rc tags.
-release = '1.0.0'
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#
-# This is also used if you do content translation via gettext catalogs.
-# Usually you set "language" from the command line for these cases.
-language = None
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-# This patterns also effect to html_static_path and html_extra_path
-exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
-
-# The reST default role (used for this markup: `text`) to use for all
-# documents.
-#default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
-# If true, keep warnings as "system message" paragraphs in the built documents.
-#keep_warnings = False
-
-# If true, `todo` and `todoList` produce output, else they produce nothing.
-todo_include_todos = False
-
-
-# -- Options for HTML output ----------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-html_theme = 'alabaster'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#html_theme_options = {}
-
-# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
-
-# The name for this set of Sphinx documents.
-# "<project> v<release> documentation" by default.
-#html_title = 'OpenDaylight RelEng/Builder v1.0.0'
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (relative to this directory) to use as a favicon of
-# the docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
-
-# Add any extra paths that contain custom files (such as robots.txt or
-# .htaccess) here, relative to this directory. These files are copied
-# directly to the root of the documentation.
-#html_extra_path = []
-
-# If not None, a 'Last updated on:' timestamp is inserted at every page
-# bottom, using the given strftime format.
-# The empty string is equivalent to '%b %d, %Y'.
-#html_last_updated_fmt = None
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_domain_indices = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
-# Language to be used for generating the HTML full-text search index.
-# Sphinx supports the following languages:
-#   'da', 'de', 'en', 'es', 'fi', 'fr', 'h', 'it', 'ja'
-#   'nl', 'no', 'pt', 'ro', 'r', 'sv', 'tr', 'zh'
-#html_search_language = 'en'
-
-# A dictionary with options for the search language support, empty by default.
-# 'ja' uses this config value.
-# 'zh' user can custom change `jieba` dictionary path.
-#html_search_options = {'type': 'default'}
-
-# The name of a javascript file (relative to the configuration directory) that
-# implements a search results scorer. If empty, the default will be used.
-#html_search_scorer = 'scorer.js'
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'OpenDaylightRelEngBuilderdoc'
-
-# -- Options for LaTeX output ---------------------------------------------
-
-latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
-
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
-
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
-
-# Latex figure (float) alignment
-#'figure_align': 'htbp',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title,
-#  author, documentclass [howto, manual, or own class]).
-latex_documents = [
-    (master_doc, 'OpenDaylightRelEngBuilder.tex', 'OpenDaylight RelEng/Builder Documentation',
-     'Andrew Grimberg, Thanh Ha, Daniel Farell', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
-# -- Options for manual page output ---------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    (master_doc, 'opendaylightrelengbuilder', 'OpenDaylight RelEng/Builder Documentation',
-     [author], 1)
-]
-
-# If true, show URL addresses after external links.
-#man_show_urls = False
-
-
-# -- Options for Texinfo output -------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-texinfo_documents = [
-    (master_doc, 'OpenDaylightRelEngBuilder', 'OpenDaylight RelEng/Builder Documentation',
-     author, 'OpenDaylightRelEngBuilder', 'One line description of project.',
-     'Miscellaneous'),
-]
-
-# Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
-
-# If false, no module index is generated.
-#texinfo_domain_indices = True
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
 
-# How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
+from docs_conf.conf import *
 
-# If true, do not generate a @detailmenu in the "Top" node's menu.
-#texinfo_no_detailmenu = False
diff --git a/docs/conf.yaml b/docs/conf.yaml
new file mode 100644 (file)
index 0000000..35bb427
--- /dev/null
@@ -0,0 +1,2 @@
+project_cfg: opendaylight
+project: releng/builder
diff --git a/docs/favicon.ico b/docs/favicon.ico
new file mode 100644 (file)
index 0000000..c9b3888
Binary files /dev/null and b/docs/favicon.ico differ
index 0abee7d782a266db52d1dc35ae56ea9a8db2d43d..fbea4aed9be05484687ae5b4387a308f79be15c4 100644 (file)
@@ -3,6 +3,8 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
+.. _odl-infra:
+
 Infrastructure Guide
 ====================
 
index 6b07f6c069e0c8f6bdbb348309d846c27e353c03..464bb7cf307a5c4dc4cf2f8d2946aeea01ed6dc1 100644 (file)
@@ -1,3 +1,5 @@
+.. _odl-jenkins:
+
 Jenkins
 =======
 
@@ -202,26 +204,50 @@ accounts in the cloud so should ensure consistent performance.
      - CPUs
      - Memory
 
-   * - v1-performance-1
+   * - v2-standard-1
      - 1
      - 4
 
-   * - v1-performance-2
+   * - v2-standard-2
      - 2
      - 8
 
-   * - v1-performance-4
+   * - v2-standard-4
      - 4
      - 16
 
-   * - v1-performance-8
+   * - v2-standard-8
      - 8
      - 32
 
-   * - v1-performance-16
+   * - v2-standard-16
      - 16
      - 64
 
+   * - v2-highcpu-1
+     - 1
+     - 1
+
+   * - v2-highcpu-2
+     - 2
+     - 2
+
+   * - v2-highcpu-4
+     - 4
+     - 4
+
+   * - v2-highcpu-8
+     - 8
+     - 8
+
+   * - v2-highcpu-16
+     - 16
+     - 16
+
+   * - v2-highcpu-32
+     - 32
+     - 32
+
 Pool: ODLVEX
 ^^^^^^^^^^^^
 
@@ -229,13 +255,21 @@ Pool: ODLVEX
 
     <table class="table table-bordered">
       <tr class="warning">
-        <td><b>Jenkins Labels</b><br/> centos7-builder-2c-4g,
-          centos7-builder-2c-8g, centos7-java-builder-4c-8g,
-          centos7-builder-8c-8g, centos7-java-builder-4c-16g</td>
-        <td><b>Minion Template names</b><br/> centos7-builder-2c-4g,
-          centos7-builder-2c-4g, centos7-java-builder-2c-8g,
-          centos7-builder-4c-8g, centos7-java-builder-8c-8g,
-          centos7-builder-4c-16g</td>
+        <td><b>Jenkins Labels</b><br/>
+          centos7-builder-2c-1g,<br/>
+          centos7-builder-2c-2g,<br/>
+          centos7-builder-2c-8g,<br/>
+          centos7-builder-4c-4g,<br/>
+          centos7-builder-8c-8g,<br/>
+          centos7-autorelease-4c-16g
+        </td>
+        <td><b>Minion Template names</b><br/>
+          prd-centos7-builder-2c-1g,<br/>
+          prd-centos7-builder-2c-2g,<br/>
+          prd-centos7-builder-2c-8g,<br/>
+          prd-centos7-builder-4c-4g,<br/>
+          prd-centos7-builder-8c-8g,<br/>
+          prd-centos7-autorelease-4c-16g
         <td><b>Packer Template</b><br/>
         releng/builder/packer/templates/builder.json</td>
         <td><b>Spinup Script</b><br/>
@@ -713,15 +747,6 @@ TODO: Document test-{project}-{feature} and test-{project}-all.
         </td>
       </tr>
 
-      <tr class="warning">
-        <td><b>Job Template</b><br/>integration-patch-test-{stream}</td>
-        <td><b>Gerrit Trigger</b><br/>test-integration</td>
-      </tr>
-      <tr>
-        <td colspan="2">
-        </td>
-      </tr>
-
       <tr class="warning">
         <td><b>Job Template</b><br/>integration-patch-test-{stream}</td>
         <td><b>Gerrit Trigger</b><br/>test-integration</td>
@@ -753,6 +778,27 @@ TODO: Document test-{project}-{feature} and test-{project}-all.
             </li>
         </td>
       </tr>
+
+      <tr class="warning">
+        <td><b>Job Template</b><br/>integration-multipatch-test-{stream}</td>
+        <td><b>Gerrit Trigger</b><br/>multipatch-build</td>
+      </tr>
+      <tr>
+        <td colspan="2">
+          This job builds a list of patches provided in an specific order, and finally builds
+          a distribution from either provided patch or latest code in branch.
+          For example if someone leaves the following comment in a patch:
+          multipatch-build:controller=61/29761/5:45/29645/6,neutron=51/65551/4,netvirt:59/60259/17
+          the job will checkout controller patch 61/29761/5, cherry-pick 45/29645/6 and build controller,
+          checkout neutron patch 51/65551/4 and build neutron, checkout latest netvirt code,
+          cherry-pick 59/60259/17 and build netvirt, finally it will checkout latest distribution
+          code and build a distribution. The resulting distribution is stored in Nexus and the URL
+          is stored in a variable called BUNDLE_URL visible in the job console.
+          This job should not alter Gerrit votes for a given patch, nor will do anything with the
+          given patch unless the patch is added to the build list.
+        </td>
+      </tr>
+
     </table>
 
 Maven Properties
@@ -773,6 +819,8 @@ wish to run in your project.
                 Maven property
                 <sonar>true</sonar>.
 
+.. _odl-jenkins-sandbox:
+
 Jenkins Sandbox
 ---------------
 
index 303d28a887ac22613a51fcad49e5c594e5d0ff56..864b6ce078979b99e00944d578b92a296027612c 100644 (file)
@@ -1,3 +1,5 @@
+.. _odl-release-workflow:
+
 Release Workflow
 ================
 
diff --git a/docs/requirements.txt b/docs/requirements.txt
new file mode 100644 (file)
index 0000000..74a3b7a
--- /dev/null
@@ -0,0 +1 @@
+lfdocs-conf
diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg
new file mode 100644 (file)
index 0000000..873d892
--- /dev/null
@@ -0,0 +1,2 @@
+IMAGE_NAME=ZZCI - CentOS 7 - autorelease - 20180125-2240
+HARDWARE_ID=v2-standard-4
diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg
new file mode 100644 (file)
index 0000000..d7312c7
--- /dev/null
@@ -0,0 +1,2 @@
+IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180110-1659
+HARDWARE_ID=v1-standard-1
diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg
new file mode 100644 (file)
index 0000000..4cedaef
--- /dev/null
@@ -0,0 +1,2 @@
+IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180110-1659
+HARDWARE_ID=v2-highcpu-2
diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg
new file mode 100644 (file)
index 0000000..7be9c8b
--- /dev/null
@@ -0,0 +1,2 @@
+IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180110-1659
+HARDWARE_ID=v2-standard-2
diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
new file mode 100644 (file)
index 0000000..9446815
--- /dev/null
@@ -0,0 +1,2 @@
+IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180110-1659
+HARDWARE_ID=v2-standard-4
diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg
new file mode 100644 (file)
index 0000000..637bea8
--- /dev/null
@@ -0,0 +1,2 @@
+IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180110-1659
+HARDWARE_ID=v2-highcpu-4
diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg
new file mode 100644 (file)
index 0000000..9288347
--- /dev/null
@@ -0,0 +1,2 @@
+IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180201-2139
+HARDWARE_ID=v2-highcpu-8
diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg
new file mode 100644 (file)
index 0000000..fc916af
--- /dev/null
@@ -0,0 +1,2 @@
+IMAGE_NAME=ZZCI - CentOS 7 - docker - 20180215-2201
+HARDWARE_ID=v2-standard-1
diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg
new file mode 100644 (file)
index 0000000..90d776c
--- /dev/null
@@ -0,0 +1,2 @@
+IMAGE_NAME=ZZCI - CentOS 7 - docker - 20180215-2201
+HARDWARE_ID=v2-highcpu-2
diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg
new file mode 100644 (file)
index 0000000..54c6188
--- /dev/null
@@ -0,0 +1,2 @@
+IMAGE_NAME=ZZCI - CentOS 7 - docker - 20180215-2201
+HARDWARE_ID=v2-standard-2
diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg
new file mode 100644 (file)
index 0000000..d695ad5
--- /dev/null
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - CentOS 7 - robot - 20180109-1917
+HARDWARE_ID=v2-standard-2
+INSTANCE_CAP=25
diff --git a/jenkins-config/clouds/openstack/odlvex/cloud.cfg b/jenkins-config/clouds/openstack/odlvex/cloud.cfg
new file mode 100644 (file)
index 0000000..9c8b608
--- /dev/null
@@ -0,0 +1,22 @@
+# Cloud Configuration
+CLOUD_CREDENTIAL_ID=os-cloud
+CLOUD_URL=https://auth.vexxhost.net/v3/
+CLOUD_IGNORE_SSL=false
+CLOUD_ZONE=ca-ymq-1
+
+# Default Template Configuration
+IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180220-0346
+HARDWARE_ID=v1-standard-1
+NETWORK_ID=b5fcd86e-efac-4997-b8bc-dbe0d35bc229
+USER_DATA_ID=jenkins-init-script
+INSTANCE_CAP=75
+SANDBOX_CAP=6
+FLOATING_IP_POOL=
+SECURITY_GROUPS=default
+AVAILABILITY_ZONE=ca-ymq-2
+STARTUP_TIMEOUT=600000
+KEY_PAIR_NAME=jenkins
+NUM_EXECUTORS=1
+JVM_OPTIONS=
+FS_ROOT=/w
+RETENTION_TIME=0
diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1604-docker-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1604-docker-2c-2g.cfg
new file mode 100644 (file)
index 0000000..d1cd1c9
--- /dev/null
@@ -0,0 +1,2 @@
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - 20180220-2018
+HARDWARE_ID=v2-highcpu-2
diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg
new file mode 100644 (file)
index 0000000..2747b97
--- /dev/null
@@ -0,0 +1,2 @@
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
+HARDWARE_ID=v2-standard-1
diff --git a/jenkins-config/global-vars-releng.sh b/jenkins-config/global-vars-releng.sh
new file mode 100644 (file)
index 0000000..83b3cb5
--- /dev/null
@@ -0,0 +1,9 @@
+GERRIT_URL=https://git.opendaylight.org/gerrit
+GIT_BASE=git://devvexx.opendaylight.org/mirror/$PROJECT
+GIT_URL=git://devvexx.opendaylight.org/mirror
+JENKINS_HOSTNAME=vex-yul-odl-jenkins-1
+LOGS_SERVER=https://logs.opendaylight.org
+NEXUS_URL=https://nexus.opendaylight.org
+ODLNEXUSPROXY=https://nexus.opendaylight.org
+SILO=releng
+SONAR_URL=https://sonar.opendaylight.org
diff --git a/jenkins-config/global-vars-sandbox.sh b/jenkins-config/global-vars-sandbox.sh
new file mode 100644 (file)
index 0000000..62de193
--- /dev/null
@@ -0,0 +1,9 @@
+GERRIT_URL=https://git.opendaylight.org/gerrit
+GIT_BASE=git://devvexx.opendaylight.org/mirror/$PROJECT
+GIT_URL=git://devvexx.opendaylight.org/mirror
+JENKINS_HOSTNAME=vex-yul-odl-jenkins-2
+LOGS_SERVER=https://logs.opendaylight.org
+NEXUS_URL=https://nexus.opendaylight.org
+ODLNEXUSPROXY=https://nexus.opendaylight.org
+SILO=sandbox
+SONAR_URL=https://sonar.opendaylight.org
index 8b5bec7c4750b5b20524b6e521f80de0a86ce689..1360004a598f190b47cac7cc292863c48b65e886 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: aaa-csit-authn
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'aaa'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 9d699a59d09ffae021ebe6980c04419b11f75912..f4483c246fa4068957a079448c9556bb567a8bac 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: aaa-csit-keystone
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'aaa'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
@@ -29,7 +31,7 @@
     install-features: 'odl-restconf-all'
 
     tools_system_count: '1'
-    tools_system_flavor: 'v1-performance-1'
+    tools_system_flavor: 'v2-highcpu-2'
     tools_system_image: 'ZZCI - CentOS 7 - docker - 20171209-0317'
 
     # Robot custom options
index c9f009f143ca9dd6adf8a3856e285e6a8127f44c..c557db0bb4ab501d5aeeae1352e0985184365399 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: aaa-csit-tls
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'aaa'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index b826a5e39021bd60d235668d67217e58d974ba1b..d630199be426fe47cd91fe978780a0a57c521398 100644 (file)
@@ -2,15 +2,17 @@
 - project:
     name: aaa-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'aaa'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 08cfbdfbbe3d92b388621ff2e2fa9a1b11fd2f68..f4e71ff3d92a1964e146a5acf0316d279282e303 100644 (file)
@@ -1,27 +1,36 @@
 ---
+- project:
+    name: aaa-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'aaa'
+    project-name: 'aaa'
+    branch: 'master'
+    mvn-settings: 'aaa-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
+
+    # Used by the release job
+    staging-profile-id: 9318cf3c82c33
+
 - project:
     name: aaa-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - gerrit-maven-merge
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'aaa'
     project-name: 'aaa'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'aaa-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 9318cf3c82c33
     name: aaa-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - gerrit-maven-merge
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'aaa'
     project-name: 'aaa'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'aaa-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 9318cf3c82c33
     name: aaa-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - gerrit-maven-merge
+      - odl-maven-jobs
 
     stream: carbon
     project: 'aaa'
     project-name: 'aaa'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'aaa-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 9318cf3c82c33
@@ -90,5 +81,4 @@
     project-name: 'aaa'
     branch: 'master'
     mvn-settings: 'aaa-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 03d08d4404ac37ed191dd09b73ce064f6fc4c5ff..14fbfd8d868134182a3d2a8b94337ff2526601cf 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: alto-csit-setup
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'alto'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 13c60f745c51aa4cb6b3f63f3068c81bbb3b32de..7145b02a77e0af38d9467663adfc09530d55f4a8 100644 (file)
@@ -1,27 +1,38 @@
 ---
+- project:
+    name: alto-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'alto'
+    project-name: 'alto'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    mvn-settings: 'alto-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'l2switch-merge-{stream}'
+    email-upstream: '[alto] [l2switch]'
+
+    # Used by the release job
+    staging-profile-id: 931eabae9693c
+
 - project:
     name: alto-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'alto'
     project-name: 'alto'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'alto-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'l2switch-merge-{stream}'
     email-upstream: '[alto] [l2switch]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 931eabae9693c
     name: alto-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'alto'
     project-name: 'alto'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'alto-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'l2switch-merge-{stream}'
     email-upstream: '[alto] [l2switch]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 931eabae9693c
     name: alto-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'alto'
     project-name: 'alto'
     branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'alto-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'l2switch-merge-{stream}'
     email-upstream: '[alto] [l2switch]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 931eabae9693c
@@ -89,6 +84,6 @@
     project: 'alto'
     project-name: 'alto'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'alto-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index aa3c6139d6ec1e6ff4733e3566014c08a87d180d..34f659786950be9a352c7f7c00796d6067c90cb6 100644 (file)
@@ -1,27 +1,36 @@
 ---
+- project:
+    name: atrium-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'atrium'
+    project-name: 'atrium'
+    branch: 'master'
+    mvn-settings: 'atrium-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[atrium]'
+
+    # Used by the release job
+    staging-profile-id: 9324f12310e6a
+
 - project:
     name: atrium-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'atrium'
     project-name: 'atrium'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'atrium-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[atrium]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 9324f12310e6a
     name: atrium-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'atrium'
     project-name: 'atrium'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'atrium-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[atrium]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 9324f12310e6a
     name: atrium-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'atrium'
     project-name: 'atrium'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'atrium-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[atrium]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 9324f12310e6a
@@ -89,5 +80,4 @@
     project-name: 'atrium'
     branch: 'master'
     mvn-settings: 'atrium-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 172dc106563606613f2284474a36eddc13c6c839..2689a5a7e3c028421ac4775803f72ef1ea5d182c 100644 (file)
       - shell: !include-raw:
           - generate-release-notes.sh
 
+- builder:
+    name: autorelease-update-validate-projects
+    builders:
+      - shell: !include-raw: update-validate-autorelease-projects.sh
+
+- builder:
+    name: autorelease-compare-projects
+    builders:
+      - shell: !include-raw: compare-autorelease-projects.sh
+
 - publisher:
     # Search console log for failures and email status to the release mailing list.
     name: opendaylight-infra-notify-status
index b53a437ec462b49ab6f3faca6099ee6aa7b77332..67863748a715f8da600907a4012ac8b26b504824 100644 (file)
@@ -2,30 +2,39 @@
 - project:
     name: autorelease-projects
     jobs:
+      - autorelease-branch-cut
       - 'autorelease-generate-release-notes-{stream}'
-      - 'autorelease-release-{stream}'
+      - 'autorelease-release-{stream}':
+          build-node: centos7-autorelease-4c-16g
       - 'autorelease-update-validate-jobs-{stream}'
-      - 'autorelease-version-bump-{stream}'
-      - '{project-name}-validate-autorelease-{stream}':
-          build-node: centos7-builder-2c-8g
+      - 'autorelease-version-bump-{stream}':
+          build-node: centos7-autorelease-4c-16g
+      - '{project-name}-validate-autorelease-{stream}'
       - gerrit-tox-verify
 
     # todo: After Carbon EOL remove next-release-tag and directy pass
     # '{stream}' to autorelease-release-tag parameter
     stream:
-      - oxygen:
+      - fluorine:
           next-release-tag: '{stream}'
           branch: 'master'
+          integration-test: fluorine
+          extra-mvn-opts: -Dsft.heap.max=4g
+      - oxygen:
+          next-release-tag: '{stream}'
+          branch: 'stable/oxygen'
           integration-test: oxygen
           extra-mvn-opts: -Dsft.heap.max=4g
       - nitrogen:
+          # Run once a week (Sunday) now that Fluorine branch is cut, and Oxygen is pending release
+          cron: 'H 12 * * 0'
           next-release-tag: '{stream}'
           branch: 'stable/nitrogen'
           integration-test: nitrogen
           extra-mvn-opts: -Dsft.heap.max=4g
       - carbon:
-          # Run once a week now that Nitrogen is released and Oxygen is in active development
-          cron: 'H 12 * * 0'
+          # Run once a week (Saturday) now that Fluorine branch is cut, and Oxygen is pending release
+          cron: 'H 12 * * 6'
           next-release-tag: '{stream}'
           branch: 'stable/carbon'
           integration-test: carbon
index 4f9b4eb97290e803219b915c2204b729b4cde8a2..651004d73e42321a0cfe04b39de8cc396910e936 100644 (file)
@@ -1,5 +1,56 @@
 ---
 # Autorelease build jobs
+- job-template:
+    name: autorelease-branch-cut
+
+    #####################
+    # Job Configuration #
+    #####################
+
+    project-type: freestyle
+    node: centos7-builder-2c-2g
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: 7
+
+    parameters:
+      - lf-infra-parameters:
+          project: releng/autorelease
+          branch: master
+          stream: master
+          lftools-version: '{lftools-version}'
+      - string:
+          name: RELEASE
+          description: |
+              Release name to branch cut.
+              Eg. Lithium, Beryllium, Boron, Carbon...
+      - bool:
+          name: DRY_RUN
+          default: true
+          description: |
+              If DRY_RUN is enabled modifications are not published to Gerrit.
+
+    scm:
+      - lf-infra-gerrit-scm:
+          git-url: '$GIT_URL/$GERRIT_PROJECT'
+          branch: master
+          refspec: 'refs/heads/master'
+          jenkins-ssh-credential: opendaylight-jenkins-ssh
+          submodule-recursive: true
+          choosing-strategy: default
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: 10
+          jenkins-ssh-credential: opendaylight-jenkins-ssh
+
+    builders:
+      - shell: !include-raw-escape: branch-cut.sh
+
+    publishers:
+      - lf-infra-publish
+
 - job-template:
     name: 'autorelease-release-{stream}'
 
@@ -7,6 +58,7 @@
     # Defaults #
     ############
 
+    build-node: '{build-node}'
     java-version: openjdk8
     mvn-version: mvn33
     extra-mvn-opts: ''
@@ -16,7 +68,7 @@
     #####################
 
     project-type: freestyle
-    node: centos7-builder-4c-16g
+    node: '{build-node}'
     jdk: '{java-version}'
     cron: 'H 0 * * *'
 
 - job-template:
     name: autorelease-update-validate-jobs-{stream}
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-1g
 
     properties:
       - lf-infra-properties:
           jenkins-ssh-credential: opendaylight-jenkins-ssh
 
     builders:
-      - shell: !include-raw-escape:
-          - update-validate-autorelease-projects.sh
+      - autorelease-update-validate-projects
       - opendaylight-infra-push-gerrit-patch:
           project: 'releng/builder'
           gerrit-topic: 'autorelease-update-validate-jobs-{stream}'
 - job-template:
     name: autorelease-version-bump-{stream}
     project-type: freestyle
-    node: centos7-builder-4c-16g
+    node: '{build-node}'
 
     properties:
       - opendaylight-infra-properties:
           description: |
               Release that is being version bumped.
               Eg. Lithium, Beryllium, Boron, Carbon, Carbon-SR1, Carbon-SR2...
+      - bool:
+          name: BRANCH_CUT
+          default: false
+          description: |
+              If BRANCH_CUT is enabled, perform version bump for branch cutting
+              workflow, else perform version bump for simultaneous release
+              workflow (detault).
       - bool:
           name: DRY_RUN
           default: true
           description: |
-              If DRY_RUN is enabled modifications are not published to Gerrit.
+              If DRY_RUN is enabled modifications are not published to Gerrit
+              and artifacts are not pushed to Nexus. Instead the build will be
+              performed using the goals "clean install".
       - maven-exec:
           maven-version: mvn33
 
 
     disabled: false
     project-type: freestyle
-    node: '{build-node}'
+    # Note: This NEEDS to be hardcoded as projects should NOT be allowed to
+    #       override the build node.
+    node: centos7-builder-2c-8g
     concurrent: true
     jdk: '{java-version}'
 
 
     builders:
       - autorelease-checkout-gerrit-patch
+      - autorelease-compare-projects
       - jacoco-nojava-workaround
       - shell: "./scripts/list-project-dependencies.sh"
       - autorelease-determine-merge-order
           settings-type: cfp
           global-settings: global-settings
           global-settings-type: cfp
+      # Hack to workaround the duplicate-finder plugin in odlparent breaking validate-autorelease
+      - shell: sed -i 's/validate/none/' /tmp/r/org/opendaylight/odlparent/odlparent/3.0.2/odlparent-3.0.2.pom
       - maven-target:
           maven-version: mvn33
           pom: pom.xml
index b80c1eeb106d20151d5e10a9f0f50170dfbe51af..88670afd9f198d3a577c5f4063bb004f55ea7cfa 100644 (file)
     build-node: centos7-builder-2c-8g
 
     stream:
+      - fluorine:
+          branch: 'master'
       - oxygen:
-          branch: master
+          branch: 'stable/oxygen'
       - nitrogen:
-          branch: stable/nitrogen
+          branch: 'stable/nitrogen'
       - carbon:
-          branch: stable/carbon
+          branch: 'stable/carbon'
diff --git a/jjb/autorelease/branch-cut.sh b/jjb/autorelease/branch-cut.sh
new file mode 100644 (file)
index 0000000..02df34e
--- /dev/null
@@ -0,0 +1,108 @@
+#!/bin/bash
+# @License EPL-1.0 <http://spdx.org/licenses/EPL-1.0>
+##############################################################################
+# Copyright (c) 2017 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+
+# This script requires the user running the script to have "Create References"
+# permission in Gerrit for the "stable/RELEASE" branch. Where RELEASE is an
+# official OpenDaylight release. Eg. Oxygen, Nitrogen, Carbon, etc...
+#
+# Performs 2 actions:
+#
+#     1) Creates a new branch stable/RELEASE (where release is a ODL release,
+#        eg Oxygen, Nitrogen, Carbon, etc...)
+#     2) Updates .gitreview in the new stable/RELEASE branch to set the
+#        defaultbranch to the new branch.
+#
+# Required Parameters:
+#     RELEASE: The name of the release to create a branch for.
+
+mkdir -p "$WORKSPACE/archives"
+LOG_FILE="$WORKSPACE/archives/branch-cut.log"
+
+set -eu -o pipefail
+
+# Validate inputs
+if [ -z "$RELEASE" ]; then
+    echo "ERROR: RELEASE variable most be set to a release name. Eg Carbon"
+    exit 1
+fi
+
+# --- Start create new maintenance branch
+echo "---> Creating new mainenance branch"
+git submodule foreach git fetch origin
+git fetch origin
+git submodule foreach git checkout -b "stable/${RELEASE,,}" origin/master
+git checkout -b "stable/${RELEASE,,}" origin/master
+
+##########
+# Verify #
+##########
+
+{
+    echo "---> Verify maintenance branch"
+    git submodule foreach git branch
+    git branch
+} | tee -a "$LOG_FILE"
+
+########
+# Push #
+########
+
+if [ "$DRY_RUN" = false ]
+then
+    echo "Pushing stable/${RELEASE,,} branches to Gerrit"
+    git submodule foreach git push gerrit "stable/${RELEASE,,}"
+    git push gerrit "stable/$RELEASE"
+fi
+# --- End create new maintenance branch
+
+# --- Start update .gitreview
+echo "---> Update .gitreview"
+git submodule foreach sed -i -e "s#defaultbranch=master#defaultbranch=stable/${RELEASE,,}#" .gitreview
+git submodule foreach git add .gitreview
+git submodule foreach "git commit -sm 'Update .gitreview to stable/${RELEASE,,}'"
+sed -i -e "s#defaultbranch=master#defaultbranch=stable/${RELEASE,,}#" .gitreview
+git add .gitreview
+git commit -sm "Update .gitreview to stable/${RELEASE,,}"
+
+# Generate git patches
+patch_dir="$WORKSPACE/archives/patches/git-review"
+mkdir -p "$patch_dir"
+for module in $(git submodule | awk '{ print $2 }')
+do
+    pushd "$module"
+    git format-patch --stdout "origin/master" > "$patch_dir/${module//\//-}.patch"
+    git bundle create "$patch_dir/${module//\//-}.bundle" "origin/master..HEAD"
+    popd
+done
+
+##########
+# Verify #
+##########
+
+{
+    echo "---> Verify .gitreview"
+    git submodule foreach git show HEAD
+    git show HEAD
+    git submodule foreach git log --oneline -2 --graph --decorate
+    git log --oneline -2 --graph --decorate
+} | tee -a "$LOG_FILE"
+
+########
+# Push #
+########
+
+if [ "$DRY_RUN" = false ]
+then
+    echo "Pushing .gitreview patches to Gerrit"
+    git submodule foreach git review -t "branch-cut-${RELEASE,,}"
+    git review -t "branch-cut-${RELEASE,,}"
+fi
+# --- Stop update .gitreview
diff --git a/jjb/autorelease/compare-autorelease-projects.sh b/jjb/autorelease/compare-autorelease-projects.sh
new file mode 100644 (file)
index 0000000..dfcd933
--- /dev/null
@@ -0,0 +1,78 @@
+#!/bin/bash
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2018 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+
+# This script performs version bumping activities for an ODL release.
+echo "---> compare-autorelease-projects.sh"
+
+# The purpose of this script is to compare list of projects in autorelease
+# are equal to the list of projects in integration/distribution.
+
+# Note: int/dist pom files uses templates only since Oxygen release.
+# Todo: Remove this check after Carbon and Nitrogen EOL
+if [[ $STREAM =~ carbon ]] || [[ $STREAM =~ nitrogen ]]; then
+    exit 0
+fi
+
+mapfile -t PROJECTS_INT_DIST < <(xmlstarlet sel\
+     -N "x=http://maven.apache.org/POM/4.0.0"\
+     -t -m "/x:project/x:profiles/x:profile[x:activation/x:activeByDefault='true']/x:dependencies/x:dependency/x:groupId"\
+     -v .\
+     -n integration/distribution/features/repos/index/pom.xml 2>/dev/null | sort -u)
+
+# process projects in int/dist read from pom.xml file
+declare -a project_int_dist
+for project in "${PROJECTS_INT_DIST[@]}"; do
+    if [[ $project =~ project.groupId ]] || [[ $project =~ odlparent ]]; then
+        continue
+    elif [[ $project =~ org.opendaylight ]]; then
+        project=$(echo "${project/org.opendaylight./}")
+        project_int_dist+=( "$(echo "${project/.//}" )" )
+    fi
+done
+
+project_int_dist+=("mdsal")
+project_int_dist+=("integration/distribution")
+
+# Get a list of all the projects from releng/autorelease repo
+declare -a project_AR
+mapfile -t project_AR < <(git submodule status | awk -e '{print $2}' | sort | uniq)
+
+# Use associative arrays to get diff in the projects lists
+declare -A map_AR map_intdist
+for project in "${project_AR[@]}"
+do
+    ((map_AR[$project]++))
+done
+
+for project in "${project_int_dist[@]-0}"
+do
+    ((map_intdist[$project]++))
+done
+
+for project in "${!map_AR[@]}"
+do
+    if (( ${map_AR[$project]} >= 1 && ${map_intdist[$project]-0} >= 1 )); then
+        unset "map_AR[$project]" "map_intdist[$project]"
+    fi
+done
+
+result=("${!map_AR[@]}" "${!map_intdist[@]}")
+
+if [ "${#result[@]}" != "0" ]; then
+    if [ "${#map_AR[@]}" != "0"  ]; then
+        echo "WARNING: List of projects in releng/autorelease but NOT in integration/distribution: ${!map_AR[*]}"
+    elif [ "${#map_intdist[@]}" != "0"  ]; then
+        echo "ERROR: List of projects in integration/distribution but NOT in releng/autorelease: ${!map_intdist[*]}"
+        exit 1
+    fi
+else
+    echo "List of projects releng/autorelease and integration/distribution repositories are equal"
+fi
index 5128c97bbe3a68138838833f8432367a6ffe2203..0e3fe29b4f3fed4d86795a2716cbe4bea83cae62 100644 (file)
@@ -11,6 +11,8 @@
 # This script parses the console log to discover which project has caused a
 # build failure and notify the project as appropriate.
 
+echo "---> notify-build-failure.sh"
+
 NEWLINE=$'\n'
 RELEASE_EMAIL="release@lists.opendaylight.org"
 ARCHIVES_DIR="$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER"
index 7fea2910e7cfda0aabb796482601531c6cfd2d95..327fb1abfd45925cb390f4c7a85b7c7a2d066c20 100644 (file)
@@ -1,7 +1,7 @@
 #!/bin/bash
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
-# Copyright (c) 2017 The Linux Foundation and others.
+# Copyright (c) 2017 - 2018 The Linux Foundation and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
@@ -14,9 +14,10 @@ BRANCH="stable/${STREAM}"
 
 # The current development release will not have a stable branch defined so if
 # branch does not exist assume master
-wget -nv -O /tmp/ar-branches.json https://git.opendaylight.org/gerrit/projects/releng%2Fautorelease/branches/
-if ! grep "$BRANCH" /tmp/ar-branches.json; then
-    BRANCH=master
+url="https://git.opendaylight.org/gerrit/projects/releng%2Fautorelease/branches/"
+resp=$(curl -s -w "\\n\\n%{http_code}" --globoff -H "Content-Type:application/json" "$url")
+if [[ ! "$resp" =~ $BRANCH ]]; then
+    BRANCH="master"
 fi
 
 wget -nv -O /tmp/pom.xml "https://git.opendaylight.org/gerrit/gitweb?p=releng/autorelease.git;a=blob_plain;f=pom.xml;hb=$GERRIT_BRANCH"
index 475780867d8404e9174e13c7fd294a2a070f13c0..4a4f99a49edf5caa74e33b6a4938c15aeb1f0168 100644 (file)
           project: dlux
       - dluxapps:
           project: dluxapps
-      - eman:
-          project: eman
-      - faas:
-          project: faas
       - genius:
           project: genius
       - groupbasedpolicy:
@@ -39,6 +35,8 @@
           project: infrautils
       - integration-distribution:
           project: integration/distribution
+      - jsonrpc:
+          project: jsonrpc
       - l2switch:
           project: l2switch
       - lispflowmapping:
@@ -53,8 +51,6 @@
           project: netvirt
       - neutron:
           project: neutron
-      - nic:
-          project: nic
       - of-config:
           project: of-config
       - openflowplugin:
@@ -73,9 +69,7 @@
           project: snmp4sdn
       - sxp:
           project: sxp
-      - unimgr:
-          project: unimgr
+      - tsdr:
+          project: tsdr
       - usc:
           project: usc
-      - vtn:
-          project: vtn
index a44337e0e42713ae66411f7f559a4a5f49f0d27e..fc7e0466a15b48f354dfb8d2a8399f6454ca63a4 100644 (file)
@@ -9,7 +9,8 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
 
-# This script performs version bumping activities for an ODL release.
+# This script performs version bumping activities for an ODL release and branch
+# cutting.
 echo "---> version-bump.sh"
 
 # The only purpose of RELEASE_TAG in this script is to set the Gerrit topic.
@@ -24,29 +25,41 @@ BRANCH="$GERRIT_BRANCH"
 # Ensure we fail the job if any steps fail.
 set -eu -o pipefail
 
-git checkout -b "${BRANCH,,}" "origin/${BRANCH,,}"
+# Fail if branch cutting is not on master
+if [ "$BRANCH_CUT" = "true" ] && [ "$BRANCH" != "master" ]; then
+    echo "ERROR: Cannot branch cut on $BRANCH, its required to be on the master branch."
+    exit 1
+fi
+
+if [ "$BRANCH_CUT" = "false" ]; then
+    git checkout -b "${BRANCH,,}" "origin/${BRANCH,,}"
+
+    # TODO: Simplify once stable/nitrogen is no longer supported.
+    for module in $(git submodule | awk '{ print $2 }')
+    do
+        pushd "$module"
+        if [ "$GERRIT_BRANCH" == "stable/nitrogen" ] && [ "$module" == "yangtools" ]; then
+            git checkout -b "v1.2.x" "origin/v1.2.x"
+        else
+            git checkout -b "${BRANCH,,}" "origin/${BRANCH,,}"
+        fi
+        popd
+    done
+fi
 
-# TODO: Simplify once stable/nitrogen is no longer supported.
-for module in $(git submodule | awk '{ print $2 }')
-do
-    pushd "$module"
-    if [ "$GERRIT_BRANCH" == "stable/nitrogen" ] && [ "$module" == "yangtools" ]; then
-        git checkout -b "v1.2.x" "origin/v1.2.x"
-    else
-        git checkout -b "${BRANCH,,}" "origin/${BRANCH,,}"
-    fi
-    popd
-done
 
 # Setup Gerrit remove to ensure Change-Id gets set on commit.
-git config --global --add gitreview.username "jenkins-releng"
+git config --global --add gitreview.username "jenkins-$SILO"
 git review -s
+git remote -v
 git submodule foreach "git review -s"
 
 # Check if git state is clean
 git status
 
-lftools version release "$RELEASE_TAG"
+if [ "$BRANCH_CUT" = "false" ]; then
+    lftools version release "$RELEASE_TAG"
+fi
 lftools version bump "$RELEASE_TAG"
 
 git submodule foreach "git commit -asm 'Bump versions by x.y.(z+1)'"
@@ -70,7 +83,10 @@ do
     popd
 done
 
-# Verify
+##########
+# Verify #
+##########
+
 {
     echo "----> Verify version bump"
     git submodule foreach git show HEAD
@@ -80,27 +96,40 @@ done
     ls "$patch_dir"
 } | tee -a "$LOG_FILE"
 
-# Push
+#########
+# Build #
+#########
+
+MVN_GOALS=(clean install)
 if [ "$DRY_RUN" = "false" ]
 then
-    # Run a build here! Should be safe to run mvn clean deploy as nothing should be
+    # Should be safe to run mvn clean deploy as nothing should be
     # using the version bumped versions just yet.
-    ./scripts/fix-relativepaths.sh
-    "$MVN" clean deploy -Pq \
-    -s "$SETTINGS_FILE" \
-    -gs "$GLOBAL_SETTINGS_FILE" \
-    -DaltDeploymentRepository="opendaylight-snapshot::default::https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot" \
-    --show-version \
-    --batch-mode \
-    -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
-    -Djenkins \
-    -Dmaven.repo.local=/tmp/r \
-    -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
-
-    # Clear any changes caused by Maven build
-    git checkout -f
-    git submodule foreach git checkout -f
+    MVN_GOALS=(clean deploy)
+fi
 
+./scripts/fix-relativepaths.sh
+"$MVN" "${MVN_GOALS[@]}" -Pq \
+-s "$SETTINGS_FILE" \
+-gs "$GLOBAL_SETTINGS_FILE" \
+-DaltDeploymentRepository="opendaylight-snapshot::default::https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot" \
+--show-version \
+--batch-mode \
+-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
+-Djenkins \
+-Dmaven.repo.local=/tmp/r \
+-Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+
+# Clear any changes caused by Maven build
+git checkout -f
+git submodule foreach git checkout -f
+
+########
+# Push #
+########
+
+if [ "$DRY_RUN" = "false" ]
+then
     # Push up patches last, as long as nothing failed.
     git submodule foreach git review --yes -t "${RELEASE_TAG}"
 fi
index 6c186784e8147541e61e612821421707cb034ce3..763c5b6bf8fb0d69cda52ee965faf3a4e2f61292 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-gate-bgp-ingest-mixed
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'bgpcep'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
@@ -29,8 +31,7 @@
         odl-restconf,
         odl-bgpcep-bgp,
         odl-bgpcep-bgp-config-example,
-        odl-bgpcep-data-change-counter,
-        odl-netconf-topology
+        odl-bgpcep-data-change-counter
 
     # Robot custom options
     # Increase the TEST_DURATION_MULTIPLIER if the test runs in slower test
@@ -45,7 +46,7 @@
         -v TEST_DURATION_MULTIPLIER:4
 
     # Controller configuration
-    odl_system_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-4
 
     # Plot Info
     01-plot-title: 'Number of generated updates'
index 92a150ae999ac707c933edcc9c2759bfc8d850ef..16976ff6a050e5630311079d77fad14bf8b254ae 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-bgp-ingest-mixed
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-1node-periodic
       # FIXME: Rename job to drop -periodic- and unify job definition with -gate- functionality.
 
     # The project name
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
@@ -30,8 +32,7 @@
         odl-restconf,
         odl-bgpcep-bgp,
         odl-bgpcep-bgp-config-example,
-        odl-bgpcep-data-change-counter,
-        odl-netconf-topology
+        odl-bgpcep-data-change-counter
 
     # Robot custom options
     # Increase the TEST_DURATION_MULTIPLIER if the test runs in slower test
@@ -46,7 +47,7 @@
         -v TEST_DURATION_MULTIPLIER:4
 
     # Controller configuration
-    odl_system_flavor: v1-performance-2
+    odl_system_flavor: v2-standard-2
 
     # Plot Info
     01-plot-title: 'Number of generated updates'
index a7e10c9a700ffa60afc17044848113d7d5101997..b61c1b819722690a64237c6d4493ba4a23db39de 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-bgp-ingest
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-1node-periodic
       # FIXME: Dicument differences from -mixed- and unify into single (matrix) definition.
 
     # The project name
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
@@ -31,8 +33,7 @@
         odl-jolokia,
         odl-bgpcep-data-change-counter,
         odl-bgpcep-bgp,
-        odl-bgpcep-bgp-config-example,
-        odl-netconf-topology
+        odl-bgpcep-bgp-config-example
 
     # Robot custom options:
     robot-options: >
@@ -46,5 +47,5 @@
         -v TEST_DURATION_MULTIPLIER_CHANGE_COUNT_MANY:8.0
 
     # Controller configuration
-    odl_system_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-4
 
index 2ba4c45cacf67076f2dfad516eda5a542678dec5..7521007347bedf0bf86b78f913744d040e1f6c68 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-bgpclustering-ha
     jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-3node-periodic
 
     # The project name
     project: 'bgpcep'
@@ -12,7 +12,7 @@
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
           install-features: >
               odl-restconf,
               odl-bgpcep-bmp,
               odl-bgpcep-bmp-config-example,
               odl-bgpcep-pcep
-
+      - oxygen:
+          branch: 'stable/oxygen'
+          install-features: >
+              odl-restconf,
+              odl-bgpcep-bgp,
+              odl-bgpcep-bgp-config-example,
+              odl-bgpcep-bmp,
+              odl-bgpcep-bmp-config-example,
+              odl-bgpcep-pcep
       - nitrogen:
           branch: 'stable/nitrogen'
           install-features: >
index a6ea709fe5933adab1fb944a9fe11f830c285e31..ee8e9d37a0d7a6404ad57cc415145b5121bab98b 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-bgpclustering-longevity
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'bgpcep'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index d3ff23c59c9e294de64d1f2c0b74550854dd4a26..96f954631a801c760960879cf002850027e913dd 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-bgpclustering
     jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-3node-periodic
 
     # The project name
     project: 'bgpcep'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
     install-features: >
         odl-restconf-noauth,
         odl-bgpcep-bgp,
-        odl-bgpcep-bgp-config-example,
-        odl-netconf-clustered-topology
+        odl-bgpcep-bgp-config-example
 
     # Robot custom options:
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
 
     # Controller configuration
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-standard-4'
index 8df34f773616ea175eda8446b65c8f8fb2cf723e..3e7b71c86543a75a2ab1ea13255863688cdae82e 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-gate-throughpcep
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'bgpcep'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
@@ -38,4 +40,4 @@
         -v UPDATER_TIMEOUT:600
 
     # Controller configuration
-    odl_system_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-4
index eca4d8bbea733f4208632f68a083591e12b7abc2..0eca8dc68df57172bb3afaec0964ad940c03221e 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-throughpcep
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-1node-periodic
       # FIXME: Rename job to drop -periodic- and unify job definition with -gate- functionality.
 
     # The project name
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
@@ -39,4 +41,4 @@
         -v UPDATER_TIMEOUT:600
 
     # Controller configuration
-    odl_system_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-4
index 8c667baa3f2c7a7c742431e57fcd0a6068392c94..a0316bfedc92278bf7d85bdf6bdadb9f32199c42 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: bgpcep-csit-userfeatures
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'bgpcep'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 1670dcd91b2abb3aedaf23c65d300ee1dfc4b49a..f1e6f274ae7b108e1d5c10b7b35384578e0f039b 100644 (file)
@@ -2,15 +2,17 @@
 - project:
     name: bgpcep-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'bgpcep'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 445e73576bbaf5d777a3e05b47dc2e939a5a2c35..a05817ddb899d389d791e37a554ee097b249dad1 100644 (file)
@@ -1,26 +1,44 @@
 ---
+- project:
+    name: bgpcep-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'bgpcep'
+    project-name: 'bgpcep'
+    build-node: centos7-builder-8c-8g
+    build-timeout: 120
+    branch: 'master'
+    mvn-settings: 'bgpcep-settings'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m'
+    dependencies: >
+        odlparent-merge-{stream},
+        yangtools-merge-{stream},
+        controller-merge-{stream},
+        mdsal-merge-{stream},
+        tcpmd5-merge-{stream}
+    email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
+
+    # Used by the release job
+    staging-profile-id: 9427a05049030
+
 - project:
     name: bgpcep-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'bgpcep'
     project-name: 'bgpcep'
-    build-node: centos7-builder-2c-8g
+    build-node: centos7-builder-8c-8g
     build-timeout: 120
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'bgpcep-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m'
     dependencies: >
         odlparent-merge-{stream},
@@ -29,7 +47,6 @@
         mdsal-merge-{stream},
         tcpmd5-merge-{stream}
     email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 9427a05049030
     name: bgpcep-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'bgpcep'
     project-name: 'bgpcep'
-    build-node: centos7-builder-2c-8g
+    build-node: centos7-builder-8c-8g
     build-timeout: 120
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'bgpcep-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m'
     dependencies: >
         odlparent-merge-{stream},
@@ -64,7 +73,6 @@
         mdsal-merge-{stream},
         tcpmd5-merge-{stream}
     email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 9427a05049030
     name: bgpcep-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'bgpcep'
     project-name: 'bgpcep'
-    build-node: centos7-builder-2c-8g
+    build-node: centos7-builder-8c-8g
     build-timeout: 120
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'bgpcep-settings'
-    mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m'
     dependencies: >
         odlparent-merge-{stream},
         mdsal-merge-{stream},
         tcpmd5-merge-{stream}
     email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 9427a05049030
 
     project: 'bgpcep'
     project-name: 'bgpcep'
-    build-node: centos7-builder-2c-8g
+    build-node: centos7-builder-8c-8g
     branch: 'master'
     mvn-settings: 'bgpcep-settings'
-    mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index b59c343d9bcb73046523e288b7ee0143650e3085..afeed6b873acf596a3fe88cefcce485cb479bbd8 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: bier-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'bier'
       # incompatible changes in test suites for Nitrogen
       # TODO: Create test suites for specific release before
       # Nitrogen if needed.
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 4b9c3b86fcc1d51a59cd7be00655a519348554b6..be616372906f491d0757c9a633a76375bd335769 100644 (file)
@@ -1,27 +1,40 @@
 ---
+- project:
+    name: bier-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'bier'
+    project-name: 'bier'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
+    mvn-settings: 'bier-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[bier]'
+
+    # Used by the release job
+    staging-profile-id: 942a8075b1f2a
+
 - project:
     name: bier-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'bier'
     project-name: 'bier'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
     mvn-settings: 'bier-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[bier]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 942a8075b1f2a
     name: bier-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'bier'
     project-name: 'bier'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'bier-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[bier]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 942a8075b1f2a
     name: bier-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'bier'
     project-name: 'bier'
     branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'bier-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[bier]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 942a8075b1f2a
@@ -89,6 +86,6 @@
     project: 'bier'
     project-name: 'bier'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'bier-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 8d1038ce8b633107c74a02d05b37d808da73d7d9..023718a5c970bd8188606bf682a5f65d048519a7 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: capwap-csit-ac
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'capwap'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 9c87714fb8fbf8d59302f172a1b1a913fccd8954..6836282e64f10e698886b6d41afc4c0e6d026093 100644 (file)
@@ -1,27 +1,36 @@
 ---
+- project:
+    name: capwap-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'capwap'
+    project-name: 'capwap'
+    branch: 'master'
+    mvn-settings: 'capwap-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[capwap]'
+
+    # Used by the release job
+    staging-profile-id: 96bd6b5bf86e3
+
 - project:
     name: capwap-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'capwap'
     project-name: 'capwap'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'capwap-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[capwap]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96bd6b5bf86e3
     name: capwap-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'capwap'
     project-name: 'capwap'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'capwap-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[capwap]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96bd6b5bf86e3
     name: capwap-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'capwap'
     project-name: 'capwap'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'capwap-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[capwap]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96bd6b5bf86e3
@@ -90,5 +81,4 @@
     project-name: 'capwap'
     branch: master
     mvn-settings: 'capwap-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 3880e23be198d844ec3cf8231b4e34bb7a61c762..58b826da050149798b5c0e730eb79d0b677af324 100644 (file)
@@ -1,27 +1,36 @@
 ---
+- project:
+    name: cardinal-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'cardinal'
+    project-name: 'cardinal'
+    branch: 'master'
+    mvn-settings: 'cardinal-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'
+    email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]'
+
+    # Used by the release job
+    staging-profile-id: 96be20348f0f2
+
 - project:
     name: cardinal-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'cardinal'
     project-name: 'cardinal'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'cardinal-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'
     email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96be20348f0f2
     name: cardinal-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'cardinal'
     project-name: 'cardinal'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'cardinal-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'
     email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96be20348f0f2
     name: cardinal-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'cardinal'
     project-name: 'cardinal'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'cardinal-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'
     email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96be20348f0f2
@@ -90,5 +81,4 @@
     project-name: 'cardinal'
     branch: 'master'
     mvn-settings: 'cardinal-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 6d783e50808593f7c84292a121538e54123afd22..7a4a45f52deafc7fe9dc049b54f74884c08522b9 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: centinel-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'centinel'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 14b9db0e9f1f1e403c1f8169d829f68a06117da2..e65f791a3eb1d9e12868a61d44b1b33d9d4cb3c3 100644 (file)
@@ -1,27 +1,36 @@
 ---
+- project:
+    name: centinel-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'centinel'
+    project-name: 'centinel'
+    branch: 'master'
+    mvn-settings: 'centinel-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[centinel]'
+
+    # Used by the release job
+    staging-profile-id: 96bf9b3fefd8a
+
 - project:
     name: centinel-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'centinel'
     project-name: 'centinel'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'centinel-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[centinel]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96bf9b3fefd8a
     name: centinel-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'centinel'
     project-name: 'centinel'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'centinel-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[centinel]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96bf9b3fefd8a
     name: centinel-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'centinel'
     project-name: 'centinel'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'centinel-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[centinel]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96bf9b3fefd8a
@@ -90,5 +81,4 @@
     project-name: 'centinel'
     branch: master
     mvn-settings: 'centinel-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/coe/coe-csit-openstack.yaml b/jjb/coe/coe-csit-openstack.yaml
deleted file mode 100644 (file)
index abef3f7..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
----
-- project:
-    name: coe-csit-openstack-integration
-    jobs:
-      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
-
-    project: 'coe'
-
-    topology:
-      - 1node:
-          openstack_system_count: 3
-          odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-      - 3node:
-          openstack_system_count: 4
-          odl_system_count: 3
-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
-
-    testplan: '{project}-{topology}-openstack.txt'
-
-    functionality: 'kubernetes'
-
-    stream:
-      - oxygen:
-          branch: 'master'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-
-    openstack:
-      - ocata:
-          openstack-branch: 'stable/ocata'
-          odl-ml2-branch: 'stable/ocata'
-          odl-ml2-driver-version: 'v2'
-          openstack_system_image: '{openstack_system_image_ocata}'
-
-    create-initial-networks: 'True'
-
-    enable-openstack-plugins: 'networking-odl,kuryr-kubernetes,neutron-lbaas'
-
-    enable-openstack-services: >
-        legacy_etcd,docker,q-lbaasv2,kubernetes-api,
-        kubernetes-controller-manager,kubernetes-scheduler,kubelet,kuryr-kubernetes
-
-    disable-openstack-services: 'etcd3'
-
-    lbaas-service-provider: >
-        'LOADBALANCERV2:opendaylight:networking_odl.lbaas.driver_v2.OpenDaylightLbaasDriverV2:default'
index c83c050c38c414a417cc3e4411f4b70afdbba687..117d2be80bdc75b121121ca1136521dbb07f3b2b 100644 (file)
@@ -1,27 +1,38 @@
 ---
+- project:
+    name: coe-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    project: 'coe'
+    project-name: 'coe'
+    stream: fluorine
+    branch: 'master'
+    mvn-settings: 'coe-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[coe] [odlparent] [yangtools] [controller]'
+    build-node: centos7-docker-2c-8g
+
+    # Used by the release job
+    staging-profile-id: 96c0be46aac33
+
 - project:
     name: coe-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'coe'
     project-name: 'coe'
     stream: oxygen
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'coe-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[coe] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
+    build-node: centos7-docker-2c-8g
 
     # Used by the release job
     staging-profile-id: 96c0be46aac33
     name: coe-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'coe'
     project-name: 'coe'
     stream: nitrogen
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'coe-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[coe] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96c0be46aac33
 - project:
     name: coe-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'coe'
     project-name: 'coe'
     stream: carbon
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'coe-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[coe] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96c0be46aac33
@@ -89,5 +82,4 @@
     project-name: 'coe'
     branch: 'master'
     mvn-settings: 'coe-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index f6f3e2af740074ca9c024bade8515a35744eaa16..eb580fda54e04d67b1ae7b065ea2ad6dbda4354d 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: controller-csit-akka1
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'controller'
     functionality: 'akka1'
 
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 612250df583bf3e2ecfd178b727be84cfb20b41d..23ffa331c93e34f33487d29ccfe5da99049b58b9 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: controller-csit-clustering
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-3node-{functionality}'
+      - inttest-csit-3node
+      - inttest-csit-verify-3node
 
     # The project name
     project: 'controller'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 353fadb4806ed5e1ef2f7d113704fd74d40da619..a6bd7ac4d1543d8c6e70da791cdcd0b0d0bcf5b3 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: mdsal-csit-cluster-singleton-chasing-the-leader-longevity
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'controller'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 5e1baa3bd257090d81da8a27d74feff000a2147a..a5130abf9e8c8450fe87e3f6edb13b1bbad54419 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: mdsal-csit-cluster-singleton-partition-and-heal-longevity
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'controller'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 226d14b99f01a9c9b8b19bfe42015cb27526022b..88a8e0c12bc2028f896dbd30f380438ebe5d9640 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: mdsal-csit-dom-data-broker-explicit-leader-movement-longevity
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'controller'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index c251b410c220bfaa7637ad8ca6e195cfb01b179e..a95fdb06ca81346577aa4e926f701d59c4d0a3c5 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: mdsal-csit-dom-notification-broker-no-loss-longevity
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'controller'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index f6e79b740fc6157876a470065096a94d7b8efdc6..1743f1b1a9b1066fc6caeb168c8e535a232e6136 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: mdsal-csit-dom-rpc-broker-partition-and-heal-longevity
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'controller'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 798248543380fa1cb13fa001e4988eae2ca4e1c1..e79ebef997eca6e4fda445c19989e90310a82767 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: mdsal-csit-dom-rpc-broker-precedence-longevity
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'controller'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index eba3e225860e1ae99277b0bd34209f85b5a7166a..43a9f55b8a397f5076c93ac8fa35bd7f97c40447 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: mdsal-csit-periodic-dsbenchmark-cluster
     jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-3node-periodic
 
     # The project name
     project: 'controller'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
@@ -34,7 +36,7 @@
 
     # ODL system image to use
     # The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough.
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-standard-4'
 
     build-timeout: '480'
 
index bc7901bb24d49b70dd214739910372aeef349e58..25f583679cdc0e883ed087f63a0e9e030a3767fc 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: mdsal-csit-periodic-dsbenchmark
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-1node-periodic
 
     # The project name
     project: 'controller'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
@@ -35,7 +37,7 @@
 
     # ODL system image to use
     # The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough.
-    odl_system_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-4
 
     # Plot Info
     01-plot-title: 'Performance by structure'
index a30f5562cfc981d986b7f5f2497a0843255375c3..0c2b0fdfd27b826f851b7e5fc7dcf5cf5c07c43c 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: controller-csit-rest-cars-perf
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'controller'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 8eaebd644cb90ad265a7a46fab593646469d891f..6cf7ecfeaf6ec650756cdfe04deb6cc4bab8c813 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: controller-csit-rest-clust-cars-perf
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'controller'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index dc7bc56e31bcc1e8a8f36496c7f40934b1a5e7b3..025a9e9a75d4b54d612dca89ba3fec384d73e7c2 100644 (file)
@@ -1,29 +1,44 @@
 ---
+- project:
+    name: controller-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'controller'
+    project-name: 'controller'
+    branch: 'master'
+    mvn-settings: 'controller-settings'
+    mvn-goals: 'clean deploy -Pintegrationtests,docs'
+    mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+    build-node: centos7-builder-8c-8g
+    build-timeout: 90
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
+    email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
+
+    # Used by the release job
+    staging-profile-id: 96c1c9177efdd
+
 - project:
     name: controller-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - gerrit-maven-merge
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'controller'
     project-name: 'controller'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'controller-settings'
-    mvn-goals: 'clean install -Pintegrationtests,docs'
+    mvn-goals: 'clean deploy -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+    build-node: centos7-builder-8c-8g
     build-timeout: 90
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96c1c9177efdd
     name: controller-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - gerrit-maven-merge
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'controller'
     project-name: 'controller'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'controller-settings'
-    mvn-goals: 'clean install -Pintegrationtests,docs'
+    mvn-goals: 'clean deploy -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+    build-node: centos7-builder-8c-8g
+    build-timeout: 90
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96c1c9177efdd
     name: controller-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - gerrit-maven-merge
+      - odl-maven-jobs
 
     stream: carbon
     project: 'controller'
     project-name: 'controller'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'controller-settings'
-    mvn-goals: 'clean install -Pintegrationtests,docs'
+    mvn-goals: 'clean deploy -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+    build-node: centos7-builder-8c-8g
+    build-timeout: 90
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96c1c9177efdd
@@ -91,6 +94,7 @@
     project: 'controller'
     project-name: 'controller'
     branch: master
+    build-node: centos7-builder-8c-8g
     mvn-settings: 'controller-settings'
-    mvn-goals: 'clean install -Pintegrationtests,docs'
+    mvn-goals: 'clean deploy -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
diff --git a/jjb/copy-sandbox-logs.sh b/jjb/copy-sandbox-logs.sh
new file mode 100644 (file)
index 0000000..2cc2c82
--- /dev/null
@@ -0,0 +1,47 @@
+#!/bin/bash
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2017 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+# Allows folks to copy sandbox logs over to releng for longer storage
+#
+# In some cases folks would like to save sandbox logs for a longer period of
+# time in order to troubleshoot difficult tasks. This script can be used to
+# trigger Jenkins production to copy specific logs over for longer storage.
+#
+# This is triggered via Gerrit comment.
+# Usage: copy-logs: JOB_NAME/BUILD_NUMBER
+echo "---> copy-sandbox-logs.sh"
+
+build_path="$(echo "$GERRIT_EVENT_COMMENT_TEXT" | grep 'copy-logs:' | awk -F: '{print $2}' | tr -d '[:space:]')"
+fetch_url="https://logs.opendaylight.org/sandbox/vex-yul-odl-jenkins-2/$build_path"
+
+COPY_DIR="$WORKSPACE/archives"
+mkdir -p "$COPY_DIR"
+pushd "$COPY_DIR" || exit
+
+# Ensure that the repo_url has a trailing slash as wget needs it to work
+case "$fetch_url" in
+    */)
+        ;;
+    *)
+        fetch_url="$fetch_url/"
+        ;;
+esac
+
+echo "Fetching artifacts from $fetch_url..."
+wget -nv --recursive --execute robots=off --no-parent \
+    --no-host-directories --cut-dirs=2 --level=15 \
+    "$fetch_url"
+
+echo "Removing files that do not need to be cloned..."
+mapfile -t remove_files < <(find . -type f -name "*index.html*")
+for f in "${remove_files[@]}"; do
+    rm "$f"
+done
+popd || exit
index 5a300fe311f5dabcab5c4f197f72b86d3933edaf..67d5754d2698c520eb808ef75ee1173b0afd98d4 100644 (file)
@@ -1,26 +1,36 @@
 ---
+- project:
+    name: coretutorials-fluorine
+    jobs:
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'coretutorials'
+    project-name: 'coretutorials'
+    branch: 'master'
+    mvn-settings: 'coretutorials-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[coretutorials]'
+    build-timeout: 120
+
+    # Used by the release job
+    staging-profile-id: 96cd299563ec6
+
 - project:
     name: coretutorials-oxygen
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'coretutorials'
     project-name: 'coretutorials'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'coretutorials-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[coretutorials]'
-    archive-artifacts: ''
+    build-timeout: 120
 
     # Used by the release job
     staging-profile-id: 96cd299563ec6
 - project:
     name: coretutorials-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'coretutorials'
     project-name: 'coretutorials'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'coretutorials-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[coretutorials]'
-    archive-artifacts: ''
+    build-timeout: 120
 
     # Used by the release job
     staging-profile-id: 96cd299563ec6
 - project:
     name: coretutorials-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'coretutorials'
     project-name: 'coretutorials'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'coretutorials-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[coretutorials]'
-    archive-artifacts: ''
+    build-timeout: 120
 
     # Used by the release job
     staging-profile-id: 96cd299563ec6
@@ -87,5 +81,5 @@
     project-name: 'coretutorials'
     branch: master
     mvn-settings: 'coretutorials-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    build-timeout: 120
index 6da14a22a9738220a4ffb1243dceb4d0e391dd9e..083be0a88ff28024bf6562a52c281f9ef60893bd 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: daexim-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'daexim'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
 
index a62726383b0ae172417ba9d19fb08b95a5ce2aa0..08da6af2cb5b49f9456f8ebb24b5820f3ed7d446 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: daexim-csit-clustering-basic
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'daexim'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
 
index 2bd15c025b8434fb026c0148556c6587efcadd5c..5fb3dd0d21ae174b94f95a309990255ab2831598 100644 (file)
@@ -1,27 +1,36 @@
 ---
+- project:
+    name: daexim-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    project: 'daexim'
+    project-name: 'daexim'
+    stream: fluorine
+    branch: 'master'
+    mvn-settings: 'daexim-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
+
+    # Used by the release job
+    staging-profile-id: 96e4dade34bd7
+
 - project:
     name: daexim-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'daexim'
     project-name: 'daexim'
     stream: oxygen
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'daexim-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e4dade34bd7
     name: daexim-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'daexim'
     project-name: 'daexim'
     stream: nitrogen
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'daexim-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e4dade34bd7
@@ -62,5 +62,4 @@
     project-name: 'daexim'
     branch: 'master'
     mvn-settings: 'daexim-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 4f9e5c3cbd34eb7c935745a62e774ba10ad62267..4732b9b1c3c5a6ab432e61f47ec8faccd0d66033 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: didm-csit-discovery
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'didm'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 88a2f40c905037aad993ce43946bb46db27c34c2..a9a6be7d4cd18ec1e3d51a77985950bf72262836 100644 (file)
@@ -1,27 +1,36 @@
 ---
+- project:
+    name: didm-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'didm'
+    project-name: 'didm'
+    branch: 'master'
+    mvn-settings: 'didm-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[didm]'
+
+    # Used by the release job
+    staging-profile-id: 96e6338c870f5
+
 - project:
     name: didm-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'didm'
     project-name: 'didm'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'didm-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[didm]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e6338c870f5
     name: didm-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'didm'
     project-name: 'didm'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'didm-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[didm]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e6338c870f5
     name: didm-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'didm'
     project-name: 'didm'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'didm-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[didm]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e6338c870f5
@@ -89,5 +80,4 @@
     project-name: 'didm'
     branch: 'master'
     mvn-settings: 'didm-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 4bc0cff7457d42d7fb83fd31000d1daae7477c19..7f52f5c62ded93e2a260ba0bbceac5b16fac01a9 100644 (file)
@@ -1,27 +1,36 @@
 ---
+- project:
+    name: dlux-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'dlux'
+    project-name: 'dlux'
+    branch: 'master'
+    mvn-settings: 'dlux-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream}'
+    email-upstream: '[dlux] [odlparent]'
+
+    # Used by the release job
+    staging-profile-id: 96e6a0327484f
+
 - project:
     name: dlux-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'dlux'
     project-name: 'dlux'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'dlux-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[dlux] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e6a0327484f
     name: dlux-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'dlux'
     project-name: 'dlux'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'dlux-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[dlux] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e6a0327484f
     name: dlux-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'dlux'
     project-name: 'dlux'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'dlux-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[dlux] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e6a0327484f
@@ -89,5 +80,4 @@
     project-name: 'dlux'
     branch: 'master'
     mvn-settings: 'dlux-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index cbd02da9b522048114f1f4e804f367ec7c707ca0..b0c568b21a08d5f8c7432b9791fa80d1a862a50f 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: dluxapps-csit-yangman
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'dluxapps'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 486b12b1d40e658c005665e96b47a6e3fe3a2e98..6cd7760b2a784e073628a3ec7068277f68481fd8 100644 (file)
@@ -1,27 +1,38 @@
 ---
+- project:
+    name: dluxapps-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    project: 'dluxapps'
+    project-name: 'dluxapps'
+    stream: fluorine
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    mvn-settings: 'dluxapps-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]'
+
+    # Used by the release job
+    staging-profile-id: 96e6fb1e65bf9
+
 - project:
     name: dluxapps-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'dluxapps'
     project-name: 'dluxapps'
     stream: oxygen
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'dluxapps-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e6fb1e65bf9
     name: dluxapps-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'dluxapps'
     project-name: 'dluxapps'
     stream: nitrogen
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'dluxapps-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e6fb1e65bf9
     name: dluxapps-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'dluxapps'
     project-name: 'dluxapps'
     stream: carbon
     branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'dluxapps-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e6fb1e65bf9
@@ -89,6 +84,6 @@
     project: 'dluxapps'
     project-name: 'dluxapps'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'dluxapps-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 6a1c96748b92131fd843be958aacf0f903379bde..b2d770961e524b0c40340e604eea49a2f7c957e4 100644 (file)
@@ -6,16 +6,17 @@
       - gerrit-tox-verify
 
     stream:
+      - fluorine:
+          branch: 'master'
       - oxygen:
-          branch: master
+          branch: 'stable/oxygen'
       - nitrogen:
-          branch: stable/nitrogen
+          branch: 'stable/nitrogen'
       - carbon:
-          branch: stable/carbon
+          branch: 'stable/carbon'
 
     project: docs
     project-name: docs
     build-node: centos7-builder-2c-8g
     build-timeout: 30
     rtd-project: opendaylight
-    archive-artifacts: ''
index 8591893647898ead50816ed85d1f89232224447b..36e06e98ad88be0388b7bfd66e3b5043e494c97f 100644 (file)
@@ -1,28 +1,39 @@
 ---
+- project:
+    name: eman-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'eman'
+    project-name: 'eman'
+    branch: 'master'
+    mvn-settings: 'eman-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[eman]'
+    build-node: centos7-builder-4c-16g
+
+    # Used by the release job
+    staging-profile-id: 96e9352979521
+
 - project:
     name: eman-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'eman'
     project-name: 'eman'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'eman-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[eman]'
-    archive-artifacts: ''
     build-node: centos7-builder-4c-16g
 
     # Used by the release job
     name: eman-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'eman'
     project-name: 'eman'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'eman-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[eman]'
-    archive-artifacts: ''
     build-node: centos7-builder-4c-16g
 
     # Used by the release job
     name: eman-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'eman'
     project-name: 'eman'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'eman-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[eman]'
-    archive-artifacts: ''
     build-node: centos7-builder-4c-16g
 
     # Used by the release job
@@ -95,5 +88,4 @@
     project-name: 'eman'
     branch: 'master'
     mvn-settings: 'eman-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 73a5ef4693acc310dbf6607c601bd736b47cc985..08ec7ea29fa2deb04957c8b2272d80a3d2edc53c 100644 (file)
@@ -1,27 +1,36 @@
 ---
+- project:
+    name: faas-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'faas'
+    project-name: 'faas'
+    branch: 'master'
+    mvn-settings: 'faas-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[faas]'
+
+    # Used by the release job
+    staging-profile-id: 96f5ac591d858
+
 - project:
     name: faas-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'faas'
     project-name: 'faas'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'faas-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[faas]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96f5ac591d858
     name: faas-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'faas'
     project-name: 'faas'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'faas-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[faas]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96f5ac591d858
     name: faas-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'faas'
     project-name: 'faas'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'faas-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[faas]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96f5ac591d858
@@ -89,5 +80,4 @@
     project-name: 'faas'
     branch: 'master'
     mvn-settings: 'faas-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 50ce1bdf8c6d1170978dc2ee2614cb9be5678abe..428f14b0d8db0f3960b17528d05536d68d039aa3 100644 (file)
@@ -1,28 +1,38 @@
 ---
+- project:
+    name: federation-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    project: 'federation'
+    project-name: 'federation'
+    stream: fluorine
+    branch: 'master'
+    mvn-settings: 'federation-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[federation] [odlparent] [yangtools] [controller]'
+
+    # Used by the release job
+    staging-profile-id: 96f78c7a40a24
+
 - project:
     name: federation-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'federation'
     project-name: 'federation'
     stream: oxygen
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'federation-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[federation] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96f78c7a40a24
     name: federation-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'federation'
     project-name: 'federation'
     stream: nitrogen
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'federation-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[federation] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96f78c7a40a24
     name: federation-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'federation'
     project-name: 'federation'
     stream: carbon
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'federation-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[federation] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96f78c7a40a24
@@ -93,5 +85,4 @@
     project-name: 'federation'
     branch: 'master'
     mvn-settings: 'federation-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 123c1dacb8af8f531501a4f814d0826e8f93c963..42f7e4a0fd5f0f200aa41fc18b952379b32c9403 100644 (file)
@@ -1,12 +1,9 @@
 ---
 - project:
-    name: genius-csit-genius
+    name: genius-csit-genius-oxygen
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
-      - '{project}-csit-verify-3node-{functionality}'
-
+      - inttest-csit-1node
+      - inttest-csit-3node
 
     # The project name
     project: 'genius'
     functionality:
       - 'upstream'
       - 'gate'
+      - 'tdd-wip':
+          testplan: '{project}-tdd-wip.txt'
+          schedule: ''
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
+    install:
+      - all:
+          scope: 'all'
+
+    verify-stream: 'oxygen'
+    verify-branch: 'stable/oxygen'
+    verify-karaf-version: 'karaf4'
+
+    # Mininet configuration
+    tools_system_count: 3
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
+
+    # Features to install
+    install-features: 'odl-genius-rest'
+
+    # Robot custom options
+    robot-options: ' '
+
+- project:
+    name: genius-csit-genius-{stream}
+    jobs:
+      - inttest-csit-1node
+      - inttest-csit-3node
+      - inttest-csit-verify-1node
+      - inttest-csit-verify-3node
+
+
+    # The project name
+    project: 'genius'
+
+    # The functionality under test
+    functionality:
+      - 'upstream'
+      - 'gate'
+
+    # Project branches
+    stream:
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 2074fe8c27e868b67fe124a99dad7e3141b54a5a..5b0ee7f92a9c0526c50dbd2db5aaad3471d39e3d 100644 (file)
@@ -2,19 +2,20 @@
 - project:
     name: genius-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
-    # The project name
     project: 'genius'
 
-    # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
-          os-branch: 'ocata'
+          os-branch: 'queens'
+      - oxygen:
+          branch: 'stable/oxygen'
+          os-branch: 'queens'
       - nitrogen:
           branch: 'stable/nitrogen'
-          os-branch: 'ocata'
+          os-branch: 'pike'
       - carbon:
           branch: 'stable/carbon'
           os-branch: 'ocata'
       - genius:
           csit-list: >
               genius-csit-1node-gate-all-{stream}
+
+      - cluster:
+          csit-list: >
+              genius-csit-3node-gate-all-{stream}
+
+      - tdd-wip:
+          csit-list: >
+              genius-csit-1node-tdd-wip-all-{stream}
index ab752c2108b9f3af678b19c45fcb0950280203c3..73bbbf8d5273a901cea913c88912450777c0bcef 100644 (file)
@@ -1,24 +1,43 @@
 ---
+- project:
+    name: genius-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'genius'
+    project-name: 'genius'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    mvn-settings: 'genius-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    build-timeout: 90
+    dependencies: >
+        controller-merge-{stream},
+        yangtools-merge-{stream},
+        odlparent-merge-{stream},
+        openflowplugin-merge-{stream},
+        neutron-merge-{stream}
+    email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
+
+    # Used by the release job
+    staging-profile-id: 96fb4b6d9d1ee
+
 - project:
     name: genius-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'genius'
     project-name: 'genius'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'genius-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     build-timeout: 90
     dependencies: >
@@ -28,7 +47,6 @@
         openflowplugin-merge-{stream},
         neutron-merge-{stream}
     email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fb4b6d9d1ee
     name: genius-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'genius'
     project-name: 'genius'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'genius-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: >
         controller-merge-{stream},
@@ -60,7 +71,6 @@
         openflowplugin-merge-{stream},
         neutron-merge-{stream}
     email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fb4b6d9d1ee
     name: genius-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'genius'
     project-name: 'genius'
     branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'genius-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: >
         controller-merge-{stream},
@@ -93,7 +96,6 @@
         openflowplugin-merge-{stream},
         neutron-merge-{stream}
     email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fb4b6d9d1ee
     project: 'genius'
     project-name: 'genius'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'genius-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 562c3373545caf7c69524adfec4d3cba7e38c0c5..90e4e825b3d0ac5959122c50e457419ad0cfe137 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 562c3373545caf7c69524adfec4d3cba7e38c0c5
+Subproject commit 90e4e825b3d0ac5959122c50e457419ad0cfe137
index e258a3bf7297c54c111cd739cc7a5f161e1840f1..a8442ad784172b632586b52d80c283d7c85fd273 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: groupbasedpolicy-csit-openstack-integration
     jobs:
-      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - inttest-csit-openstack
 
     # The project name
     project: 'groupbasedpolicy'
     functionality: 'openstack'
 
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
           install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
+      - oxygen:
+          branch: 'stable/oxygen'
+          install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
       - nitrogen:
           branch: 'stable/nitrogen'
           install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
@@ -31,7 +34,7 @@
           install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
 
     openstack:
-      - newton:
+      - ocata:
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
 
index 70a637e85c6c9d7f83b599136697bdfb127f954a..53b6f757856918bd395d7fc548f3fff9eb922957 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: groupbasedpolicy-csit-3node
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'groupbasedpolicy'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 891ff9a3ab731244c4af5dac1dd18e50ef4054aa..1444524aa5ce9c6129b6c29df215c69782590107 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: groupbasedpolicy-csit-6node
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
 
     # The project name
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index af92ac1f9081cd3f41fccfe64c665c234608443d..675fdf0c257563573cfe5fa8c93b58b2cba54812 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: groupbasedpolicy-csit-clustering
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
 
     # The project name
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index e722b1a5951e81d1f4ce91ea5fa3b532185c6384..be355c2fc5965d6de18f24d26196f8073e6a7a61 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: groupbasedpolicy-csit-sxp
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
     # The project name
     project: 'groupbasedpolicy'
 
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index e3b1443dd5418da69f189c8de19534d5b533fe33..6792b6307baf3aa037756f20004045745c8d0657 100644 (file)
@@ -1,23 +1,43 @@
 ---
+- project:
+    name: groupbasedpolicy-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'groupbasedpolicy'
+    project-name: 'groupbasedpolicy'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    mvn-settings: 'groupbasedpolicy-settings'
+    mvn-goals: '-U clean deploy findbugs:findbugs'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    build-timeout: 90
+    dependencies: >
+        openflowjava-merge-{stream},
+        openflowplugin-merge-{stream},
+        neutron-merge-{stream},
+        sfc-merge-{stream},
+        ovsdb-merge-{stream}
+    email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
+
+    # Used by the release job
+    staging-profile-id: 96fbb93f95a76
+
 - project:
     name: groupbasedpolicy-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean install findbugs:findbugs'
+    mvn-goals: '-U clean deploy findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     build-timeout: 90
     dependencies: >
@@ -27,7 +47,6 @@
         sfc-merge-{stream},
         ovsdb-merge-{stream}
     email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fbb93f95a76
     name: groupbasedpolicy-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean install findbugs:findbugs'
+    mvn-goals: '-U clean deploy findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: >
         openflowjava-merge-{stream},
@@ -59,7 +72,6 @@
         sfc-merge-{stream},
         ovsdb-merge-{stream}
     email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fbb93f95a76
     name: groupbasedpolicy-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean install findbugs:findbugs'
+    mvn-goals: '-U clean deploy findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: >
         openflowjava-merge-{stream},
@@ -92,7 +98,6 @@
         sfc-merge-{stream},
         ovsdb-merge-{stream}
     email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fbb93f95a76
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean install findbugs:findbugs'
+    mvn-goals: '-U clean deploy findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 43e0f2deffdc310c42b40917c99e4478e463e93c..f4829d180f15b851a03706820039e495922752e6 100644 (file)
@@ -1,27 +1,36 @@
 ---
+- project:
+    name: vbd-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'honeycomb/vbd'
+    project-name: 'vbd'
+    branch: 'master'
+    mvn-settings: 'honeycomb-vbd-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[vbd]'
+
+    # Used by the release job
+    staging-profile-id: 96fc362c36862
+
 - project:
     name: vbd-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'honeycomb/vbd'
     project-name: 'vbd'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'honeycomb-vbd-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[vbd]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fc362c36862
     name: vbd-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'honeycomb/vbd'
     project-name: 'vbd'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'honeycomb-vbd-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[vbd]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fc362c36862
     name: vbd-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'honeycomb/vbd'
     project-name: 'vbd'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'honeycomb-vbd-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[vbd]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fc362c36862
@@ -89,5 +80,4 @@
     project-name: 'vbd'
     branch: 'master'
     mvn-settings: 'honeycomb-vbd-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 2a819d4f1b53cfee05c0ee71e3ed5f196d170ebd..3dabe2ae77081e9ffffce97ae991579000f2b31c 100644 (file)
@@ -2,17 +2,20 @@
 - project:
     name: infrautils-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     project: 'infrautils'
 
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
-          os-branch: 'ocata'
+          os-branch: 'queens'
+      - oxygen:
+          branch: 'stable/oxygen'
+          os-branch: 'queens'
       - nitrogen:
           branch: 'stable/nitrogen'
-          os-branch: 'ocata'
+          os-branch: 'pike'
       - carbon:
           branch: 'stable/carbon'
           os-branch: 'ocata'
index 6c743bc372bf2059ca6ad66fa5f78ee3717dfe53..bfec7c881d6e37611f9eae0f3fa4c18cb2ef0eb7 100644 (file)
@@ -1,28 +1,38 @@
 ---
+- project:
+    name: infrautils-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'infrautils'
+    project-name: 'infrautils'
+    branch: 'master'
+    mvn-settings: 'infrautils-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream}'
+    email-upstream: '[infrautils] [odlparent]'
+
+    # Used by the release job
+    staging-profile-id: 96fca0367756c
+
 - project:
     name: infrautils-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'infrautils'
     project-name: 'infrautils'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'infrautils-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[infrautils] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fca0367756c
     name: infrautils-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'infrautils-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[infrautils] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fca0367756c
     name: infrautils-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'infrautils-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[infrautils] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fca0367756c
@@ -90,5 +82,4 @@
     project-name: 'infrautils'
     branch: 'master'
     mvn-settings: 'infrautils-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/integration/common-functions.sh b/jjb/integration/common-functions.sh
new file mode 100644 (file)
index 0000000..605cd8f
--- /dev/null
@@ -0,0 +1,117 @@
+#!/bin/bash
+
+echo "common-functions.sh is being sourced"
+
+BUNDLEFOLDER=$1
+
+# Basic controller configuration settings
+export MAVENCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.url.mvn.cfg
+export FEATURESCONF=/tmp/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg
+export CUSTOMPROP=/tmp/${BUNDLEFOLDER}/etc/custom.properties
+export LOGCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg
+export MEMCONF=/tmp/${BUNDLEFOLDER}/bin/setenv
+export CONTROLLERMEM="2048m"
+
+# Cluster specific configuration settings
+export AKKACONF=/tmp/${BUNDLEFOLDER}/configuration/initial/akka.conf
+export MODULESCONF=/tmp/${BUNDLEFOLDER}/configuration/initial/modules.conf
+export MODULESHARDSCONF=/tmp/${BUNDLEFOLDER}/configuration/initial/module-shards.conf
+
+function print_common_env() {
+    cat << EOF
+common-functions environment:
+MAVENCONF: ${MAVENCONF}
+FEATURESCONF: ${FEATURESCONF}
+CUSTOMPROP: ${CUSTOMPROP}
+LOGCONF: ${LOGCONF}
+MEMCONF: ${MEMCONF}
+CONTROLLERMEM: ${CONTROLLERMEM}
+AKKACONF: ${AKKACONF}
+MODULESCONF: ${MODULESCONF}
+MODULESHARDSCONF: ${MODULESHARDSCONF}
+
+EOF
+}
+print_common_env
+
+# Setup JAVA_HOME and MAX_MEM Value in ODL startup config file
+function set_java_vars() {
+    local -r java_home=$1
+    local -r controllermem=$2
+    local -r memconf=$3
+
+    echo "Configure\n    java home: ${java_home}\n    max memory: ${controllermem}\n    memconf: ${memconf}"
+
+    sed -ie 's%^# export JAVA_HOME%export JAVA_HOME=${JAVA_HOME:-'"${java_home}"'}%g' ${memconf}
+    sed -ie 's/JAVA_MAX_MEM="2048m"/JAVA_MAX_MEM='"${controllermem}"'/g' ${memconf}
+    echo "cat ${memconf}"
+    cat ${memconf}
+
+    echo "Set Java version"
+    sudo /usr/sbin/alternatives --install /usr/bin/java java ${java_home}/bin/java 1
+    sudo /usr/sbin/alternatives --set java ${java_home}/bin/java
+    echo "JDK default version ..."
+    java -version
+
+    echo "Set JAVA_HOME"
+    export JAVA_HOME="${java_home}"
+    # shellcheck disable=SC2037
+    JAVA_RESOLVED=$(readlink -e "${java_home}/bin/java")
+    echo "Java binary pointed at by JAVA_HOME: ${JAVA_RESOLVED}"
+} # set_java_vars()
+
+# shellcheck disable=SC2034
+# foo appears unused. Verify it or export it.
+function configure_karaf_log() {
+    local -r karaf_version=$1
+    local -r controllerdebugmap=$2
+    local logapi=log4j
+
+    # Check what the logging.cfg file is using for the logging api: log4j or log4j2
+    grep "log4j2" ${LOGCONF}
+    if [ $? -eq 0 ]; then
+        logapi=log4j2
+    fi
+
+    echo "Configuring the karaf log... karaf_version: ${karaf_version}, logapi: ${logapi}"
+    if [ "${logapi}" == "log4j2" ]; then
+        # FIXME: Make log size limit configurable from build parameter.
+        sed -ie 's/log4j2.appender.rolling.policies.size.size = 16MB/log4j2.appender.rolling.policies.size.size = 1GB/g' ${LOGCONF}
+        orgmodule="org.opendaylight.yangtools.yang.parser.repo.YangTextSchemaContextResolver"
+        orgmodule_="${orgmodule//./_}"
+        echo "${logapi}.logger.${orgmodule_}.name = WARN" >> ${LOGCONF}
+        echo "${logapi}.logger.${orgmodule_}.level = WARN" >> ${LOGCONF}
+    else
+        sed -ie 's/log4j.appender.out.maxBackupIndex=10/log4j.appender.out.maxBackupIndex=1/g' ${LOGCONF}
+        # FIXME: Make log size limit configurable from build parameter.
+        sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=30GB/g' ${LOGCONF}
+        echo "${logapi}.logger.org.opendaylight.yangtools.yang.parser.repo.YangTextSchemaContextResolver = WARN" >> ${LOGCONF}
+    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."
+    unset IFS
+    echo "controllerdebugmap: ${controllerdebugmap}"
+    if [ -n "${controllerdebugmap}" ]; then
+        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}"
+                if [ "${logapi}" == "log4j2" ]; then
+                    orgmodule_="${orgmodule//./_}"
+                    echo "${logapi}.logger.${orgmodule_}.name = ${orgmodule}" >> ${LOGCONF}
+                    echo "${logapi}.logger.${orgmodule_}.level = ${level}" >> ${LOGCONF}
+                else
+                    echo "${logapi}.logger.${orgmodule} = ${level}" >> ${LOGCONF}
+                fi
+            fi
+        done
+    fi
+
+    echo "cat ${LOGCONF}"
+    cat ${LOGCONF}
+} # function configure_karaf_log()
diff --git a/jjb/integration/copy-common-functions.sh b/jjb/integration/copy-common-functions.sh
new file mode 100644 (file)
index 0000000..e0eacdf
--- /dev/null
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# Copy the whole script to /tmp/common-functions.sh and to remote nodes but
+# only if this script itself is executing and not sourced. jenkins prepends this
+# script to the common-functions.sh script when adding it to the robot minion.
+# jenkins will then execute the script. The if check below checks that the
+# script is executing rather than being sourced. When executed the condition
+# is true and copies the script. In the false path this copy below is skipped
+# and the sourcing continues so that the appended common-function.sh ends up sourced.
+if [ "${BASH_SOURCE[0]}" == "${0}" ]; then
+    echo "Copying common-functions.sh to /tmp"
+    cp "${0}" /tmp/common-functions.sh
+
+    source /tmp/v/openstack/bin/activate
+    mapfile -t ips <<< "$(openstack stack show -f json -c outputs "$STACK_NAME" | jq -r '.outputs[] | select(.output_key | match("^vm_[0-9]+_ips$")) | .output_value | .[]')"
+    for ip in "${ips[@]}"; do
+        echo "Copying common-functions.sh to ${ip}:/tmp"
+        scp /tmp/common-functions.sh ${ip}:/tmp
+    done
+    exit 0
+fi
index f53722af3da3aaa1e61f8e04755958ff1400f2e0..d22086acf88b461d9f7905df0a0bc939efc19564 100644 (file)
@@ -22,7 +22,7 @@ genius-csit-1node-upstream-all-carbon,
 genius-csit-3node-upstream-all-carbon,
 groupbasedpolicy-csit-1node-3-node-all-carbon,
 groupbasedpolicy-csit-1node-6node-all-carbon,
-groupbasedpolicy-csit-1node-openstack-newton-openstack-carbon,
+groupbasedpolicy-csit-1node-openstack-ocata-openstack-carbon,
 groupbasedpolicy-csit-1node-sxp-only-carbon,
 groupbasedpolicy-csit-3node-clustering-all-carbon,
 iotdm-csit-1node-basic-all-carbon,
@@ -95,6 +95,6 @@ usc-csit-1node-tcp-all-carbon,
 usecplugin-csit-1node-basic-all-carbon,
 vtn-csit-1node-coordinator-only-carbon,
 vtn-csit-1node-manager-all-carbon,
-vtn-csit-1node-openstack-newton-neutron-carbon,
+vtn-csit-1node-openstack-pike-neutron-carbon,
 vtn-csit-3node-manager-all-carbon,
 yangtools-csit-1node-periodic-system-only-carbon,
diff --git a/jjb/integration/csit-jobs-fluorine.lst b/jjb/integration/csit-jobs-fluorine.lst
new file mode 100644 (file)
index 0000000..cf16f78
--- /dev/null
@@ -0,0 +1,92 @@
+aaa-csit-1node-authn-all-fluorine,
+aaa-csit-1node-keystone-all-fluorine,
+aaa-csit-1node-tls-only-fluorine,
+alto-csit-1node-setup-all-fluorine,
+bgpcep-csit-1node-periodic-bgp-ingest-all-fluorine,
+bgpcep-csit-1node-periodic-bgp-ingest-mixed-all-fluorine,
+bgpcep-csit-1node-periodic-throughpcep-all-fluorine,
+bgpcep-csit-1node-userfeatures-all-fluorine,
+bgpcep-csit-3node-periodic-bgpclustering-all-fluorine,
+bgpcep-csit-3node-periodic-bgpclustering-ha-only-fluorine,
+bier-csit-1node-basic-all-fluorine,
+controller-csit-1node-akka1-all-fluorine,
+controller-csit-1node-periodic-benchmark-all-fluorine,
+controller-csit-1node-rest-cars-perf-all-fluorine,
+controller-csit-3node-clustering-all-fluorine,
+controller-csit-3node-periodic-benchmark-all-fluorine,
+controller-csit-3node-rest-clust-cars-perf-only-fluorine,
+daexim-csit-1node-basic-only-fluorine,
+daexim-csit-3node-clustering-basic-only-fluorine,
+distribution-csit-1node-userfeatures-all-fluorine,
+dluxapps-csit-1node-yangman-all-fluorine,
+genius-csit-1node-upstream-all-fluorine,
+genius-csit-3node-upstream-all-fluorine,
+groupbasedpolicy-csit-1node-3-node-all-fluorine,
+groupbasedpolicy-csit-1node-6node-all-fluorine,
+groupbasedpolicy-csit-1node-openstack-ocata-openstack-fluorine,
+groupbasedpolicy-csit-1node-sxp-only-fluorine,
+groupbasedpolicy-csit-3node-clustering-all-fluorine,
+l2switch-csit-1node-periodic-host-scalability-daily-only-fluorine,
+l2switch-csit-1node-scalability-all-fluorine,
+l2switch-csit-1node-switch-all-fluorine,
+lispflowmapping-csit-1node-msmr-all-fluorine,
+lispflowmapping-csit-1node-performance-only-fluorine,
+lispflowmapping-csit-3node-msmr-all-fluorine,
+mdsal-csit-1node-periodic-bindingv1-only-fluorine,
+messaging4transport-csit-1node-basic-all-fluorine,
+natapp-csit-1node-basic-all-fluorine,
+nemo-csit-1node-engine-all-fluorine,
+netconf-csit-1node-callhome-only-fluorine,
+netconf-csit-1node-periodic-scale-all-fluorine,
+netconf-csit-1node-userfeatures-all-fluorine,
+netconf-csit-3node-cluster-stress-all-fluorine,
+netconf-csit-3node-clustering-all-fluorine,
+netconf-csit-3node-periodic-clustering-scale-all-fluorine,
+netvirt-csit-1node-openstack-pike-upstream-stateful-fluorine,
+netvirt-csit-1node-openstack-pike-upstream-stateful-snat-conntrack-fluorine,
+netvirt-csit-1node-openstack-queens-upstream-stateful-fluorine,
+netvirt-csit-1node-openstack-queens-upstream-stateful-snat-conntrack-fluorine,
+netvirt-csit-3node-openstack-pike-upstream-stateful-fluorine,
+netvirt-csit-3node-openstack-pike-upstream-stateful-snat-conntrack-fluorine,
+netvirt-csit-3node-openstack-queens-upstream-stateful-fluorine,
+netvirt-csit-3node-openstack-queens-upstream-stateful-snat-conntrack-fluorine,
+netvirt-csit-hwvtep-1node-openstack-pike-upstream-stateful-fluorine,
+netvirt-csit-hwvtep-1node-openstack-queens-upstream-stateful-fluorine,
+netvirt-csit-hwvtep-3node-openstack-pike-upstream-stateful-fluorine,
+netvirt-csit-hwvtep-3node-openstack-queens-upstream-stateful-fluorine,
+of-config-csit-1node-basic-all-fluorine,
+openflowplugin-csit-1node-cbench-only-fluorine,
+openflowplugin-csit-1node-flow-services-all-fluorine,
+openflowplugin-csit-1node-perf-bulkomatic-only-fluorine,
+openflowplugin-csit-1node-perf-stats-collection-only-fluorine,
+openflowplugin-csit-1node-scale-link-only-fluorine,
+openflowplugin-csit-1node-scale-only-fluorine,
+openflowplugin-csit-1node-scale-switch-only-fluorine,
+openflowplugin-csit-3node-clustering-bulkomatic-only-fluorine,
+openflowplugin-csit-3node-clustering-only-fluorine,
+openflowplugin-csit-3node-clustering-perf-bulkomatic-only-fluorine,
+ovsdb-csit-1node-upstream-southbound-all-fluorine,
+ovsdb-csit-3node-upstream-clustering-only-fluorine,
+p4plugin-csit-1node-basic-all-fluorine,
+packetcable-csit-1node-pcmm-all-fluorine,
+sdninterfaceapp-csit-1node-basic-only-fluorine,
+sfc-csit-3node-docker-full-deploy-all-fluorine,
+sfc-csit-3node-rest-basic-all-fluorine,
+sxp-csit-1node-basic-all-fluorine,
+sxp-csit-1node-filtering-all-fluorine,
+sxp-csit-1node-periodic-performance-all-fluorine,
+sxp-csit-1node-topology-all-fluorine,
+sxp-csit-3node-periodic-clustering-all-fluorine,
+sxp-csit-3node-periodic-routing-all-fluorine,
+tsdr-csit-1node-cassandra-datastore-only-fluorine,
+tsdr-csit-1node-elasticsearch-datastore-only-fluorine,
+tsdr-csit-1node-hbase-datastore-all-fluorine,
+tsdr-csit-1node-hsqldb-datastore-all-fluorine,
+usc-csit-1node-channel-all-fluorine,
+usc-csit-1node-tcp-all-fluorine,
+usecplugin-csit-1node-basic-all-fluorine,
+vtn-csit-1node-coordinator-only-fluorine,
+vtn-csit-1node-manager-all-fluorine,
+vtn-csit-1node-openstack-pike-neutron-fluorine,
+vtn-csit-3node-manager-all-fluorine,
+yangtools-csit-1node-periodic-system-only-fluorine,
index 9060713ebdfa645dec70d32060dfb3814f058d47..108340196425876f427d7b4e881c1cfe39561ef0 100644 (file)
@@ -23,7 +23,7 @@ genius-csit-1node-upstream-all-nitrogen,
 genius-csit-3node-upstream-all-nitrogen,
 groupbasedpolicy-csit-1node-3-node-all-nitrogen,
 groupbasedpolicy-csit-1node-6node-all-nitrogen,
-groupbasedpolicy-csit-1node-openstack-newton-openstack-nitrogen,
+groupbasedpolicy-csit-1node-openstack-ocata-openstack-nitrogen,
 groupbasedpolicy-csit-1node-sxp-only-nitrogen,
 groupbasedpolicy-csit-3node-clustering-all-nitrogen,
 l2switch-csit-1node-periodic-host-scalability-daily-only-nitrogen,
@@ -42,23 +42,17 @@ netconf-csit-1node-userfeatures-all-nitrogen,
 netconf-csit-3node-cluster-stress-all-nitrogen,
 netconf-csit-3node-clustering-all-nitrogen,
 netconf-csit-3node-periodic-clustering-scale-all-nitrogen,
-netvirt-csit-1node-openstack-ocata-upstream-stateful-nitrogen,
-netvirt-csit-1node-openstack-ocata-upstream-stateful-snat-conntrack-nitrogen,
 netvirt-csit-1node-openstack-pike-sfc-nitrogen,
 netvirt-csit-1node-openstack-pike-upstream-stateful-nitrogen,
 netvirt-csit-1node-openstack-pike-upstream-stateful-snat-conntrack-nitrogen,
 netvirt-csit-1node-openstack-queens-upstream-stateful-nitrogen,
 netvirt-csit-1node-openstack-queens-upstream-stateful-snat-conntrack-nitrogen,
-netvirt-csit-3node-openstack-ocata-upstream-stateful-nitrogen,
-netvirt-csit-3node-openstack-ocata-upstream-stateful-snat-conntrack-nitrogen,
 netvirt-csit-3node-openstack-pike-upstream-stateful-nitrogen,
 netvirt-csit-3node-openstack-pike-upstream-stateful-snat-conntrack-nitrogen,
 netvirt-csit-3node-openstack-queens-upstream-stateful-nitrogen,
 netvirt-csit-3node-openstack-queens-upstream-stateful-snat-conntrack-nitrogen,
-netvirt-csit-hwvtep-1node-openstack-ocata-upstream-stateful-nitrogen,
 netvirt-csit-hwvtep-1node-openstack-pike-upstream-stateful-nitrogen,
 netvirt-csit-hwvtep-1node-openstack-queens-upstream-stateful-nitrogen,
-netvirt-csit-hwvtep-3node-openstack-ocata-upstream-stateful-nitrogen,
 netvirt-csit-hwvtep-3node-openstack-pike-upstream-stateful-nitrogen,
 netvirt-csit-hwvtep-3node-openstack-queens-upstream-stateful-nitrogen,
 nic-csit-1node-basic-all-nitrogen,
@@ -95,6 +89,6 @@ usc-csit-1node-tcp-all-nitrogen,
 usecplugin-csit-1node-basic-all-nitrogen,
 vtn-csit-1node-coordinator-only-nitrogen,
 vtn-csit-1node-manager-all-nitrogen,
-vtn-csit-1node-openstack-newton-neutron-nitrogen,
+vtn-csit-1node-openstack-pike-neutron-nitrogen,
 vtn-csit-3node-manager-all-nitrogen,
 yangtools-csit-1node-periodic-system-only-nitrogen,
index 18370940c366dec1ccfc73f2e4d761dfd01bcea1..2c4287729956f62dc51c008ab182e3411ee8abc9 100644 (file)
@@ -23,7 +23,7 @@ genius-csit-1node-upstream-all-oxygen,
 genius-csit-3node-upstream-all-oxygen,
 groupbasedpolicy-csit-1node-3-node-all-oxygen,
 groupbasedpolicy-csit-1node-6node-all-oxygen,
-groupbasedpolicy-csit-1node-openstack-newton-openstack-oxygen,
+groupbasedpolicy-csit-1node-openstack-ocata-openstack-oxygen,
 groupbasedpolicy-csit-1node-sxp-only-oxygen,
 groupbasedpolicy-csit-3node-clustering-all-oxygen,
 l2switch-csit-1node-periodic-host-scalability-daily-only-oxygen,
@@ -42,28 +42,19 @@ netconf-csit-1node-userfeatures-all-oxygen,
 netconf-csit-3node-cluster-stress-all-oxygen,
 netconf-csit-3node-clustering-all-oxygen,
 netconf-csit-3node-periodic-clustering-scale-all-oxygen,
-netvirt-csit-1node-openstack-ocata-upstream-stateful-oxygen,
-netvirt-csit-1node-openstack-ocata-upstream-stateful-snat-conntrack-oxygen,
 netvirt-csit-1node-openstack-pike-sfc-oxygen,
 netvirt-csit-1node-openstack-pike-upstream-stateful-oxygen,
 netvirt-csit-1node-openstack-pike-upstream-stateful-snat-conntrack-oxygen,
 netvirt-csit-1node-openstack-queens-upstream-stateful-oxygen,
 netvirt-csit-1node-openstack-queens-upstream-stateful-snat-conntrack-oxygen,
-netvirt-csit-3node-openstack-ocata-upstream-stateful-oxygen,
-netvirt-csit-3node-openstack-ocata-upstream-stateful-snat-conntrack-oxygen,
 netvirt-csit-3node-openstack-pike-upstream-stateful-oxygen,
 netvirt-csit-3node-openstack-pike-upstream-stateful-snat-conntrack-oxygen,
 netvirt-csit-3node-openstack-queens-upstream-stateful-oxygen,
 netvirt-csit-3node-openstack-queens-upstream-stateful-snat-conntrack-oxygen,
-netvirt-csit-hwvtep-1node-openstack-ocata-upstream-stateful-oxygen,
 netvirt-csit-hwvtep-1node-openstack-pike-upstream-stateful-oxygen,
 netvirt-csit-hwvtep-1node-openstack-queens-upstream-stateful-oxygen,
-netvirt-csit-hwvtep-3node-openstack-ocata-upstream-stateful-oxygen,
 netvirt-csit-hwvtep-3node-openstack-pike-upstream-stateful-oxygen,
 netvirt-csit-hwvtep-3node-openstack-queens-upstream-stateful-oxygen,
-nic-csit-1node-basic-all-oxygen,
-ocpplugin-csit-1node-get-all-oxygen,
-ocpplugin-csit-1node-scalability-all-oxygen,
 of-config-csit-1node-basic-all-oxygen,
 openflowplugin-csit-1node-cbench-only-oxygen,
 openflowplugin-csit-1node-flow-services-all-oxygen,
@@ -88,18 +79,15 @@ sxp-csit-1node-periodic-performance-all-oxygen,
 sxp-csit-1node-topology-all-oxygen,
 sxp-csit-3node-periodic-clustering-all-oxygen,
 sxp-csit-3node-periodic-routing-all-oxygen,
-topoprocessing-csit-1node-topology-operations-all-oxygen,
 tsdr-csit-1node-cassandra-datastore-only-oxygen,
 tsdr-csit-1node-elasticsearch-datastore-only-oxygen,
 tsdr-csit-1node-hbase-datastore-all-oxygen,
 tsdr-csit-1node-hsqldb-datastore-all-oxygen,
-unimgr-csit-1node-basic-all-oxygen,
-unimgr-csit-1node-legato-all-oxygen,
 usc-csit-1node-channel-all-oxygen,
 usc-csit-1node-tcp-all-oxygen,
 usecplugin-csit-1node-basic-all-oxygen,
 vtn-csit-1node-coordinator-only-oxygen,
 vtn-csit-1node-manager-all-oxygen,
-vtn-csit-1node-openstack-newton-neutron-oxygen,
+vtn-csit-1node-openstack-pike-neutron-oxygen,
 vtn-csit-3node-manager-all-oxygen,
 yangtools-csit-1node-periodic-system-only-oxygen,
index 9f0943ca007f8add42d99d8f3e169f9b0336a735..2a333dea772f553e762e41d85cdced555f814f81 100644 (file)
@@ -20,10 +20,13 @@ unzip -q "${BUNDLE}"
 
 echo "Configuring the startup features..."
 FEATURESCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg"
-# Add test feature repo if Karaf 4.
-sed -ie "s%mvn:org.opendaylight.integration/features-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-test/${BUNDLEVERSION}/xml/features%g" "${FEATURESCONF}"
-# Add test feature repo if Karaf 3.
-sed -ie "s%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features%g" "${FEATURESCONF}"
+FEATURE_TEST_STRING="features-integration-test"
+if [[ "$KARAF_VERSION" == "karaf4" ]]; then
+    FEATURE_TEST_STRING="features-test"
+fi
+
+sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,%g" ${FEATURESCONF}
+
 # Add actual boot features.
 sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" "${FEATURESCONF}"
 cat "${FEATURESCONF}"
@@ -43,6 +46,7 @@ netstat -pnatu
 
 echo "redirected karaf console output to karaf_console.log"
 export KARAF_REDIRECT="${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"
+mkdir -p ${WORKSPACE}/${BUNDLEFOLDER}/data/log
 
 if [ "${JDKVERSION}" == 'openjdk8' ]; then
     echo "Setting the JRE Version to 8"
@@ -61,6 +65,7 @@ java -version
 
 echo "Redirecting karaf console output to karaf_console.log"
 export KARAF_REDIRECT="${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"
+mkdir -p ${WORKSPACE}/${BUNDLEFOLDER}/data/log
 
 echo "Starting controller..."
 ${WORKSPACE}/${BUNDLEFOLDER}/bin/start
index f9dded57b8ac8fe09bcc175668a30440f7f43db1..0d016eb586774837c91bff98948100656e75cc59 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: distribution-csit-userfeatures
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'distribution'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index f6c83c2ad8e78a882e4d003784698a80ffe84708..e7920b5346b066c5d16ad8e8696a73ac72f4ccad 100644 (file)
@@ -15,10 +15,13 @@ unzip -q "${BUNDLE}"
 
 echo "Configuring the startup features..."
 FEATURESCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg"
-# Add test feature repo if Karaf 4.
-sed -ie "s%mvn:org.opendaylight.integration/features-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-test/${BUNDLEVERSION}/xml/features%g" "${FEATURESCONF}"
-# Add test feature repo if Karaf 3.
-sed -ie "s%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features%g" "${FEATURESCONF}"
+FEATURE_TEST_STRING="features-integration-test"
+if [[ "$KARAF_VERSION" == "karaf4" ]]; then
+    FEATURE_TEST_STRING="features-test"
+fi
+
+sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,%g" ${FEATURESCONF}
+
 # Feature is instaled later.
 cat "${FEATURESCONF}"
 
@@ -57,6 +60,7 @@ java -version
 
 echo "Redirecting karaf console output to karaf_console.log"
 export KARAF_REDIRECT="${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"
+mkdir -p ${WORKSPACE}/${BUNDLEFOLDER}/data/log
 
 echo "Starting controller..."
 ${WORKSPACE}/${BUNDLEFOLDER}/bin/start
index f0f2fbb6d5e46d43c90ef9d5c1c858c82f0f22a9..c81ac6db6734fd7472c28236fe801a4ead40a633 100644 (file)
@@ -14,11 +14,14 @@ echo "Extracting the new controller..."
 unzip -q "${BUNDLE}"
 
 echo "Configuring the startup features..."
-FEATURESCONF=${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg
-# Add test feature repo if Karaf 4.
-sed -ie "s%mvn:org.opendaylight.integration/features-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-test/${BUNDLEVERSION}/xml/features%g" "${FEATURESCONF}"
-# Add test feature repo if Karaf 3.
-sed -ie "s%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features%g" "${FEATURESCONF}"
+FEATURESCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg"
+FEATURE_TEST_STRING="features-integration-test"
+if [[ "$KARAF_VERSION" == "karaf4" ]]; then
+    FEATURE_TEST_STRING="features-test"
+fi
+
+sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,%g" ${FEATURESCONF}
+
 # Add actual boot features.
 sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" "${FEATURESCONF}"
 cat "${FEATURESCONF}"
@@ -53,6 +56,7 @@ java -version
 
 echo "Redirecting karaf console output to karaf_console.log"
 export KARAF_REDIRECT="${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"
+mkdir -p ${WORKSPACE}/${BUNDLEFOLDER}/data/log
 
 echo "Starting controller..."
 ${WORKSPACE}/${BUNDLEFOLDER}/bin/start
index ad581a5fca30bab61b5fc85169efbbb6384e5b99..1ffd0ea7d9d4680920ff929e00d312b5aa9b1f91 100644 (file)
@@ -6,7 +6,7 @@
     name: 'distribution-verify-{stream}'
 
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-builder-8c-8g
     concurrent: true
     jdk: '{jre}'
 
@@ -53,7 +53,7 @@
               -Dstream={stream}
               -Dsft.heap.max=4g
               {opendaylight-infra-mvn-opts}
-          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features for SFT.
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
           java-opts:
             - '-Xmx1024m -XX:MaxPermSize=256m'
           settings: integration-settings
@@ -78,7 +78,7 @@
     #     https://issues.apache.org/jira/browse/MNG-5666
 
     project-type: maven
-    node: '{build-node}'
+    node: 'centos7-builder-8c-8g'
     jdk: '{jre}'
 
     properties:
 
 - job-template:
     name: 'distribution-check-{stream}'
+
+    ######################
+    # Default parameters #
+    ######################
+
+    mvn-version: mvn33
+
+    #####################
+    # Job Configuration #
+    #####################
+
     # Like a {project}-distribution-check, but few steps less as there is no upstream project involved.
     disabled: false
 
     project-type: freestyle
-    node: '{build-node}'
+    node: 'centos7-builder-8c-8g'
     concurrent: true
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
       - distribution-check-wipe
       - distribution-check-build-project:
           pom: 'distribution/pom.xml'
-          mvn-opts: '{opendaylight-infra-parallel-mvn-opts}'
+          mvn-opts: '{opendaylight-infra-mvn-opts}'
+          mvn-version: '{mvn-version}'
+          # '{opendaylight-infra-parallel-mvn-opts}' is bad when there are multiple big features in SFT.
       - distribution-check-verify-groupid:
           gerrit-project: 'integration'
       - distribution-check-delete-snapshots
       - distribution-check-configure-remotes
       - distribution-check-repeat-project-build:
           pom: 'distribution/pom.xml'
-          mvn-opts: '{opendaylight-infra-parallel-mvn-opts}'
+          mvn-opts: '{opendaylight-infra-mvn-opts}'
+          mvn-version: '{mvn-version}'
+          # '{opendaylight-infra-parallel-mvn-opts}' is bad when there are multiple big features in SFT.
       - integration-set-variables
       - distribution-check-warn-9191
       - distribution-check-warn-9192
     # FIXME: List required variables.
 
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-builder-4c-4g
     concurrent: false
 
     properties:
     # FIXME: List required variables.
 
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-builder-4c-4g
     concurrent: false
 
     properties:
index d8625c6cb0aa9e3630590fe853f9f25244b3b8b4..bd835f21f8dc53933f1b6d5131a66f888a898b6c 100644 (file)
@@ -43,7 +43,7 @@
     #   pom: Relative path to pom file to use. Typically '$GERRIT_PROJECT/pom.xml'.
     builders:
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{mvn-version}'
           pom: '{pom}'
           goals: |
               clean deploy
@@ -83,7 +83,7 @@
     #   dist-pom: Relative path to pom file to use. 'distribution/pom.xml' is recommended.
     builders:
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{mvn-version}'
           pom: '{dist-pom}'
           goals: |
               clean install
       - shell: |
           cp -r /tmp/r /tmp/t
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{mvn-version}'
           pom: '{pom}'
           goals: |
               clean install
     #   dist-pom: Relative path to pom file to use. 'distribution/pom.xml' is recommended.
     builders:
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{mvn-version}'
           pom: '{dist-pom}'
           goals: |
               clean install
index a4cb1b8f694dc264911b8b0b77468c3e61a8a7bd..e7c0746e20a258cc8fb49fbdc7066239f14e8445 100644 (file)
@@ -4,15 +4,27 @@
 
 - job-template:
     name: '{project-name}-distribution-check-{stream}'
+
+    ######################
+    # Default parameters #
+    ######################
+
+    java-version: openjdk8
+    mvn-version: mvn33
+
+    #####################
+    # Job Configuration #
+    #####################
+
     # Operation: This job template builds a patch, creates a distribution containing
     #            the patch (making sure dependencies are specified),
     #            and performs the distribution deploy test.
     disabled: false
 
     project-type: freestyle
-    node: '{build-node}'
+    node: 'centos7-builder-8c-8g'
     concurrent: true
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
@@ -30,7 +42,7 @@
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
       - maven-exec:
-          maven-version: mvn33
+          maven-version: '{mvn-version}'
 
     scm:
       - integration-gerrit-scm:
       - distribution-check-build-project:
           pom: '$GERRIT_PROJECT/pom.xml'
           mvn-opts: '{opendaylight-infra-mvn-opts}'
-          # TODO: {opendaylight-infra-parallel-mvn-opts}?
+          mvn-version: '{mvn-version}'
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
       - distribution-check-verify-groupid:
           gerrit-project: '$GERRIT_PROJECT'
       - distribution-check-download-deps:
           dist-pom: 'distribution/pom.xml'
-          mvn-opts: '{opendaylight-infra-parallel-mvn-opts}'
+          mvn-opts: '{opendaylight-infra-mvn-opts}'
+          mvn-version: '{mvn-version}'
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
       - distribution-check-delete-snapshots
       - distribution-check-configure-remotes
       - distribution-check-repeat-project-build:
           pom: '$GERRIT_PROJECT/pom.xml'
           mvn-opts: '{opendaylight-infra-mvn-opts}'
-          # TODO: {opendaylight-infra-parallel-mvn-opts}?
+          mvn-version: '{mvn-version}'
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
       - distribution-check-repeat-distro-build:
           dist-pom: 'distribution/pom.xml'
-          mvn-opts: '{opendaylight-infra-parallel-mvn-opts}'
+          mvn-opts: '{opendaylight-infra-mvn-opts}'
+          mvn-version: '{mvn-version}'
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
       - integration-set-variables
       - distribution-check-warn-9191
       - distribution-check-warn-9192
index 53d72fc8b9caf37880af39291ee140524dda0f57..c737d8d70d79b2bec5e4aedceb64dddec1ad88d6 100644 (file)
@@ -1,5 +1,4 @@
 ---
-# ODL Releng build templates
 - project:
     name: distribution
     jobs:
@@ -10,6 +9,7 @@
       - 'distribution-offline-{stream}'
       - 'distribution-check-{stream}'
       - gerrit-maven-clm
+      - gerrit-maven-verify-dependencies
       - gerrit-tox-verify
 
     project: integration/distribution
     email-upstream: '[int/dist]'
 
     stream:
+      - fluorine:
+          branch: 'master'
       - oxygen:
-          branch: master
+          branch: 'stable/oxygen'
       - nitrogen:
-          branch: stable/nitrogen
+          branch: 'stable/nitrogen'
       - carbon:
-          branch: stable/carbon
+          branch: 'stable/carbon'
           karaf-version: karaf3
 
 - project:
index 27a9d2447c103762d2e640d1e942378f0d665ffb..ee18f254061a97139c1158faee4ee820f26b3810 100644 (file)
@@ -4,25 +4,15 @@
 # script.
 # shellcheck source=${ROBOT_VENV}/bin/activate disable=SC1091
 source ${ROBOT_VENV}/bin/activate
+source /tmp/common-functions.sh ${BUNDLEFOLDER}
 
 echo "#################################################"
 echo "##         Configure Cluster and Start         ##"
 echo "#################################################"
 
-AKKACONF=/tmp/${BUNDLEFOLDER}/configuration/initial/akka.conf
-MODULESCONF=/tmp/${BUNDLEFOLDER}/configuration/initial/modules.conf
-MODULESHARDSCONF=/tmp/${BUNDLEFOLDER}/configuration/initial/module-shards.conf
-MAVENCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.url.mvn.cfg
-FEATURESCONF=/tmp/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg
-CUSTOMPROP=/tmp/${BUNDLEFOLDER}/etc/custom.properties
-LOGCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg
-MEMCONF=/tmp/${BUNDLEFOLDER}/bin/setenv
-CONTROLLERMEM="2048m"
-
-
 if [ ${CONTROLLERSCOPE} == 'all' ]; then
     ACTUALFEATURES="odl-integration-compatible-with-all,${CONTROLLERFEATURES}"
-    CONTROLLERMEM="3072m"
+    export CONTROLLERMEM="3072m"
 else
     ACTUALFEATURES="odl-infrautils-ready,${CONTROLLERFEATURES}"
 fi
@@ -66,6 +56,8 @@ fi
 
 # Create the configuration script to be run on controllers.
 cat > ${WORKSPACE}/configuration-script.sh <<EOF
+set -x
+source /tmp/common-functions.sh ${BUNDLEFOLDER}
 
 echo "Changing to /tmp"
 cd /tmp
@@ -82,27 +74,14 @@ cat ${MAVENCONF}
 
 echo "Configuring the startup features..."
 sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" ${FEATURESCONF}
-sed -ie "s%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features%g" ${FEATURESCONF}
-cat ${FEATURESCONF}
 
-echo "Configuring the log..."
-sed -ie 's/log4j.appender.out.maxBackupIndex=10/log4j.appender.out.maxBackupIndex=1/g' ${LOGCONF}
-# FIXME: Make log size limit configurable from build parameter.
-sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=30GB/g' ${LOGCONF}
-# Add custom logging levels
-# CONTROLLERDEBUGMAP is expected to be a key:value map of space separated values like "module:level module2:level2"
-# where module is abbreviated and does not include org.opendaylight
-unset IFS
-if [ -n "${CONTROLLERDEBUGMAP}" ]; then
-    for kv in ${CONTROLLERDEBUGMAP}; do
-        module=\${kv%%:*}
-        level=\${kv#*:}
-        if [ -n \${module} ] && [ -n \${level} ]; then
-            echo "log4j.logger.org.opendaylight.\${module} = \${level}" >> \${LOGCONF}
-        fi
-    done
+FEATURE_TEST_STRING="features-integration-test"
+if [[ "$KARAF_VERSION" == "karaf4" ]]; then
+    FEATURE_TEST_STRING="features-test"
 fi
-cat ${LOGCONF}
+
+sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features,%g" ${FEATURESCONF}
+cat ${FEATURESCONF}
 
 if [ "${ODL_ENABLE_L3_FWD}" == "yes" ]; then
   echo "Enable the l3.fwd in custom.properties.."
@@ -110,22 +89,9 @@ if [ "${ODL_ENABLE_L3_FWD}" == "yes" ]; then
   cat ${CUSTOMPROP}
 fi
 
-echo "Configure java home and max memory..."
-sed -ie 's%^# export JAVA_HOME%export JAVA_HOME="\${JAVA_HOME:-${JAVA_HOME}}"%g' ${MEMCONF}
-sed -ie 's/JAVA_MAX_MEM="2048m"/JAVA_MAX_MEM="${CONTROLLERMEM}"/g' ${MEMCONF}
-cat ${MEMCONF}
-
-echo "Set Java version"
-sudo /usr/sbin/alternatives --install /usr/bin/java java ${JAVA_HOME}/bin/java 1
-sudo /usr/sbin/alternatives --set java ${JAVA_HOME}/bin/java
-echo "JDK default version ..."
-java -version
+configure_karaf_log "${KARAF_VERSION}" "${CONTROLLERDEBUGMAP}"
 
-echo "Set JAVA_HOME"
-export JAVA_HOME="${JAVA_HOME}"
-# Did you know that in HERE documents, single quote is an ordinary character, but backticks are still executing?
-JAVA_RESOLVED=\`readlink -e "\${JAVA_HOME}/bin/java"\`
-echo "Java binary pointed at by JAVA_HOME: \${JAVA_RESOLVED}"
+set_java_vars "${JAVA_HOME}" "${CONTROLLERMEM}" "${MEMCONF}"
 
 # Copy shard file if exists
 if [ -f /tmp/custom_shard_config.txt ]; then
@@ -153,6 +119,7 @@ cat > ${WORKSPACE}/startup-script.sh <<EOF
 
 echo "Redirecting karaf console output to karaf_console.log"
 export KARAF_REDIRECT="/tmp/${BUNDLEFOLDER}/data/log/karaf_console.log"
+mkdir -p /tmp/${BUNDLEFOLDER}/data/log
 
 echo "Starting controller..."
 /tmp/${BUNDLEFOLDER}/bin/start
index b8bbd135b298d3c27adebd89aecf95c0826bfeb7..b3da33674beb45cbc8bfa469e0394a2fc9162301 100644 (file)
@@ -4,13 +4,7 @@
 # script.
 # shellcheck source=${ROBOT_VENV}/bin/activate disable=SC1091
 source ${ROBOT_VENV}/bin/activate
-
-MAVENCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.url.mvn.cfg
-FEATURESCONF=/tmp/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg
-CUSTOMPROP=/tmp/${BUNDLEFOLDER}/etc/custom.properties
-LOGCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg
-MEMCONF=/tmp/${BUNDLEFOLDER}/bin/setenv
-CONTROLLERMEM="2048m"
+source /tmp/common-functions.sh ${BUNDLEFOLDER}
 
 if [ "${ENABLE_HAPROXY_FOR_NEUTRON}" == "yes" ]; then
     echo "Configure cluster"
@@ -21,7 +15,7 @@ fi
 
 if [ ${CONTROLLERSCOPE} == 'all' ]; then
     ACTUALFEATURES="odl-integration-compatible-with-all,${CONTROLLERFEATURES}"
-    CONTROLLERMEM="3072m"
+    export CONTROLLERMEM="3072m"
     COOLDOWN_PERIOD="180"
 else
     ACTUALFEATURES="odl-infrautils-ready,${CONTROLLERFEATURES}"
@@ -31,6 +25,12 @@ fi
 # Some versions of jenkins job builder result in feature list containing spaces
 # and ending in newline. Remove all that.
 ACTUALFEATURES=`echo "${ACTUALFEATURES}" | tr -d '\n \r'`
+echo "ACTUALFEATURES: ${ACTUALFEATURES}"
+
+# In the case that we want to install features via karaf shell, a space separated list of
+# ACTUALFEATURES IS NEEDED
+SPACE_SEPARATED_FEATURES=$(echo "${ACTUALFEATURES}" | tr ',' ' ')
+echo "SPACE_SEPARATED_FEATURES: ${SPACE_SEPARATED_FEATURES}"
 
 if [ -f "${WORKSPACE}/test/csit/scriptplans/${TESTPLAN}" ]; then
     echo "scriptplan exists!!!"
@@ -45,6 +45,8 @@ if [ -f "${WORKSPACE}/test/csit/scriptplans/${TESTPLAN}" ]; then
 fi
 
 cat > ${WORKSPACE}/configuration-script.sh <<EOF
+set -x
+source /tmp/common-functions.sh ${BUNDLEFOLDER}
 
 echo "Changing to /tmp"
 cd /tmp
@@ -59,17 +61,17 @@ echo "Adding external repositories..."
 sed -ie "s%org.ops4j.pax.url.mvn.repositories=%org.ops4j.pax.url.mvn.repositories=http://repo1.maven.org/maven2@id=central, http://repository.springsource.com/maven/bundles/release@id=spring.ebr.release, http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external, http://zodiac.springsource.com/maven/bundles/release@id=gemini, http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@noreleases, https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases%g" ${MAVENCONF}
 cat ${MAVENCONF}
 
-echo "Configuring the startup features..."
-sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" ${FEATURESCONF}
+if [[ "$USEFEATURESBOOT" == "True" ]]; then
+    echo "Configuring the startup features..."
+    sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" ${FEATURESCONF}
+fi
 
-FEATURE_INDEX_STRING="features-integration-index"
 FEATURE_TEST_STRING="features-integration-test"
 if [[ "$KARAF_VERSION" == "karaf4" ]]; then
-    FEATURE_INDEX_STRING="features-index"
     FEATURE_TEST_STRING="features-test"
 fi
 
-sed -ie "s%mvn:org.opendaylight.integration/\${FEATURE_INDEX_STRING}/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/\${FEATURE_INDEX_STRING}/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features%g" ${FEATURESCONF}
+sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features,%g" ${FEATURESCONF}
 cat ${FEATURESCONF}
 
 if [ "${ODL_ENABLE_L3_FWD}" == "yes" ]; then
@@ -78,46 +80,13 @@ if [ "${ODL_ENABLE_L3_FWD}" == "yes" ]; then
 fi
 cat ${CUSTOMPROP}
 
-echo "Configuring the log..."
-sed -ie 's/log4j.appender.out.maxBackupIndex=10/log4j.appender.out.maxBackupIndex=1/g' ${LOGCONF}
-# FIXME: Make log size limit configurable from build parameter.
-sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=30GB/g' ${LOGCONF}
-echo "log4j.logger.org.opendaylight.yangtools.yang.parser.repo.YangTextSchemaContextResolver = WARN" >> ${LOGCONF}
-# Add custom logging levels
-# CONTROLLERDEBUGMAP is expected to be a key:value map of space separated values like "module:level module2:level2"
-# where module is abbreviated and does not include org.opendaylight
-unset IFS
-if [ -n "${CONTROLLERDEBUGMAP}" ]; then
-    for kv in ${CONTROLLERDEBUGMAP}; do
-        module=\${kv%%:*}
-        level=\${kv#*:}
-        if [ -n \${module} ] && [ -n \${level} ]; then
-            echo "log4j.logger.org.opendaylight.\${module} = \${level}" >> ${LOGCONF}
-        fi
-    done
-fi
-cat ${LOGCONF}
+configure_karaf_log "${KARAF_VERSION}" "${CONTROLLERDEBUGMAP}"
 
-echo "Configure java home and max memory..."
-sed -ie 's%^# export JAVA_HOME%export JAVA_HOME="\${JAVA_HOME:-${JAVA_HOME}}"%g' ${MEMCONF}
-sed -ie 's/JAVA_MAX_MEM="2048m"/JAVA_MAX_MEM="${CONTROLLERMEM}"/g' ${MEMCONF}
-cat ${MEMCONF}
+set_java_vars "${JAVA_HOME}" "${CONTROLLERMEM}" "${MEMCONF}"
 
 echo "Listing all open ports on controller system..."
 netstat -pnatu
 
-echo "Set Java version"
-sudo /usr/sbin/alternatives --install /usr/bin/java java ${JAVA_HOME}/bin/java 1
-sudo /usr/sbin/alternatives --set java ${JAVA_HOME}/bin/java
-echo "JDK default version..."
-java -version
-
-echo "Set JAVA_HOME"
-export JAVA_HOME="${JAVA_HOME}"
-# Did you know that in HERE documents, single quote is an ordinary character, but backticks are still executing?
-JAVA_RESOLVED=\`readlink -e "\${JAVA_HOME}/bin/java"\`
-echo "Java binary pointed at by JAVA_HOME: \${JAVA_RESOLVED}"
-
 if [ "${ENABLE_HAPROXY_FOR_NEUTRON}" == "yes" ]; then
 
     # Copy shard file if exists
@@ -141,20 +110,50 @@ if [ "${ENABLE_HAPROXY_FOR_NEUTRON}" == "yes" ]; then
 fi
 
 EOF
+# cat > ${WORKSPACE}/configuration-script.sh <<EOF
 
 # Create the startup script to be run on controller.
 cat > ${WORKSPACE}/startup-script.sh <<EOF
 
 echo "Redirecting karaf console output to karaf_console.log"
 export KARAF_REDIRECT="/tmp/${BUNDLEFOLDER}/data/log/karaf_console.log"
+mkdir -p /tmp/${BUNDLEFOLDER}/data/log
 
 echo "Starting controller..."
 /tmp/${BUNDLEFOLDER}/bin/start
 
 EOF
+# cat > ${WORKSPACE}/startup-script.sh <<EOF
 
 cat > ${WORKSPACE}/post-startup-script.sh <<EOF
 
+if [[ "$USEFEATURESBOOT" != "True" ]]; then
+
+    # wait up to 60s for karaf port 8101 to be opened, polling every 5s
+    loop_count=0;
+    until [[ \$loop_count -ge 12 ]]; do
+        netstat -na | grep 8101 && break;
+        loop_count=\$[\$loop_count+1];
+        sleep 5;
+    done
+
+    echo "going to feature:install --no-auto-refresh ${SPACE_SEPARATED_FEATURES} one at a time"
+    for feature in ${SPACE_SEPARATED_FEATURES}; do
+        sshpass -p karaf ssh -o StrictHostKeyChecking=no \
+                             -o UserKnownHostsFile=/dev/null \
+                             -o LogLevel=error \
+                             -p 8101 karaf@localhost \
+                             feature:install --no-auto-refresh \$feature;
+    done
+
+    echo "ssh to karaf console to list -i installed features"
+    sshpass -p karaf ssh -o StrictHostKeyChecking=no \
+                         -o UserKnownHostsFile=/dev/null \
+                         -o LogLevel=error \
+                         -p 8101 karaf@localhost \
+                         feature:list -i
+fi
+
 echo "Waiting for controller to come up..."
 COUNT="0"
 while true; do
@@ -204,6 +203,7 @@ exit_on_log_file_message 'BindException: Address already in use'
 exit_on_log_file_message 'server is unhealthy'
 
 EOF
+# cat > ${WORKSPACE}/post-startup-script.sh <<EOF
 
 [ "$NUM_OPENSTACK_SITES" ] || NUM_OPENSTACK_SITES=1
 NUM_ODLS_PER_SITE=$((NUM_ODL_SYSTEM / NUM_OPENSTACK_SITES))
@@ -302,7 +302,23 @@ fi
 echo "Changing the testplan path..."
 cat "${testplan_filepath}" | sed "s:integration:${WORKSPACE}:" > testplan.txt
 cat testplan.txt
-SUITES=$( egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' ' )
+
+# Use the testplan if specific SUITES are not defined.
+if [ -z "${SUITES}" ]; then
+    SUITES=`egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' '`
+else
+    newsuites=""
+    workpath="${WORKSPACE}/test/csit/suites"
+    for suite in ${SUITES}; do
+        fullsuite="${workpath}/${suite}"
+        if [ -z "${newsuites}" ]; then
+            newsuites+=${fullsuite}
+        else
+            newsuites+=" "${fullsuite}
+        fi
+    done
+    SUITES=${newsuites}
+fi
 
 echo "Starting Robot test suites ${SUITES} ..."
 pybot -N ${TESTPLAN} --removekeywords wuks -c critical -e exclude -e skip_if_${DISTROSTREAM} -v BUNDLEFOLDER:${BUNDLEFOLDER} -v WORKSPACE:/tmp \
index 5ff94873c351cf2c0e203c33e84b3af9b386fdc8..7aa63018917e2ede0e569d702803de160015d894 100644 (file)
@@ -7,13 +7,20 @@ source ${ROBOT_VENV}/bin/activate
 PYTHON="${ROBOT_VENV}/bin/python"
 SSH="ssh -t -t"
 ADMIN_PASSWORD="admin"
+OPENSTACK_MASTER_CLIENTS_VERSION="queens"
 
 # TODO: remove this work to run changes.py if/when it's moved higher up to be visible at the Robot level
-echo "showing recent changes that made it in to the distribution used by this job"
+printf "\nshowing recent changes that made it into the distribution used by this job:\n"
 $PYTHON -m pip install --upgrade urllib3
 python ${WORKSPACE}/test/tools/distchanges/changes.py -d /tmp/distribution_folder \
                   -u ${ACTUAL_BUNDLE_URL} -b ${DISTROBRANCH} \
                   -r ssh://jenkins-${SILO}@git.opendaylight.org:29418 || true
+
+printf "\nshowing recent changes that made it into integration/test used by this job:\n"
+cd ${WORKSPACE}/test
+git --no-pager log --pretty=format:'%h %<(13)%ar%<(13)%cr %<(20,trunc)%an%d %s' -n10
+cd -
+
 cat << EOF
 #################################################
 ##         Deploy Openstack 3-node             ##
@@ -26,8 +33,8 @@ function trap_handler() {
     local prog="$0"
     local lastline="$1"
     local lasterr="$2"
-    echo "${prog}: line ${lastline}: exit status of last command: ${lasterr}"
-    echo "command: ${BASH_COMMAND}"
+    echo "trap_hanlder: ${prog}: line ${lastline}: exit status of last command: ${lasterr}"
+    echo "trap_handler: command: ${BASH_COMMAND}"
     collect_logs
     exit 1
 } # trap_handler()
@@ -61,6 +68,7 @@ PUBLIC_BRIDGE: ${PUBLIC_BRIDGE}
 ENABLE_HAPROXY_FOR_NEUTRON: ${ENABLE_HAPROXY_FOR_NEUTRON}
 ENABLE_OS_SERVICES: ${ENABLE_OS_SERVICES}
 ENABLE_OS_COMPUTE_SERVICES: ${ENABLE_OS_COMPUTE_SERVICES}
+ENABLE_OS_NETWORK_SERVICES: ${ENABLE_OS_NETWORK_SERVICES}
 ENABLE_OS_PLUGINS: ${ENABLE_OS_PLUGINS}
 DISABLE_OS_SERVICES: ${DISABLE_OS_SERVICES}
 TENANT_NETWORK_TYPE: ${TENANT_NETWORK_TYPE}
@@ -98,6 +106,36 @@ function create_etc_hosts() {
     cat ${WORKSPACE}/hosts_file
 } # create_etc_hosts()
 
+#function to install Openstack Clients for Testing
+#This will pull the latest versions compatiable with the
+# openstack release
+function install_openstack_clients_in_robot_vm() {
+    packages=("python-novaclient" "python-neutronclient" "python-openstackclient")
+    for plugin_name in ${ENABLE_OS_PLUGINS}; do
+        if [ "$plugin_name" == "networking-sfc" ]; then
+            packages+=("networking-sfc")
+        fi
+    done
+    openstack_version=$(echo ${OPENSTACK_BRANCH} | cut -d/ -f2)
+    #If the job tests "master", we will use the clients from previous released stable version to avoid failures
+    if [ "${openstack_version}" == "master" ]; then
+       openstack_version=${OPENSTACK_MASTER_CLIENTS_VERSION}
+    fi
+    for package in ${packages[*]}; do
+       echo "Get the current support version of the package ${package}"
+       wget https://raw.githubusercontent.com/openstack/requirements/stable/${openstack_version}/upper-constraints.txt -O /tmp/constraints.txt 2>/dev/null
+       echo "$PYTHON -m pip install --upgrade --no-deps ${package} --no-cache-dir -c /tmp/constraints.txt"
+       $PYTHON -m pip install --upgrade --no-deps ${package} --no-cache-dir -c /tmp/constraints.txt
+       echo "$PYTHON -m pip install ${package} --no-cache-dir -c /tmp/constraints.txt"
+       $PYTHON -m pip install ${package} --no-cache-dir -c /tmp/constraints.txt
+    done
+
+    if [ "${ENABLE_NETWORKING_L2GW}" == "yes" ]; then
+        #networking-l2gw is not officially available in any release yet. Gettting the latest stable version.
+        $PYTHON -m pip install networking-l2gw==11.0.0
+    fi
+}
+
 # convert commas in csv strings to spaces (ssv)
 function csv2ssv() {
     local csv=$1
@@ -108,12 +146,61 @@ function csv2ssv() {
     echo "${ssv}"
 } # csv2ssv
 
+function is_openstack_feature_enabled() {
+    local feature=$1
+    for enabled_feature in $(csv2ssv ${ENABLE_OS_SERVICES})
+    do
+        if [ "${enabled_feature}" == "${feature}" ]; then
+           echo 1
+           return
+        fi
+    done
+    echo 0
+}
+
+function fix_libvirt_version_n_cpu_ocata() {
+    local ip=$1
+    ${SSH} ${ip} "
+        cd /opt/stack;
+        git clone https://git.openstack.org/openstack/requirements;
+        cd requirements;
+        git checkout stable/ocata;
+        sed -i s/libvirt-python===2.5.0/libvirt-python===3.2.0/ upper-constraints.txt
+   "
+}
+
+#Function to install rdo release
+# This will help avoiding installing wrong version of packages which causes
+# functionality failures
+function install_rdo_release() {
+    local ip=$1
+    case ${OPENSTACK_BRANCH} in
+       *pike*)
+          ${SSH} ${ip} "sudo yum install -y https://repos.fedorapeople.org/repos/openstack/openstack-pike/rdo-release-pike-1.noarch.rpm"
+          ;;
+
+       *queens*)
+          ${SSH} ${ip} "sudo yum install -y https://repos.fedorapeople.org/repos/openstack/openstack-queens/rdo-release-queens-1.noarch.rpm"
+          ;;
+
+       *ocata*)
+          ${SSH} ${ip} "sudo yum install -y https://repos.fedorapeople.org/repos/openstack/openstack-ocata/rdo-release-ocata-3.noarch.rpm"
+          ;;
+
+       master)
+          ${SSH} ${ip} "sudo yum install -y https://repos.fedorapeople.org/repos/openstack/openstack-queens/rdo-release-queens-1.noarch.rpm"
+          ;;
+    esac
+}
+
+
 # Add enable_services and disable_services to the local.conf
 function add_os_services() {
     local core_services=$1
     local enable_services=$2
     local disable_services=$3
     local local_conf_file_name=$4
+    local enable_network_services=$5
 
     cat >> ${local_conf_file_name} << EOF
 enable_service $(csv2ssv "${core_services}")
@@ -126,6 +213,11 @@ EOF
     if [ -n "${disable_services}" ]; then
         cat >> ${local_conf_file_name} << EOF
 disable_service $(csv2ssv "${disable_services}")
+EOF
+    fi
+    if [ -n "${enable_network_services}" ]; then
+        cat >> ${local_conf_file_name} << EOF
+enable_service $(csv2ssv "${enable_network_services}")
 EOF
     fi
 }
@@ -147,7 +239,7 @@ RECLONE=${RECLONE}
 disable_all_services
 EOF
 
-    add_os_services "${CORE_OS_CONTROL_SERVICES}" "${ENABLE_OS_SERVICES}" "${DISABLE_OS_SERVICES}" "${local_conf_file_name}"
+    add_os_services "${CORE_OS_CONTROL_SERVICES}" "${ENABLE_OS_SERVICES}" "${DISABLE_OS_SERVICES}" "${local_conf_file_name}" "${ENABLE_OS_NETWORK_SERVICES}"
 
     cat >> ${local_conf_file_name} << EOF
 
@@ -158,7 +250,7 @@ NEUTRON_CREATE_INITIAL_NETWORKS=${CREATE_INITIAL_NETWORKS}
 
 ODL_MODE=manual
 ODL_MGR_IP=${MGRIP}
-ODL_PORT=8080
+ODL_PORT=${ODL_PORT}
 ODL_PORT_BINDING_CONTROLLER=${ODL_ML2_PORT_BINDING}
 ODL_OVS_MANAGERS=${ODL_OVS_MANAGERS}
 
@@ -179,6 +271,11 @@ NEUTRON_SFC_DRIVERS=${ODL_SFC_DRIVER} # Only relevant if networking-sfc plugin i
 NEUTRON_FLOWCLASSIFIER_DRIVERS=${ODL_SFC_DRIVER} # Only relevant if networking-sfc plugin is enabled
 ETCD_PORT=2379
 EOF
+    if [ "${TENANT_NETWORK_TYPE}" == "local" ]; then
+        cat >> ${local_conf_file_name} << EOF
+ENABLE_TENANT_TUNNELS=false
+EOF
+    fi
 
     if [ "${ODL_ML2_DRIVER_VERSION}" == "v2" ]; then
         echo "ODL_V2DRIVER=True" >> ${local_conf_file_name}
@@ -210,7 +307,7 @@ EOF
         cat >> ${local_conf_file_name} << EOF
 
 enable_plugin networking-l2gw ${NETWORKING_L2GW_DRIVER} ${ODL_ML2_BRANCH}
-NETWORKING_L2GW_SERVICE_DRIVER=L2GW:OpenDaylight:networking_odl.l2gateway.driver.OpenDaylightL2gwDriver:default
+NETWORKING_L2GW_SERVICE_DRIVER=L2GW:OpenDaylight:networking_odl.l2gateway.driver_v2.OpenDaylightL2gwDriver:default
 EOF
     fi
 
@@ -252,10 +349,6 @@ minimize_polling=True
 physical_network_mtus = ${PUBLIC_PHYSICAL_NETWORK}:1400
 path_mtu = 1458
 
-# workaround for port-status not working due to https://bugs.opendaylight.org/show_bug.cgi?id=9092
-[ml2_odl]
-odl_features=nothing
-
 [[post-config|/etc/neutron/dhcp_agent.ini]]
 [DEFAULT]
 force_metadata = True
@@ -264,6 +357,7 @@ enable_isolated_metadata = True
 [[post-config|/etc/nova/nova.conf]]
 [DEFAULT]
 force_config_drive = False
+force_raw_images = False
 
 [scheduler]
 discover_hosts_in_cells_interval = 30
@@ -294,14 +388,15 @@ EOF
     add_os_services "${CORE_OS_COMPUTE_SERVICES}" "${ENABLE_OS_COMPUTE_SERVICES}" "${DISABLE_OS_SERVICES}" "${local_conf_file_name}"
 
     cat >> ${local_conf_file_name} << EOF
-
+#Added to make Nova wait until nova in control node is ready.
+NOVA_READY_TIMEOUT=1800
 HOST_IP=${HOSTIP}
 SERVICE_HOST=${SERVICEHOST}
 Q_ML2_TENANT_NETWORK_TYPE=${TENANT_NETWORK_TYPE}
 
 ODL_MODE=manual
 ODL_MGR_IP=${MGRIP}
-ODL_PORT=8080
+ODL_PORT=${ODL_PORT}
 ODL_PORT_BINDING_CONTROLLER=${ODL_ML2_PORT_BINDING}
 ODL_OVS_MANAGERS=${ODL_OVS_MANAGERS}
 
@@ -344,6 +439,7 @@ EOF
 auth_strategy = keystone
 [DEFAULT]
 use_neutron = True
+force_raw_images = False
 EOF
 
     echo "Compute local.conf created:"
@@ -430,38 +526,113 @@ EOF
 } # configure_haproxy_for_neutron_requests()
 
 # Collect the list of files on the hosts
-function list_files () {
-    local ip=$1
-    local folder=$2
-    ${SSH} ${ip} "sudo find /etc > /tmp/find.etc.txt"
-    ${SSH} ${ip} "sudo find /opt/stack > /tmp/find.opt.stack.txt"
-    ${SSH} ${ip} "sudo find /var > /tmp/find2.txt"
-    ${SSH} ${ip} "sudo find /var > /tmp/find.var.txt"
-    rsync --rsync-path="sudo rsync" --list-only -arvhe ssh ${ip}:/etc/ > ${folder}/rsync.etc.txt
-    rsync --rsync-path="sudo rsync" --list-only -arvhe ssh ${ip}:/opt/stack/ > ${folder}/rsync.opt.stack.txt
-    rsync --rsync-path="sudo rsync" --list-only -arvhe ssh ${ip}:/var/ > ${folder}/rsync.var.txt
-    scp ${ip}:/tmp/find.etc.txt ${folder}
-    scp ${ip}:/tmp/find.opt.stack.txt ${folder}
-    scp ${ip}:/tmp/find2.txt ${folder}
-    scp ${ip}:/tmp/find.var.txt ${folder}
+function collect_files() {
+    local -r ip=$1
+    local -r folder=$2
+    finddir=/tmp/finder
+    ${SSH} ${ip} "mkdir -p ${finddir}"
+    ${SSH} ${ip} "sudo find /etc > ${finddir}/find.etc.txt"
+    ${SSH} ${ip} "sudo find /opt/stack > ${finddir}/find.opt.stack.txt"
+    ${SSH} ${ip} "sudo find /var > ${finddir}/find2.txt"
+    ${SSH} ${ip} "sudo find /var > ${finddir}/find.var.txt"
+    ${SSH} ${ip} "sudo tar -cf - -C /tmp finder | xz -T 0 > /tmp/find.tar.xz"
+    scp ${ip}:/tmp/find.tar.xz ${folder}
+    mkdir -p ${finddir}
+    rsync --rsync-path="sudo rsync" --list-only -arvhe ssh ${ip}:/etc/ > ${finddir}/rsync.etc.txt
+    rsync --rsync-path="sudo rsync" --list-only -arvhe ssh ${ip}:/opt/stack/ > ${finddir}/rsync.opt.stack.txt
+    rsync --rsync-path="sudo rsync" --list-only -arvhe ssh ${ip}:/var/ > ${finddir}/rsync.var.txt
+    tar -cf - -C /tmp finder | xz -T 0 > /tmp/rsync.tar.xz
+    cp /tmp/rsync.tar.xz ${folder}
+}
+
+# List of extra services to extract from journalctl
+# Add new services on a separate line, in alpha order, add \ at the end
+extra_services_cntl=" \
+    dnsmasq.service \
+    httpd.service \
+    libvirtd.service \
+    openvswitch.service \
+    ovs-vswitchd.service \
+    ovsdb-server.service \
+    rabbitmq-server.service \
+"
+
+extra_services_cmp=" \
+    libvirtd.service \
+    openvswitch.service \
+    ovs-vswitchd.service \
+    ovsdb-server.service \
+"
+
+# Collect the logs for the openstack services
+# First get all the services started by devstack which would have devstack@ as a prefix
+# Next get all the extra services
+function collect_openstack_logs() {
+    local -r ip=${1}
+    local -r folder=${2}
+    local -r node_type=${3}
+    local oslogs="${folder}/oslogs"
+
+    printf "collect_openstack_logs for ${node_type} node: ${ip} into ${oslogs}\n"
+    rm -rf ${oslogs}
+    mkdir -p ${oslogs}
+    # There are always some logs in /opt/stack/logs and this also covers the
+    # pre-queens branches which always use /opt/stack/logs
+    rsync -avhe ssh ${ip}:/opt/stack/logs/* ${oslogs} # rsync to prevent copying of symbolic links
+
+    # Starting with queens break out the logs from journalctl
+    if [ "${OPENSTACK_BRANCH}" = "stable/queens" ]; then
+        cat > ${WORKSPACE}/collect_openstack_logs.sh << EOF
+extra_services_cntl="${extra_services_cntl}"
+extra_services_cmp="${extra_services_cmp}"
+
+function extract_from_journal() {
+    local -r services=\${1}
+    local -r folder=\${2}
+    local -r node_type=\${3}
+    printf "extract_from_journal folder: \${folder}, services: \${services}\n"
+    for service in \${services}; do
+        # strip anything before @ and anything after .
+        # devstack@g-api.service will end as g-api
+        service_="\${service#*@}"
+        service_="\${service_%.*}"
+        sudo journalctl -u "\${service}" > "\${folder}/\${service_}.log"
+    done
 }
 
-function collect_logs () {
+rm -rf /tmp/oslogs
+mkdir -p /tmp/oslogs
+systemctl list-unit-files --all > /tmp/oslogs/systemctl.units.log 2>&1
+svcs=\$(grep devstack@ /tmp/oslogs/systemctl.units.log | awk '{print \$1}')
+extract_from_journal "\${svcs}" "/tmp/oslogs"
+if [ "\${node_type}" = "control" ]; then
+    extract_from_journal "\${extra_services_cntl}" "/tmp/oslogs"
+else
+    extract_from_journal "\${extra_services_cmp}" "/tmp/oslogs"
+fi
+ls -al /tmp/oslogs
+EOF
+        printf "collect_openstack_logs for ${node_type} node: ${ip} into ${oslogs}, executing script\n"
+        cat ${WORKSPACE}/collect_openstack_logs.sh
+        scp ${WORKSPACE}/collect_openstack_logs.sh ${ip}:/tmp
+        ${SSH} ${ip} "bash /tmp/collect_openstack_logs.sh > /tmp/collect_openstack_logs.log 2>&1"
+        rsync -avhe ssh ${ip}:/tmp/oslogs/* ${oslogs}
+        scp ${ip}:/tmp/collect_openstack_logs.log ${oslogs}
+    fi
+}
+
+function collect_logs() {
     set +e  # We do not want to create red dot just because something went wrong while fetching logs.
 
     cat > extra_debug.sh << EOF
 echo -e "/usr/sbin/lsmod | /usr/bin/grep openvswitch\n"
 /usr/sbin/lsmod | /usr/bin/grep openvswitch
-echo -e "\ngrep ct_ /var/log/openvswitch/ovs-vswitchd.log\n"
-grep ct_ /var/log/openvswitch/ovs-vswitchd.log
-echo -e "\novsdb-tool -mm show-log\n"
-ovsdb-tool -mm show-log
+echo -e "\nsudo grep ct_ /var/log/openvswitch/ovs-vswitchd.log\n"
+sudo grep "Datapath supports" /var/log/openvswitch/ovs-vswitchd.log
 echo -e "\nsudo netstat -punta\n"
 sudo netstat -punta
 echo -e "\nsudo getenforce\n"
 sudo getenforce
-echo -e "\njournalctl > /tmp/journalctl.log\n"
-sudo journalctl > /tmp/journalctl.log
 echo -e "\nsudo systemctl status httpd\n"
 sudo systemctl status httpd
 echo -e "\nenv\n"
@@ -469,10 +640,16 @@ env
 source /opt/stack/devstack/openrc admin admin
 echo -e "\nenv after openrc\n"
 env
-echo "\nsudo du -hs /opt/stack"
+echo -e "\nsudo du -hs /opt/stack"
 sudo du -hs /opt/stack
-echo "\nsudo mount"
+echo -e "\nsudo mount"
 sudo mount
+echo -e "\ndmesg -T > /tmp/dmesg.log"
+dmesg -T > /tmp/dmesg.log
+echo -e "\njournalctl > /tmp/journalctl.log\n"
+sudo journalctl > /tmp/journalctl.log
+echo -e "\novsdb-tool -mm show-log > /tmp/ovsdb-tool.log"
+ovsdb-tool -mm show-log > /tmp/ovsdb-tool.log
 EOF
 
     # Since this log collection work is happening before the archive build macro which also
@@ -480,6 +657,9 @@ EOF
     # archives build step will essentially be a noop.
     mkdir -p ${WORKSPACE}/archives
 
+    mv /tmp/changes.txt ${WORKSPACE}/archives
+    mv ${WORKSPACE}/rabbit.txt ${WORKSPACE}/archives
+
     sleep 5
     # FIXME: Do not create .tar and gzip before copying.
     for i in `seq 1 ${NUM_ODL_SYSTEM}`; do
@@ -498,6 +678,8 @@ EOF
         scp ${!CONTROLLERIP}:/tmp/journalctl.log ${NODE_FOLDER}
         ${SSH} ${!CONTROLLERIP} "dmesg -T > /tmp/dmesg.log"
         scp ${!CONTROLLERIP}:/tmp/dmesg.log ${NODE_FOLDER}
+        ${SSH} ${!CONTROLLERIP} "tar -cf - -C /tmp/${BUNDLEFOLDER} etc | xz -T 0 > /tmp/etc.tar.xz"
+        scp ${!CONTROLLERIP}:/tmp/etc.tar.xz ${NODE_FOLDER}
         ${SSH} ${!CONTROLLERIP} "cp -r /tmp/${BUNDLEFOLDER}/data/log /tmp/odl_log"
         ${SSH} ${!CONTROLLERIP} "tar -cf /tmp/odl${i}_karaf.log.tar /tmp/odl_log/*"
         scp ${!CONTROLLERIP}:/tmp/odl${i}_karaf.log.tar ${NODE_FOLDER}
@@ -523,6 +705,8 @@ EOF
         echo "collect_logs: for openstack control node ip: ${!OSIP}"
         NODE_FOLDER="control_${i}"
         mkdir -p ${NODE_FOLDER}
+        scp extra_debug.sh ${!OSIP}:/tmp
+        ${SSH} ${!OSIP} "bash /tmp/extra_debug.sh > /tmp/extra_debug.log 2>&1"
         scp ${!OSIP}:/etc/dnsmasq.conf ${NODE_FOLDER}
         scp ${!OSIP}:/etc/keystone/keystone.conf ${NODE_FOLDER}
         scp ${!OSIP}:/etc/keystone/keystone-uwsgi-admin.ini ${NODE_FOLDER}
@@ -545,27 +729,28 @@ EOF
         scp ${!OSIP}:/opt/stack/devstack/openrc ${NODE_FOLDER}
         scp ${!OSIP}:/opt/stack/requirements/upper-constraints.txt ${NODE_FOLDER}
         scp ${!OSIP}:/opt/stack/tempest/etc/tempest.conf ${NODE_FOLDER}
+        scp ${!OSIP}:/tmp/*.xz ${NODE_FOLDER}
+        scp ${!OSIP}:/tmp/dmesg.log ${NODE_FOLDER}
+        scp ${!OSIP}:/tmp/extra_debug.log ${NODE_FOLDER}
         scp ${!OSIP}:/tmp/get_devstack.sh.txt ${NODE_FOLDER}
-        scp ${!OSIP}:/var/log/openvswitch/ovs-vswitchd.log ${NODE_FOLDER}
-        scp ${!OSIP}:/var/log/openvswitch/ovsdb-server.log ${NODE_FOLDER}
-        list_files "${!OSIP}" "${NODE_FOLDER}"
+        scp ${!OSIP}:/tmp/journalctl.log ${NODE_FOLDER}
+        scp ${!OSIP}:/tmp/ovsdb-tool.log ${NODE_FOLDER}
+        collect_files "${!OSIP}" "${NODE_FOLDER}"
+        ${SSH} ${!OSIP} "sudo tar -cf - -C /var/log rabbitmq | xz -T 0 > /tmp/rabbitmq.tar.xz "
+        scp ${!OSIP}:/tmp/rabbitmq.tar.xz ${NODE_FOLDER}
         rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/etc/hosts ${NODE_FOLDER}
         rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/usr/lib/systemd/system/haproxy.service ${NODE_FOLDER}
         rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/audit/audit.log ${NODE_FOLDER}
         rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/httpd/keystone_access.log ${NODE_FOLDER}
         rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/httpd/keystone.log ${NODE_FOLDER}
-        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/messages ${NODE_FOLDER}
-        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/rabbitmq ${NODE_FOLDER}
-        rsync -avhe ssh ${!OSIP}:/opt/stack/logs/* ${NODE_FOLDER} # rsync to prevent copying of symbolic links
-        scp extra_debug.sh ${!OSIP}:/tmp
-        ${SSH} ${!OSIP} "bash /tmp/extra_debug.sh > /tmp/extra_debug.log"
-        scp ${!OSIP}:/tmp/extra_debug.log ${NODE_FOLDER}
-        scp ${!OSIP}:/tmp/journalctl.log ${NODE_FOLDER}
-        scp ${!OSIP}:/tmp/*.xz ${NODE_FOLDER}
-        ${SSH} ${!CONTROLLERIP} "dmesg -T > /tmp/dmesg.log"
-        scp ${!CONTROLLERIP}:/tmp/dmesg.log ${NODE_FOLDER}
+        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/messages* ${NODE_FOLDER}
+        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/openvswitch/ovs-vswitchd.log ${NODE_FOLDER}
+        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/openvswitch/ovsdb-server.log ${NODE_FOLDER}
+        collect_openstack_logs "${!OSIP}" "${NODE_FOLDER}" "control"
         mv local.conf_control_${!OSIP} ${NODE_FOLDER}/local.conf
-        mv /tmp/qdhcp ${NODE_FOLDER}
+        # qdhcp files are created by robot tests and copied into /tmp/qdhcp during the test
+        tar -cf - -C /tmp qdhcp | xz -T 0 > /tmp/qdhcp.tar.xz
+        mv /tmp/qdhcp.tar.xz ${NODE_FOLDER}
         mv ${NODE_FOLDER} ${WORKSPACE}/archives/
     done
 
@@ -575,6 +760,8 @@ EOF
         echo "collect_logs: for openstack compute node ip: ${!OSIP}"
         NODE_FOLDER="compute_${i}"
         mkdir -p ${NODE_FOLDER}
+        scp extra_debug.sh ${!OSIP}:/tmp
+        ${SSH} ${!OSIP} "bash /tmp/extra_debug.sh > /tmp/extra_debug.log 2>&1"
         scp ${!OSIP}:/etc/nova/nova.conf ${NODE_FOLDER}
         scp ${!OSIP}:/etc/nova/nova-cpu.conf ${NODE_FOLDER}
         scp ${!OSIP}:/etc/openstack/clouds.yaml ${NODE_FOLDER}
@@ -582,23 +769,22 @@ EOF
         scp ${!OSIP}:/opt/stack/devstack/nohup.out ${NODE_FOLDER}/stack.log
         scp ${!OSIP}:/opt/stack/devstack/openrc ${NODE_FOLDER}
         scp ${!OSIP}:/opt/stack/requirements/upper-constraints.txt ${NODE_FOLDER}
+        scp ${!OSIP}:/tmp/*.xz ${NODE_FOLDER}/
+        scp ${!OSIP}:/tmp/dmesg.log ${NODE_FOLDER}
+        scp ${!OSIP}:/tmp/extra_debug.log ${NODE_FOLDER}
         scp ${!OSIP}:/tmp/get_devstack.sh.txt ${NODE_FOLDER}
-        scp ${!OSIP}:/var/log/openvswitch/ovs-vswitchd.log ${NODE_FOLDER}
-        scp ${!OSIP}:/var/log/openvswitch/ovsdb-server.log ${NODE_FOLDER}
-        list_files "${!OSIP}" "${NODE_FOLDER}"
+        scp ${!OSIP}:/tmp/journalctl.log ${NODE_FOLDER}
+        scp ${!OSIP}:/tmp/ovsdb-tool.log ${NODE_FOLDER}
+        collect_files "${!OSIP}" "${NODE_FOLDER}"
+        ${SSH} ${!OSIP} "sudo tar -cf - -C /var/log libvirt | xz -T 0 > /tmp/libvirt.tar.xz "
+        scp ${!OSIP}:/tmp/libvirt.tar.xz ${NODE_FOLDER}
         rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/etc/hosts ${NODE_FOLDER}
         rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/audit/audit.log ${NODE_FOLDER}
-        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/libvirt ${NODE_FOLDER}
-        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/messages ${NODE_FOLDER}
+        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/messages* ${NODE_FOLDER}
         rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/nova-agent.log ${NODE_FOLDER}
-        rsync -avhe ssh ${!OSIP}:/opt/stack/logs/* ${NODE_FOLDER} # rsync to prevent copying of symbolic links
-        scp extra_debug.sh ${!OSIP}:/tmp
-        ${SSH} ${!OSIP} "bash /tmp/extra_debug.sh > /tmp/extra_debug.log"
-        scp ${!OSIP}:/tmp/extra_debug.log ${NODE_FOLDER}
-        scp ${!OSIP}:/tmp/journalctl.log ${NODE_FOLDER}
-        scp ${!OSIP}:/tmp/*.xz ${NODE_FOLDER}/
-        ${SSH} ${!OSIP} "dmesg -T > /tmp/dmesg.log"
-        scp ${!OSIP}:/tmp/dmesg.log ${NODE_FOLDER}
+        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/openvswitch/ovs-vswitchd.log ${NODE_FOLDER}
+        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/openvswitch/ovsdb-server.log ${NODE_FOLDER}
+        collect_openstack_logs "${!OSIP}" "${NODE_FOLDER}" "compute"
         mv local.conf_compute_${!OSIP} ${NODE_FOLDER}/local.conf
         mv ${NODE_FOLDER} ${WORKSPACE}/archives/
     done
@@ -614,7 +800,9 @@ EOF
         mkdir -p ${TEMPEST_LOGS_DIR}
         scp ${OPENSTACK_CONTROL_NODE_1_IP}:${DEVSTACK_TEMPEST_DIR}/tempest_results.html ${TEMPEST_LOGS_DIR}
         scp ${OPENSTACK_CONTROL_NODE_1_IP}:${DEVSTACK_TEMPEST_DIR}/tempest.log ${TEMPEST_LOGS_DIR}
-        mv ${WORKSPACE}/tempest_output* ${TEMPEST_LOGS_DIR}
+        if [ "$(echo ${OPENSTACK_BRANCH} | cut -d/ -f2)" != "queens" ]; then
+           mv ${WORKSPACE}/tempest_output* ${TEMPEST_LOGS_DIR}
+        fi
     else
         echo "tempest results not found in ${DEVSTACK_TEMPEST_DIR}/${TESTREPO}/0"
     fi
@@ -693,16 +881,21 @@ function get_service () {
 # Check if rabbitmq is ready by looking for a pid in it's status.
 # The function returns the status of the grep command which callers can check.
 function is_rabbitmq_ready() {
-    local -r ip=$1
+    local -r ip=${1}
+    local grepfor="nova_cell1"
     rm -f rabbit.txt
-    ${SSH} ${ip} "sudo rabbitmqctl status" > rabbit.txt
-    grep pid rabbit.txt
+    if [ "${OPENSTACK_BRANCH}" == "stable/ocata" ]; then
+        ${SSH} ${ip} "sudo rabbitmqctl status" > rabbit.txt
+        grepfor="pid"
+    else
+        ${SSH} ${ip} "sudo rabbitmqctl list_vhosts" > rabbit.txt
+    fi
+    grep ${grepfor} rabbit.txt
 }
 
 # retry the given command ($3) until success for a number of iterations ($1)
 # sleeping ($2) between tries.
 function retry() {
-    set +e
     local -r -i max_tries=${1}
     local -r -i sleep_time=${2}
     local -r cmd=${3}
@@ -723,7 +916,6 @@ function retry() {
             fi
         fi
     done
-    set -e
     return ${rc}
 }
 
@@ -747,6 +939,7 @@ else
 fi
 
 RECLONE=False
+ODL_PORT=8181
 
 # Always compare the lists below against the devstack upstream ENABLED_SERVICES in
 # https://github.com/openstack-dev/devstack/blob/master/stackrc#L52
@@ -761,13 +954,13 @@ CORE_OS_CONTROL_SERVICES+=",key"
 CORE_OS_CONTROL_SERVICES+=",n-api,n-api-meta,n-cauth,n-cond,n-crt,n-obj,n-sch"
 # ODL - services to connect to ODL
 CORE_OS_CONTROL_SERVICES+=",odl-compute,odl-neutron"
-# Neutron
-CORE_OS_CONTROL_SERVICES+=",q-dhcp,q-meta,q-svc"
 # Additional services
 CORE_OS_CONTROL_SERVICES+=",mysql,rabbit"
 
+# collect performance stats
+CORE_OS_COMPUTE_SERVICES="dstat"
 # computes only need nova and odl
-CORE_OS_COMPUTE_SERVICES="n-cpu,odl-compute"
+CORE_OS_COMPUTE_SERVICES+=",n-cpu,odl-compute"
 
 cat > ${WORKSPACE}/disable_firewall.sh << EOF
 sudo systemctl stop firewalld
@@ -809,11 +1002,22 @@ if [ -n "${DEVSTACK_HASH}" ]; then
     echo "git checkout ${DEVSTACK_HASH}"
     git checkout ${DEVSTACK_HASH}
 fi
-git --no-pager log --pretty=format:'%h %<(13)%ar%<(13)%cr %<(20,trunc)%an%d %s\n%b' -n20
+echo "workaround: Restore NEUTRON_CREATE_INITIAL_NETWORKS flag"
+if [ "${OPENSTACK_BRANCH}" == "stable/queens" ]; then
+    git config --local user.email jenkins@opendaylight.org
+    git config --local user.name jenkins
+    git fetch https://git.openstack.org/openstack-dev/devstack refs/changes/99/550499/1 && git cherry-pick FETCH_HEAD
+fi
+git --no-pager log --pretty=format:'%h %<(13)%ar%<(13)%cr %<(20,trunc)%an%d %s%b' -n20
+echo
 echo "workaround: adjust wait from 60s to 1800s (30m)"
 sed -i 's/wait_for_compute 60/wait_for_compute 1800/g' /opt/stack/devstack/lib/nova
 # TODO: modify sleep 1 to sleep 60, search wait_for_compute, then first sleep 1
 # that would just reduce the number of logs in the compute stack.log
+
+#Install qemu-img command in Control Node for Pike
+echo "Install qemu-img application"
+sudo yum install -y qemu-img
 EOF
 
 cat > "${WORKSPACE}/setup_host_cell_mapping.sh" << EOF
@@ -853,25 +1057,36 @@ done
 
 for i in `seq 1 ${NUM_OPENSTACK_CONTROL_NODES}`; do
     CONTROLIP=OPENSTACK_CONTROL_NODE_${i}_IP
-    echo "Configure the stack of the control node ${i} of ${NUM_OPENSTACK_CONTROL_NODES}: ${CONTROLIP}"
+    echo "Configure the stack of the control node ${i} of ${NUM_OPENSTACK_CONTROL_NODES}: ${!CONTROLIP}"
     scp ${WORKSPACE}/disable_firewall.sh ${!CONTROLIP}:/tmp
     ${SSH} ${!CONTROLIP} "sudo bash /tmp/disable_firewall.sh"
     create_etc_hosts ${!CONTROLIP}
     scp ${WORKSPACE}/hosts_file ${!CONTROLIP}:/tmp/hosts
     scp ${WORKSPACE}/get_devstack.sh ${!CONTROLIP}:/tmp
+    # devstack Master is yet to migrate fully to lib/neutron, there are some ugly hacks that is
+    # affecting the stacking.
+    #Workaround For Queens, Make the physical Network as physnet1 in lib/neutron
+    #Workaround Comment out creating initial Networks in lib/neutron
     ${SSH} ${!CONTROLIP} "bash /tmp/get_devstack.sh > /tmp/get_devstack.sh.txt 2>&1"
+    if [ "${ODL_ML2_BRANCH}" == "stable/queens" ]; then
+       ssh ${!CONTROLIP} "sed -i 's/flat_networks public/flat_networks public,physnet1/' /opt/stack/devstack/lib/neutron"
+       ssh ${!CONTROLIP} "sed -i '186i iniset \$NEUTRON_CORE_PLUGIN_CONF ml2_type_vlan network_vlan_ranges public:1:4094,physnet1:1:4094' /opt/stack/devstack/lib/neutron"
+    fi
+    if [[ "${ODL_ML2_BRANCH}" == "stable/ocata" && "$(is_openstack_feature_enabled n-cpu)" == "1" ]]; then
+        echo "Updating requirements for ${ODL_ML2_BRANCH}"
+        echo "Workaround for https://review.openstack.org/#/c/491032/"
+        echo "Modify upper-constraints to use libvirt-python 3.2.0"
+        fix_libvirt_version_n_cpu_ocata ${!CONTROLIP}
+    fi
     create_control_node_local_conf ${!CONTROLIP} ${ODLMGRIP[$i]} "${ODL_OVS_MGRS[$i]}"
     scp ${WORKSPACE}/local.conf_control_${!CONTROLIP} ${!CONTROLIP}:/opt/stack/devstack/local.conf
+    echo "Install rdo release to avoid incompatible Package versions"
+    install_rdo_release ${!CONTROLIP}
     echo "Stack the control node ${i} of ${NUM_OPENSTACK_CONTROL_NODES}: ${CONTROLIP}"
     ssh ${!CONTROLIP} "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &"
     ssh ${!CONTROLIP} "ps -ef | grep stack.sh"
     ssh ${!CONTROLIP} "ls -lrt /opt/stack/devstack/nohup.out"
     os_node_list+=("${!CONTROLIP}")
-    # Workaround for stable/newton jobs
-    # TODO: can this be removed now?
-    if [ "${ODL_ML2_BRANCH}" == "stable/newton" ]; then
-        ssh ${!CONTROLIP} "cd /opt/stack; git clone https://git.openstack.org/openstack/requirements; cd requirements; git checkout stable/newton; sed -i /appdirs/d upper-constraints.txt"
-    fi
 done
 
 # This is a backup to the CELLSV2_SETUP=singleconductor workaround. Keeping it here as an easy lookup
@@ -886,16 +1101,20 @@ done
 # AccessRefused: (0, 0): (403) ACCESS_REFUSED - Login was refused using authentication mechanism AMQPLAIN. For details see the broker logfile.
 # Compare that timestamp to this log in the control stack.log: sudo rabbitmqctl set_permissions -p nova_cell1 stackrabbit
 # If the n-cpu.log is earlier than the control stack.log timestamp then the failure condition is likely hit.
-WAIT_FOR_RABBITMQ_MINUTES=60
-echo "Wait a maximum of ${WAIT_FOR_RABBITMQ_MINUTES}m until rabbitmq is ready to allow the controller to create nova_cell1 before the computes need it"
-retry ${WAIT_FOR_RABBITMQ_MINUTES} 60 "is_rabbitmq_ready ${OPENSTACK_CONTROL_NODE_1_IP}"
-rc=$?
-if ((${rc} == 0)); then
-    echo "rabbitmq is ready, starting ${NUM_OPENSTACK_COMPUTE_NODES} compute(s)"
-else
-    echo "rabbitmq was not ready in ${WAIT_FOR_RABBITMQ_MINUTES}m"
-    collect_logs
-    exit 1
+if [ ${NUM_OPENSTACK_COMPUTE_NODES} -gt 0 ]; then
+    WAIT_FOR_RABBITMQ_MINUTES=60
+    echo "Wait a maximum of ${WAIT_FOR_RABBITMQ_MINUTES}m until rabbitmq is ready and nova_cell1 created to allow the controller to create nova_cell1 before the computes need it"
+    set +e
+    retry ${WAIT_FOR_RABBITMQ_MINUTES} 60 "is_rabbitmq_ready ${OPENSTACK_CONTROL_NODE_1_IP}"
+    rc=$?
+    set -e
+    if ((${rc} == 0)); then
+      echo "rabbitmq is ready, starting ${NUM_OPENSTACK_COMPUTE_NODES} compute(s)"
+    else
+      echo "rabbitmq was not ready in ${WAIT_FOR_RABBITMQ_MINUTES}m"
+      collect_logs
+      exit 1
+    fi
 fi
 
 for i in `seq 1 ${NUM_OPENSTACK_COMPUTE_NODES}`; do
@@ -903,7 +1122,7 @@ for i in `seq 1 ${NUM_OPENSTACK_COMPUTE_NODES}`; do
     SITE_INDEX=$((((i - 1) / NUM_COMPUTES_PER_SITE) + 1)) # We need the site index to infer the control node IP for this compute
     COMPUTEIP=OPENSTACK_COMPUTE_NODE_${i}_IP
     CONTROLIP=OPENSTACK_CONTROL_NODE_${SITE_INDEX}_IP
-    echo "Configure the stack of the compute node ${i} of ${NUM_OPENSTACK_COMPUTE_NODES}: ${COMPUTEIP}"
+    echo "Configure the stack of the compute node ${i} of ${NUM_OPENSTACK_COMPUTE_NODES}: ${!COMPUTEIP}"
     scp ${WORKSPACE}/disable_firewall.sh "${!COMPUTEIP}:/tmp"
     ${SSH} "${!COMPUTEIP}" "sudo bash /tmp/disable_firewall.sh"
     create_etc_hosts ${!COMPUTEIP} ${!CONTROLIP}
@@ -914,16 +1133,12 @@ for i in `seq 1 ${NUM_OPENSTACK_COMPUTE_NODES}`; do
         echo "Updating requirements for ${ODL_ML2_BRANCH}"
         echo "Workaround for https://review.openstack.org/#/c/491032/"
         echo "Modify upper-constraints to use libvirt-python 3.2.0"
-        ${SSH} ${!COMPUTEIP} "
-            cd /opt/stack;
-            git clone https://git.openstack.org/openstack/requirements;
-            cd requirements;
-            git checkout stable/ocata;
-            sed -i s/libvirt-python===2.5.0/libvirt-python===3.2.0/ upper-constraints.txt
-        "
+        fix_libvirt_version_n_cpu_ocata ${!COMPUTEIP}
     fi
     create_compute_node_local_conf ${!COMPUTEIP} ${!CONTROLIP} ${ODLMGRIP[$SITE_INDEX]} "${ODL_OVS_MGRS[$SITE_INDEX]}"
     scp ${WORKSPACE}/local.conf_compute_${!COMPUTEIP} ${!COMPUTEIP}:/opt/stack/devstack/local.conf
+    echo "Install rdo release to avoid incompatible Package versions"
+    install_rdo_release ${!COMPUTEIP}
     echo "Stack the compute node ${i} of ${NUM_OPENSTACK_COMPUTE_NODES}: ${COMPUTEIP}"
     ssh ${!COMPUTEIP} "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &"
     ssh ${!COMPUTEIP} "ps -ef | grep stack.sh"
@@ -1099,10 +1314,6 @@ for i in `seq 1 ${NUM_OPENSTACK_SITES}`; do
         sudo ip netns exec pnf_ns ifconfig pnf_veth1 up ${EXTNET_PNF_IP}/24;
         sudo ovs-vsctl add-port ${PUBLIC_BRIDGE} pnf_veth0;
     "
-    # Control Node - set VXLAN TEP IP for Genius Auto TZ
-    ${SSH} ${!CONTROLIP} "
-        sudo ovs-vsctl set O . external_ids:tep-ip=${!CONTROLIP};
-    "
 
     # Control Node - external net internet address simulation
     ${SSH} ${!CONTROLIP} "
@@ -1123,10 +1334,6 @@ for i in `seq 1 ${NUM_OPENSTACK_SITES}`; do
         ${SSH} $compute_ip "
             sudo ovs-vsctl add-port $PUBLIC_BRIDGE $CONTROLPORT -- set interface $CONTROLPORT type=vxlan options:local_ip=$compute_ip options:remote_ip=${!CONTROLIP} options:dst_port=9876 options:key=flow
         "
-         #Compute Node - set VXLAN TEP IP for Genius Auto TZ
-        ${SSH} $compute_ip "
-            sudo ovs-vsctl set O . external_ids:tep-ip=${compute_ip};
-        "
     done
 done
 
@@ -1172,6 +1379,9 @@ else
     SUITES=${newsuites}
 fi
 
+#install all client versions required for this job testing
+install_openstack_clients_in_robot_vm
+
 # TODO: run openrc on control node and then scrape the vars from it
 # Environment Variables Needed to execute Openstack Client for NetVirt Jobs
 cat > /tmp/os_netvirt_client_rc << EOF
@@ -1189,21 +1399,37 @@ EOF
 
 source /tmp/os_netvirt_client_rc
 
+echo "Get all versions before executing pybot"
+echo "openstack --version"
+which openstack
+openstack --version
+echo "nova --version"
+which nova
+nova --version
+echo "neutron --version"
+which neutron
+neutron --version
+
 echo "Starting Robot test suites ${SUITES} ..."
 # please add pybot -v arguments on a single line and alphabetized
 suite_num=0
 for suite in ${SUITES}; do
-    # prepend a incrmental counter to the suite name so that the full robot log combining all the suites as is done
-    # in the rebot step below will list all the suites in chronological order as rebot seems to alphabatize them
+    # prepend an incremental counter to the suite name so that the full robot log combining all the suites as is done
+    # in the rebot step below will list all the suites in chronological order as rebot seems to alphabetize them
     let "suite_num = suite_num + 1"
     suite_index="$(printf %02d ${suite_num})"
     suite_name="$(basename ${suite} | cut -d. -f1)"
     log_name="${suite_index}_${suite_name}"
-    pybot -N ${log_name} --removekeywords wuks -c critical -e exclude -e skip_if_${DISTROSTREAM} \
+    pybot -N ${log_name} \
+    -c critical -e exclude -e skip_if_${DISTROSTREAM} \
     --log log_${log_name}.html --report None --output output_${log_name}.xml \
+    --removekeywords wuks \
+    --removekeywords name:SetupUtils.Setup_Utils_For_Setup_And_Teardown \
+    --removekeywords name:SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing \
+    --removekeywords name:OpenStackOperations.Add_OVS_Logging_On_All_OpenStack_Nodes \
     -v BUNDLEFOLDER:${BUNDLEFOLDER} \
     -v BUNDLE_URL:${ACTUAL_BUNDLE_URL} \
-    -v CONTROLLERFEATURES:${CONTROLLERFEATURES} \
+    -v CONTROLLERFEATURES:"${CONTROLLERFEATURES}" \
     -v CONTROLLER_USER:${USER} \
     -v DEVSTACK_DEPLOY_PATH:/opt/stack/devstack \
     -v HA_PROXY_IP:${HA_PROXY_IP} \
@@ -1217,6 +1443,7 @@ for suite in ${SUITES}; do
     -v NUM_OS_SYSTEM:${NUM_OPENSTACK_SYSTEM} \
     -v NUM_TOOLS_SYSTEM:${NUM_TOOLS_SYSTEM} \
     -v ODL_SNAT_MODE:${ODL_SNAT_MODE} \
+    -v ODL_ENABLE_L3_FWD:${ODL_ENABLE_L3_FWD} \
     -v ODL_STREAM:${DISTROSTREAM} \
     -v ODL_SYSTEM_IP:${ODL_SYSTEM_IP} \
     -v ODL_SYSTEM_1_IP:${ODL_SYSTEM_1_IP} \
index 8f01f54dbd9467a8bdf307f9d698c0a329926e44..816dcf80a72515593df804d1510abcee0bdac5a8 100644 (file)
@@ -12,9 +12,7 @@ OPENSTACK_CONTROLLERS=()
 OPENSTACK_VENV="/tmp/v/openstack"
 # shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
 source $OPENSTACK_VENV/bin/activate
-# shellcheck disable=SC2207
-ADDR=($(openstack stack show -f json -c outputs "$STACK_NAME" | \
-       jq -r '.outputs[] | select(.output_key | match("^vm_[0-9]+_ips$")) | .output_value | .[]'))
+mapfile -t ADDR <<< "$(openstack stack show -f json -c outputs "$STACK_NAME" | jq -r '.outputs[] | select(.output_key | match("^vm_[0-9]+_ips$")) | .output_value | .[]')"
 
 # The next two blocks of code will parse the list of vm IP's hostnames to determine which type of node
 # the vm is: odl, devstack controller or compute, ha_proxy or tools. For the odl node's the hsotname will contain
@@ -103,6 +101,15 @@ done
 # The rest of the openstack nodes until NUM_OPENSTACK_SYSTEM are computes
 NUM_OPENSTACK_COMPUTE_NODES=$(( NUM_OPENSTACK_SYSTEM - NUM_OPENSTACK_CONTROL_NODES ))
 echo "NUM_OPENSTACK_COMPUTE_NODES=${NUM_OPENSTACK_COMPUTE_NODES}" >> slave_addresses.txt
+
+# Order the computes in the list so that the devstack-0 is index 1 and devstack-1 is index 2. Currently they are
+# backwards because of the controller swap earlier.
+if [ ${NUM_OPENSTACK_COMPUTE_NODES} -ge 2 ]; then
+    tmp_addr=${OPENSTACK_SYSTEM[1]}
+    OPENSTACK_SYSTEM[1]=${OPENSTACK_SYSTEM[2]}
+    OPENSTACK_SYSTEM[2]=${tmp_addr}
+fi
+
 for i in $(seq 0 $((NUM_OPENSTACK_COMPUTE_NODES - 1)))
 do
     echo "OPENSTACK_COMPUTE_NODE_$((i+1))_IP=${OPENSTACK_SYSTEM[$((openstack_index++))]}" >> slave_addresses.txt
index bee0b3638b9444462bf4941701afed3db2a9a699..48d5f84f317847e950771dd7de1e9838ad75cf24 100644 (file)
@@ -55,15 +55,6 @@ pip install --upgrade jmespath
 # Module for backup-restore support library
 pip install --upgrade jsonpatch
 
-# Module OpenstackClient is needed for Netvirt CSIT jobs
-# Module networking-l2gw is required for using l2gw commands with neutron client
-# Module python-neutronclient is needed for certain tests run with Openstack Newton
-#  that does not work with Openstack Client
-pip install python-openstackclient==3.11.0
-pip install networking-l2gw==11.0.0
-pip install python-neutronclient==6.1.0
-pip install networking-sfc
-
 # Print installed versions.
 pip install --upgrade pipdeptree
 pipdeptree
index 7fa75f3c2237bc3ea33786be0c4d7db235754c1b..77e92a4cc80c0ef8cbe8faaa50ff8b5a74cc3117 100644 (file)
     builders:
       - shell: !include-raw: integration-rebase-gerrit-patch.sh
 
+# Macro: integration-install-common-functions
+# Operation: Copy the common-functions.sh script to csit nodes
+# Used by: {project}-csit-* job templates
+- builder:
+    name: integration-install-common-functions
+    builders:
+      - shell: !include-raw:
+          - copy-common-functions.sh
+          - common-functions.sh
+
 - builder:
     name: integration-deploy-openstack-run-test
     builders:
-      - shell: !include-raw: integration-deploy-openstack-run-test.sh
+      - shell: !include-raw:
+          - integration-deploy-openstack-run-test.sh
 
 - builder:
     name: integration-compare-distributions
                 mkdir -p ./archives
                 curl --output robot-plugin.zip "$BUILD_URL/robot/report/*zip*/robot-plugin.zip"
                 unzip -d ./archives robot-plugin.zip
-                mv *log* *.log *.log.gz *.csv *.png ./archives || true  # Don't fail if file missing
+                mv *.log *.log.gz *.csv *.png ./archives || true  # Don't fail if file missing
                 # TODO: Can the following line ever fail?
                 find . -type f -name *.hprof -print0 | tar -cvf - --null -T - | xz -9 > ./archives/hprof.tar.xz
                 # TODO: Tweak the compression level if better ratio (or speed) is needed.
index 9b756e14aa1a8da43119f703dda21595fac61cfe..4ce0682170e8090514dd09e8a31506b231b22180 100644 (file)
@@ -112,7 +112,22 @@ echo "Changing the testplan path..."
 cat "${testplan_filepath}" | sed "s:integration:${WORKSPACE}:" > testplan.txt
 cat testplan.txt
 
-SUITES=`egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' '`
+# Use the testplan if specific SUITES are not defined.
+if [ -z "${SUITES}" ]; then
+    SUITES=`egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' '`
+else
+    newsuites=""
+    workpath="${WORKSPACE}/test/csit/suites"
+    for suite in ${SUITES}; do
+        fullsuite="${workpath}/${suite}"
+        if [ -z "${newsuites}" ]; then
+            newsuites+=${fullsuite}
+        else
+            newsuites+=" "${fullsuite}
+        fi
+    done
+    SUITES=${newsuites}
+fi
 
 echo "Starting Robot test suites ${SUITES} ..."
 pybot -N ${TESTPLAN} --removekeywords wuks -c critical -e exclude -e skip_if_${DISTROSTREAM} -v BUNDLEFOLDER:${BUNDLEFOLDER} \
index 851648d12ac951da4ada9e430b52d499dc75421a..bac9e13d229c5471cff74a1a0976c5725fa44393 100644 (file)
@@ -32,7 +32,8 @@
 # New templates
 
 - job-template:
-    name: '{project}-csit-verify-1node-{functionality}'
+    name: '{prefix}{project}-csit-verify-1node-{functionality}'
+    id: inttest-csit-verify-1node
     disabled: false
 
     project-type: freestyle
       - inject:
           properties-file: 'slave_addresses.txt'
       - integration-detect-variables
+      - integration-install-common-functions
       - integration-deploy-controller-run-test
       - integration-cleanup-tmp
 
       - lf-infra-publish
 
 - job-template:
-    name: '{project}-csit-1node-{functionality}-{install}-{stream}'
+    name: '{prefix}{project}-csit-1node-{functionality}-{install}-{stream}'
+    id: inttest-csit-1node
     # Keep synchronized with *-csit4-*-carbon please.
     disabled: false
 
           stream-test-plan: '{project}-{functionality}-{stream}.txt'
       - integration-test-plan:
           test-plan: '{project}-{functionality}.txt'
+      - integration-test-suites:
+          test-suites: '{test-suites}'
       - integration-patch-refspec:
           branch: 'master'
       - integration-jdk-version:
       - inject:
           properties-file: 'slave_addresses.txt'
       - integration-detect-variables
+      - integration-install-common-functions
       - integration-deploy-controller-run-test
       - integration-cleanup-tmp
 
       - lf-infra-publish
 
 - job-template:
-    name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+    name: '{prefix}{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+    id: inttest-csit-1node-periodic
     disabled: false
 
     project-type: freestyle
           stream-test-plan: '{project}-{functionality}-{stream}.txt'
       - integration-test-plan:
           test-plan: '{project}-{functionality}.txt'
+      - integration-test-suites:
+          test-suites: '{test-suites}'
       - integration-patch-refspec:
           branch: 'master'
       - integration-jdk-version:
       - inject:
           properties-file: 'slave_addresses.txt'
       - integration-detect-variables
+      - integration-install-common-functions
       - integration-deploy-controller-run-test
       - integration-cleanup-tmp
 
       - lf-infra-publish
 
 - job-template:
-    name: '{project}-csit-verify-3node-{functionality}'
+    name: '{prefix}{project}-csit-verify-3node-{functionality}'
+    id: inttest-csit-verify-3node
     disabled: false
 
     project-type: freestyle
           stream-test-plan: '{project}-{functionality}-{verify-stream}.txt'
       - integration-test-plan:
           test-plan: '{project}-{functionality}.txt'
+      - integration-test-suites:
+          test-suites: '{test-suites}'
       - integration-jdk-version:
           jdkversion: '{verify-jdkversion}'
       - distribution-karaf-version:
       - inject:
           properties-file: 'slave_addresses.txt'
       - integration-detect-variables
+      - integration-install-common-functions
       - integration-configure-clustering
       - integration-start-cluster-run-test
       - integration-cleanup-tmp
       - lf-infra-publish
 
 - job-template:
-    name: '{project}-csit-3node-{functionality}-{install}-{stream}'
+    name: '{prefix}{project}-csit-3node-{functionality}-{install}-{stream}'
+    id: inttest-csit-3node
     disabled: false
 
     project-type: freestyle
           stream-test-plan: '{project}-{functionality}-{stream}.txt'
       - integration-test-plan:
           test-plan: '{project}-{functionality}.txt'
+      - integration-test-suites:
+          test-suites: '{test-suites}'
       - integration-patch-refspec:
           branch: 'master'
       - integration-jdk-version:
       - inject:
           properties-file: 'slave_addresses.txt'
       - integration-detect-variables
+      - integration-install-common-functions
       - integration-configure-clustering
       - integration-start-cluster-run-test
       - integration-cleanup-tmp
       - lf-infra-publish
 
 - job-template:
-    name: '{project}-csit-3node-docker-{functionality}-{install}-{stream}'
+    name: '{prefix}{project}-csit-3node-docker-{functionality}-{install}-{stream}'
+    id: inttest-csit-3node-docker
     disabled: false
 
     project-type: freestyle
       - inject:
           properties-file: 'slave_addresses.txt'
       - integration-detect-variables
+      - integration-install-common-functions
       - integration-configure-clustering
       - integration-start-cluster-run-test
       - integration-cleanup-tmp
       - lf-infra-publish
 
 - job-template:
-    name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+    name: '{prefix}{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+    id: inttest-csit-3node-periodic
     disabled: false
 
     project-type: freestyle
           stream-test-plan: '{project}-{functionality}-{stream}.txt'
       - integration-test-plan:
           test-plan: '{project}-{functionality}.txt'
+      - integration-test-suites:
+          test-suites: '{test-suites}'
       - integration-patch-refspec:
           branch: 'master'
       - integration-jdk-version:
       - inject:
           properties-file: 'slave_addresses.txt'
       - integration-detect-variables
+      - integration-install-common-functions
       - integration-configure-clustering
       - integration-start-cluster-run-test
       - integration-cleanup-tmp
       - lf-infra-publish
 
 - job-template:
-    name: '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
+    name: '{prefix}{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
+    id: inttest-csit-hwvtep-openstack
     disabled: false
 
     project-type: freestyle
           name: ENABLE_OS_COMPUTE_SERVICES
           default: '{enable-openstack-compute-services}'
           description: 'comma separated list of services to enable on compute nodes'
+      - string:
+          name: ENABLE_OS_NETWORK_SERVICES
+          default: '{enable-openstack-network-services}'
+          description: 'comma seperated list of network services to enable'
       - string:
           name: ENABLE_OS_PLUGINS
           default: '{enable-openstack-plugins}'
       - inject:
           properties-file: 'slave_addresses.txt'
       - integration-detect-variables
+      - integration-install-common-functions
       - integration-deploy-controller-run-test
       - integration-deploy-openstack-run-test
       - integration-cleanup-tmp
       - lf-infra-publish
 
 - job-template:
-    name: '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+    name: '{prefix}{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+    id: inttest-csit-openstack
     disabled: false
 
     project-type: freestyle
           name: ENABLE_OS_COMPUTE_SERVICES
           default: '{enable-openstack-compute-services}'
           description: 'comma separated list of services to enable on compute nodes'
+      - string:
+          name: ENABLE_OS_NETWORK_SERVICES
+          default: '{enable-openstack-network-services}'
+          description: 'comma seperated list of network services to enable'
       - string:
           name: ENABLE_OS_PLUGINS
           default: '{enable-openstack-plugins}'
       - inject:
           properties-file: 'slave_addresses.txt'
       - integration-detect-variables
+      - integration-install-common-functions
       - integration-deploy-controller-run-test
       - integration-deploy-openstack-run-test
       - integration-cleanup-tmp
 # triggers the project system test defined in {csit-list} when gerrit receives test-{project} keyword
 
 - job-template:
-    name: '{project}-patch-test-{feature}-{stream}'
+    name: '{prefix}{project}-patch-test-{feature}-{stream}'
+    id: inttest-patch-test
 
     project-type: freestyle
     node: centos7-builder-2c-8g
     concurrent: true
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
               clean install dependency:tree
               -Pq
               -Dgitid.skip=false
+              -Dmaven.gitcommitid.skip=false
               -DgenerateReports=false
               -Dstream={stream}
               {opendaylight-infra-mvn-opts}
-          # TODO: {opendaylight-infra-parallel-mvn-opts}?
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
           java-opts:
             - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
           settings: integration-settings
               clean install dependency:tree
               -Pq
               -Dgitid.skip=false
-              {opendaylight-infra-parallel-mvn-opts}
+              -Dmaven.gitcommitid.skip=false
+              {opendaylight-infra-mvn-opts}
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
           java-opts:
             - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
           settings: integration-settings
index 5b7637193dc4ce925e0130b138cf973a7a42c039..bdc95e07ea58a8ee307617fcd49340e5a076c242 100644 (file)
 
     # CSIT Lists in releng-defaults.yaml
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
-          csit-blacklist: longevity gate sanity capwap centinel coe didm iotdm jsonrpc lacp netide
+          csit-blacklist: longevity gate sanity capwap centinel coe didm iotdm jsonrpc lacp netide tdd wip
+          csit-list: !include: csit-jobs-fluorine.lst
+          csit-sanity-list: '{csit-sanity-list-fluorine}'
+          csit-weekly-list: '{csit-weekly-list-fluorine}'
+          csit-high-frequency-list: '{csit-high-frequency-list-fluorine}'
+          mvn-version: 'mvn33'
+      - oxygen:
+          branch: 'stable/oxygen'
+          csit-blacklist: longevity gate sanity capwap centinel coe didm iotdm jsonrpc lacp netide tdd wip
           csit-list: !include: csit-jobs-oxygen.lst
           csit-sanity-list: '{csit-sanity-list-oxygen}'
           csit-weekly-list: '{csit-weekly-list-oxygen}'
           csit-high-frequency-list: '{csit-high-frequency-list-oxygen}'
+          mvn-version: 'mvn33'
 
       - nitrogen:
           branch: 'stable/nitrogen'
-          csit-blacklist: longevity gate sanity capwap centinel coe didm iotdm jsonrpc lacp netide tsdr
+          csit-blacklist: longevity gate sanity capwap centinel coe didm iotdm jsonrpc lacp netide tsdr tdd wip
           csit-list: !include: csit-jobs-nitrogen.lst
           csit-sanity-list: '{csit-sanity-list-nitrogen}'
           csit-weekly-list: '{csit-weekly-list-nitrogen}'
           csit-high-frequency-list: '{csit-high-frequency-list-nitrogen}'
+          mvn-version: 'mvn33'
 
       - carbon:
           branch: 'stable/carbon'
           karaf-version: karaf3
-          csit-blacklist: longevity gate sanity capwap centinel coe jsonrpc
+          csit-blacklist: longevity gate sanity capwap centinel coe jsonrpc tdd wip
           csit-list: !include: csit-jobs-carbon.lst
           csit-sanity-list: '{csit-sanity-list-carbon}'
           csit-weekly-list: '{csit-weekly-list-carbon}'
           csit-high-frequency-list: '{csit-high-frequency-list-carbon}'
+          mvn-version: 'mvn33'
 
     # tools system image
     tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
               -Pq
               -Dstream={stream}
               {opendaylight-infra-mvn-opts}
-          # TODO: {opendaylight-infra-parallel-mvn-opts}?
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
           java-opts:
             - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
           settings: integration-settings
           pom: distribution/pom.xml
           goals: |
               clean install dependency:tree -DoutputFile=dependency_tree.txt
-              {opendaylight-infra-parallel-mvn-opts}
+              {opendaylight-infra-mvn-opts}
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
           java-opts:
             - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
           settings: integration-settings
 - job-template:
     name: 'integration-multipatch-test-{stream}'
     # Goal: Build one or more patches and run all available system test on a distribution containing the change.
-    # Operation: This job template checks out and builds each patch provided in job parameters, creates a distribution
-    # containing these patches, and triggers the distribution test job which includes most (if not all) available
-    # CSIT jobs
-    # TODO: Move the following to appropriate readthedocs document.
-    # Recommended Sandbox usage:
-    # 0. Create this job and a CSIT job you want to run on the new .zip in Sandbox (disable timed triggers).
-    # 1. Copy the csit job name to clipboard.
-    # 2. Navigate to Sandbox page of this job.
-    # 3. Click "Configure".
-    # 4. Locate "Trigger/call builds on other projects" (under "Post Steps" tab).
-    # 5. Delete the long value of "Projects to build" field and paste the job name from clipboard (ctrl+a, ctrl+v).
-    # 6. Click "Save" button.
-    # 7. Click "Build with Parameters".
-    # yamllint disable-line rule:line-length
-    # 8. Start the job with your parameters, see https://wiki.opendaylight.org/view/Integration/Test/Running_System_Tests#Running_System_Tests_Using_Custom_Distribution_Built_From_Multiple_Patches
-    # 9. The multipatch job waits for the csit job to finish, so abort csit if you see something went wrong.
-    # 10. Navigate to Sandbox page of the csit job, click the run triggered from multipatch.
-    # 11. Click Parameters and copy the long value of BUNDLE_URL field to clipboard.
-    # 12. Run the same csit job woth different patchset or test options, or other csit jobs, with this BUNDLE_URL value
-    #     so you do not have to wait for multipatch build. Repeat step 12.
-    # 13. Currently, the .zip lasts 24 hours (?) so you may need to jump to step 2 (or 0) after some time.
+    # Operation: This job template checks out and builds in order each patch provided in job parameters, finally
+    # it creates a distribution containing all patches and triggers the distribution test job which includes most
+    # (if not all) available CSIT jobs.
 
     project-type: freestyle
-    node: centos7-builder-2c-8g
-    jdk: '{jdk}'
+    node: centos7-builder-4c-4g
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
           run-test: 'false'
       - integration-distribution-branch:
           branch: '{branch}'
+      - integration-distribution-stream:
+          stream: '{stream}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
       - opendaylight-infra-parameters:
 
     builders:
       - wipe-org-opendaylight-repo
-      - integration-multipatch-builder
+      - lf-maven-install:
+          mvn-version: '{mvn-version}'
       - provide-maven-settings:
           global-settings-file: 'global-settings'
-          settings-file: 'yangtools-settings'
-      - maven-target:
-          maven-version: mvn33
-          pom: patch_tester/pom.xml
-          # TODO: Make Maven options configurable. Currently tests are not skipped, everything else is.
-          goals: |
-              clean install dependency:tree -DoutputFile=dependency_tree.txt
-              -Pq
-              -Dstream={stream}
-              -Dsft.heap.max=4g
-              {opendaylight-infra-mvn-opts}
-          # TODO: {opendaylight-infra-parallel-mvn-opts}?
-          java-opts:
-            - '-Xmx3072m -Dmaven.compile.fork=true'
-          settings: integration-settings
-          settings-type: cfp
-          global-settings: global-settings
-          global-settings-type: cfp
+          settings-file: 'integration-distribution-settings'
+      - integration-multipatch-builder
       - integration-upload-distribution:
           dist-pom: patch_tester/distribution/pom.xml
       - conditional-step:
diff --git a/jjb/integration/integration4-templates.yaml b/jjb/integration/integration4-templates.yaml
deleted file mode 100644 (file)
index 9539c82..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
----
-
-# TODO: This is only potentionally useful for Carbon. Remove this when Carbon is not supported anymore.
-
-- job-template:
-    name: '{project}-csit4-1node-{functionality}-{install}-nitrogen'
-    # Keep synchronized with *-csit-* please.
-    disabled: false
-
-    project-type: freestyle
-    node: centos7-robot-2c-8g
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      # Removing {kafka-version} will force this job to run in k4.
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
-          branch: 'master'
-          refspec: 'refs/heads/master'
-          artifacts: '{archive-artifacts}'
-      - integration-distribution-branch:
-          branch: 'master'
-      - integration-distribution-stream:
-          stream: 'nitrogen'
-      - integration-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-controller-scope:
-          controller-scope: '{scope}'
-      - integration-controller-features:
-          controller-features: '{install-features}'
-      - integration-test-options:
-          test-options: '{robot-options}'
-      - integration-stream-test-plan:
-          stream-test-plan: '{project}-{functionality}-nitrogen.txt'
-      - integration-test-plan:
-          test-plan: '{project}-{functionality}.txt'
-      - integration-patch-refspec:
-          branch: 'master'
-      - integration-jdk-version:
-          jdkversion: 'openjdk8'
-
-    scm:
-      - integration-gerrit-scm:
-          basedir: 'test'
-          refspec: '$PATCHREFSPEC'
-          branch: 'master'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - 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-install-robotframework
-      - inject:
-          properties-file: 'env.properties'
-      - integration-get-slave-addresses
-      - inject:
-          properties-file: 'slave_addresses.txt'
-      - integration-detect-variables
-      - integration-deploy-controller-run-test
-      - integration-cleanup-tmp
-
-    publishers:
-      - integration-robot:
-          unstable-if: 0.0
-          pass-if: 100.0
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project}]'
-      - plot:
-          - title: '{01-plot-title}'
-            yaxis: '{01-plot-yaxis}'
-            group: '{01-plot-group}'
-            num-builds: '5400'
-            keep-records: true
-            style: line
-            use-description: false
-            # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit4-1node-{functionality}-{install}-nitrogen-{01-plot-data-file}-history.csv'
-            series:
-              - file: '{01-plot-data-file}'
-                inclusion-flag: 'off'
-                display-table: true
-                format: csv
-          - title: '{02-plot-title}'
-            yaxis: '{02-plot-yaxis}'
-            group: '{02-plot-group}'
-            num-builds: '5400'
-            keep-records: true
-            style: line
-            use-description: false
-            # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit4-1node-{functionality}-{install}-nitrogen-{02-plot-data-file}-history.csv'
-            series:
-              - file: '{02-plot-data-file}'
-                inclusion-flag: 'off'
-                display-table: true
-                format: csv
-      - integration-csit-archive-build
-      - lf-infra-publish
index f5711aedd1090be38e1b8c63f3cef553ad9e8c58..ce0fcb4f7f319ea147f3d58102743d4ec5ee6ad8 100644 (file)
@@ -8,31 +8,30 @@
 
 # create a fresh empty place to build this custom distribution
 BUILD_DIR=${WORKSPACE}/patch_tester
-POM_FILE=${WORKSPACE}/patch_tester/pom.xml
 DISTRIBUTION_BRANCH_TO_BUILD=$DISTROBRANCH  #renaming variable for clarity
+MAVEN_OPTIONS="$(echo --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)"
 
 rm -rf $BUILD_DIR
 mkdir -p $BUILD_DIR
 cd $BUILD_DIR || exit 1
 
-# create a root pom that will contain a module for each project we have a patch for
-echo "<project>" >> $POM_FILE
-echo "<groupId>org.opendaylight.test</groupId>" >> $POM_FILE
-echo "<artifactId>test</artifactId>" >> $POM_FILE
-echo "<version>0.1</version>" >> $POM_FILE
-echo "<modelVersion>4.0.0</modelVersion>" >> $POM_FILE
-echo "<packaging>pom</packaging>" >> $POM_FILE
-echo "<modules>" >> $POM_FILE
-
 # Set up git committer name and email, needed for commit creation when cherry-picking.
 export EMAIL="sandbox@jenkins.opendaylight.org"
-# TODO: Is there a more appropriate e-mail?
 export GIT_COMMITTER_NAME="Multipatch Job"
 
-# TODO: Is "patches" still the correct word?
+# Extract a list of patches per project from an comment trigger. An example is:
+# Patch Set 1:
+#
+# multipatch-build:openflowplugin:45/69445/1,genius:46/69446/1,netvirt:47/69447/1
 if [ -n "$GERRIT_EVENT_COMMENT_TEXT" ]; then
-    PATCHES_TO_BUILD=$(echo "$GERRIT_EVENT_COMMENT_TEXT" \
-        | grep 'multipatch-build:' | awk -F: '{print $2}')
+    # Grep the multipatch-build: line and then strip from the beginning to the :
+    PATCHES_TO_BUILD=$(echo "$GERRIT_EVENT_COMMENT_TEXT" | grep 'multipatch-build:')
+    PATCHES_TO_BUILD=${PATCHES_TO_BUILD#*:}
 fi
 IFS=',' read -ra PATCHES <<< "${PATCHES_TO_BUILD}"
 
@@ -40,7 +39,7 @@ IFS=',' read -ra PATCHES <<< "${PATCHES_TO_BUILD}"
 # * Clone the project.
 # * Optionally, checkout a specific (typically unmerged) Gerrit patch. If none,
 #   default to Integration/Distribution branch via {branch} JJB param.
-# * Also optionally, cherry-pick series of patchs on top of the checkout.
+# * Also optionally, cherry-pick series of patches on top of the checkout.
 # * Final option: perform a 'release' by removing "-SNAPSHOT" everywhere within the project.
 #
 # Each patch is found in the ${PATCHES_TO_BUILD} variable as a comma separated
@@ -50,11 +49,11 @@ IFS=',' read -ra PATCHES <<< "${PATCHES_TO_BUILD}"
 #
 # PATCHES_TO_BUILD='odlparent=45/30045/2'
 #
-# Checkout patchs for both odlparent and yangtools.
+# Checkout patches for both odlparent and yangtools:
 #
 # PATCHES_TO_BUILD='odlparent=45/30045/2,yangtools:53/26853/25'
 #
-# Checkout a patch for controller, cherry-pick another patch on top of it.
+# Checkout a patch for controller, cherry-pick another patch on top of it:
 #
 # PATCHES_TO_BUILD='controller=61/29761/5:45/29645/6'
 distribution_status="not_included"
@@ -69,7 +68,6 @@ do
     PROJECT_SHORTNAME="${PROJECT##*/}"  # http://stackoverflow.com/a/3162500
     echo "cloning project ${PROJECT}"
     git clone "https://git.opendaylight.org/gerrit/p/${PROJECT}"
-    echo "<module>${PROJECT_SHORTNAME}</module>" >> ${POM_FILE}
     cd ${PROJECT_SHORTNAME} || exit 1
     if [ "$(echo -n ${proto_patch} | tail -c 1)" == 'r' ]; then
         pure_patch="$(echo -n $proto_patch | head -c -1)"
@@ -100,6 +98,15 @@ do
         # Here 'r' means release. Useful for testing Nitrogen Odlparent changes.
         find . -name "*.xml" -print0 | xargs -0 sed -i 's/-SNAPSHOT//g'
     fi
+    # Build project
+    "$MVN" clean install \
+    -e -Pq \
+    -Dstream=oxygen \
+    -Dgitid.skip=false \
+    -Dmaven.gitcommitid.skip=false \
+    --global-settings "$GLOBAL_SETTINGS_FILE" \
+    --settings "$SETTINGS_FILE" \
+    $MAVEN_OPTIONS
     cd "${BUILD_DIR}" || exit 1
 done
 
@@ -109,10 +116,13 @@ if [ "${distribution_status}" == "not_included" ]; then
     git clone "https://git.opendaylight.org/gerrit/p/integration/distribution"
     cd distribution || exit 1
     git checkout "${DISTRIBUTION_BRANCH_TO_BUILD}"
+    # Build project
+    "$MVN" clean install \
+    -e -Pq \
+    -Dstream="$DISTROSTREAM" \
+    --global-settings "$GLOBAL_SETTINGS_FILE" \
+    --settings "$SETTINGS_FILE" \
+    $MAVEN_OPTIONS
     cd "${BUILD_DIR}" || exit 1
-    echo "<module>distribution</module>" >> ${POM_FILE}
 fi
 
-# finish pom file
-echo "</modules>" >> "${POM_FILE}"
-echo "</project>" >> "${POM_FILE}"
index 2903451c301c374b786d8965dc9be10c7d227d38..fcbaa7eef52a4e0c21905f8650657f7d33f1c921 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: iotdm-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'iotdm'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 088ec87578099b7a1f78cd87fa4c7bb4f59e97ee..7ebc16da4c9f0e966c549dec3cdf173a9406a092 100644 (file)
@@ -1,27 +1,38 @@
 ---
+- project:
+    name: iotdm-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'iotdm'
+    project-name: 'iotdm'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    mvn-settings: 'iotdm-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'aaa-merge-{stream}'
+    email-upstream: '[iotdm] [aaa]'
+
+    # Used by the release job
+    staging-profile-id: 96fd6e9453970
+
 - project:
     name: iotdm-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'iotdm'
     project-name: 'iotdm'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'iotdm-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'aaa-merge-{stream}'
     email-upstream: '[iotdm] [aaa]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fd6e9453970
     name: iotdm-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'iotdm-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'aaa-merge-{stream}'
     email-upstream: '[iotdm] [aaa]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fd6e9453970
     name: iotdm-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'iotdm-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'aaa-merge-{stream}'
     email-upstream: '[iotdm] [aaa]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fd6e9453970
@@ -88,6 +83,6 @@
     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'iotdm-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 28e7f4faea8f6bfd0e8794c9c6d15cbf863adcd6..5612eab04da57355a85b8f5e5637c380eae1fc5f 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: jsonrpc-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'jsonrpc'
index 387b10b4a35b3645cfa75937a99ca65552cb4f90..1eaa52fb678d2a5cdf5459177da435b4aa6fb280 100644 (file)
@@ -2,25 +2,16 @@
 - project:
     name: jsonrpc-fluorine
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
     stream: fluorine
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'jsonrpc-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
     email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fdf4408765d
 - project:
     name: jsonrpc-oxygen
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
     stream: oxygen
     branch: 'stable/oxygen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'jsonrpc-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
     email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fdf4408765d
 - project:
     name: jsonrpc-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
     stream: nitrogen
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'jsonrpc-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
     email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fdf4408765d
 - project:
     name: jsonrpc-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
     stream: carbon
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'jsonrpc-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
     email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fdf4408765d
     project-name: 'jsonrpc'
     branch: 'master'
     mvn-settings: 'jsonrpc-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index f5901407518277cfac240d0e24447fd3002d08f6..fc55dafa03dd7970051343b35823680e79efbafd 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: l2switch-csit-host-scalability-daily
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-1node-periodic
 
     # The project name
     project: 'l2switch'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index f05ac233d92029d4e5122d5a6c136dfb656edf58..f5657336913f6ed019f6b5e1083a5d798c6b36d5 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: l2switch-csit-scalability
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'l2switch'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index a5366538c8cb5bb861241cb311abee65a1471de2..54fb5958c1085a387fddc75018103305167bb5e5 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: l2switch-csit-switch
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'l2switch'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index bee9bf7a379df57f8da75b0957888bf675795860..472071b54339143d7492abb7aa7f078135a9f3b4 100644 (file)
@@ -2,15 +2,17 @@
 - project:
     name: l2switch-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'l2switch'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 0b6745a59e4d197760367da0358525736359517d..e2955c1019f0da4693fa73af00f9fa2607c565fb 100644 (file)
@@ -1,23 +1,38 @@
 ---
+- project:
+    name: l2switch-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'l2switch'
+    project-name: 'l2switch'
+    branch: 'master'
+    mvn-settings: 'l2switch-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    dependencies: >
+        odlparent-merge-{stream},
+        yangtools-merge-{stream},
+        controller-merge-{stream},
+        openflowjava-merge-{stream},
+        openflowplugin-merge-{stream}
+    email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
+
+    # Used by the release job
+    staging-profile-id: 96fee85953ca0
+
 - project:
     name: l2switch-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'l2switch'
     project-name: 'l2switch'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'l2switch-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: >
         odlparent-merge-{stream},
@@ -26,7 +41,6 @@
         openflowjava-merge-{stream},
         openflowplugin-merge-{stream}
     email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fee85953ca0
     name: l2switch-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'l2switch'
     project-name: 'l2switch'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'l2switch-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: >
         odlparent-merge-{stream},
@@ -58,7 +64,6 @@
         openflowjava-merge-{stream},
         openflowplugin-merge-{stream}
     email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fee85953ca0
     name: l2switch-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'l2switch'
     project-name: 'l2switch'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'l2switch-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: >
         odlparent-merge-{stream},
@@ -91,7 +88,6 @@
         openflowjava-merge-{stream},
         openflowplugin-merge-{stream}
     email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fee85953ca0
     project-name: 'l2switch'
     branch: 'master'
     mvn-settings: 'l2switch-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
index d9f199a92d6f62405f695267ab9848b6d2fad97d..1cf3cabbd4f3fa54964ad8d4e51fc6004bf92840 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: lacp-csit-lacp
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'lacp'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index bb78959543172bc573bcabc6abd98aac0dc40494..c089d6123237479e1a01b2e15d9f561c0f6e4426 100644 (file)
@@ -1,27 +1,36 @@
 ---
+- project:
+    name: lacp-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'lacp'
+    project-name: 'lacp'
+    branch: 'master'
+    mvn-settings: 'lacp-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
+    email-upstream: '[lacp] [openflowjava] [openflowplugin]'
+
+    # Used by the release job
+    staging-profile-id: 96ff6c0ff6ab1
+
 - project:
     name: lacp-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'lacp'
     project-name: 'lacp'
-    branch: 'master'
-    jdks:
-      - openjdk8
+    branch: 'stable/oxygen'
     mvn-settings: 'lacp-settings'
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
     email-upstream: '[lacp] [openflowjava] [openflowplugin]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96ff6c0ff6ab1
     name: lacp-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'lacp'
     project-name: 'lacp'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'lacp-settings'
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
     email-upstream: '[lacp] [openflowjava] [openflowplugin]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96ff6c0ff6ab1
     name: lacp-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'lacp'
     project-name: 'lacp'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'lacp-settings'
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
     email-upstream: '[lacp] [openflowjava] [openflowplugin]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96ff6c0ff6ab1
@@ -89,5 +80,4 @@
     project-name: 'lacp'
     branch: 'master'
     mvn-settings: 'lacp-settings'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 01e71c93d49c6cf1bf288a6bf5ee2191a2a62b3f..3d83608ced9741817c398c4540afec9d483e5009 100644 (file)
@@ -1,4 +1,19 @@
 ---
+- project:
+    name: lf-infra-ansible-roles-system-update
+    jobs:
+      - gerrit-tox-verify
+
+    project-name: lf-infra-ansible-roles
+    project: ansible/roles/*
+    build-node: ubuntu1604-docker-2c-2g
+    build-timeout: 60
+    stream: any
+    branch: '*'
+
+    git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
+    gerrit-server-name: LinuxFoundation
+
 - project:
     name: lf-infra-ci-workshop
     jobs:
@@ -36,7 +51,7 @@
     project-name: lf-infra-docs
     project: releng/docs
     project-pattern: releng/docs
-    build-node: centos7-builder-2c-8g
+    build-node: centos7-builder-2c-1g
     rtd-project: lf-releng-docs
     stream: any
     branch: '*'
 - project:
     name: lf-infra-docs-conf
     jobs:
+      - '{project-name}-rtd-jobs'
       - gerrit-tox-verify
 
     project-name: lf-infra-docs-conf
     project: releng/docs-conf
     project-pattern: releng/docs-conf
-    build-node: centos7-builder-2c-8g
+    build-node: centos7-builder-2c-1g
+    rtd-project: lfdocs-conf
     stream: any
     branch: '*'
 
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: LinuxFoundation
+
+- project:
+    name: lf-infra-license-checker
+    jobs:
+      - gerrit-tox-verify
+
+    project-name: lf-infra-license-checker
+    project: releng/license-checker
+    build-node: centos7-builder-2c-2g
+    stream: any
+    branch: '*'
+
+    git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
+    gerrit-server-name: LinuxFoundation
index d0ffdf7b97118d9bb271d1f493ec305097f328ce..fb0a4f21b21dd1bec866e2cb056117a59e633355 100644 (file)
@@ -2,9 +2,9 @@
 - project:
     name: lispflowmapping-csit-msmr
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-3node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'lispflowmapping'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index bcacff0e53dba4e84bf1b32d7a06281ed3d59b91..01b9e23baeac5cfe2e4db75c1694e8e92eae0e4c 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: lispflowmapping-csit-performance
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'lispflowmapping'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
@@ -25,7 +27,7 @@
           scope: 'only'
 
     # Job instance type
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-highcpu-8'
 
     # Features to install
     install-features: 'odl-lispflowmapping-msmr'
index fef86deaa46148af046f0acf75647512f3f445c5..d3fc860f95a0d0cf8a9743b3799b39e643718f75 100644 (file)
@@ -1,24 +1,42 @@
 ---
+- project:
+    name: lispflowmapping-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'lispflowmapping'
+    project-name: 'lispflowmapping'
+    branch: 'master'
+    mvn-settings: 'lispflowmapping-settings'
+    mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
+    dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
+    email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
+    archive-artifacts: >
+        **/*.log
+        **/target/surefire-reports/*-output.txt
+
+    build-node: centos7-builder-8c-8g
+
+    # Used by the release job
+    staging-profile-id: 96fff2503b766
+
 - project:
     name: lispflowmapping-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'lispflowmapping-settings'
-    mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild'
+    mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
     dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
     email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
@@ -26,7 +44,7 @@
         **/*.log
         **/target/surefire-reports/*-output.txt
 
-    build-node: centos7-builder-4c-16g
+    build-node: centos7-builder-8c-8g
 
     # Used by the release job
     staging-profile-id: 96fff2503b766
     name: lispflowmapping-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'lispflowmapping-settings'
-    mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild'
+    mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
     dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
     email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
-    archive-artifacts: ''
-    build-node: centos7-builder-4c-16g
+    archive-artifacts: >
+        **/*.log
+        **/target/surefire-reports/*-output.txt
+
+    build-node: centos7-builder-8c-8g
 
     # Used by the release job
     staging-profile-id: 96fff2503b766
     name: lispflowmapping-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'lispflowmapping-settings'
-    mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild'
+    mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
     dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
     email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
-    archive-artifacts: ''
-    build-node: centos7-builder-4c-16g
+    build-node: centos7-builder-8c-8g
 
     # Used by the release job
     staging-profile-id: 96fff2503b766
     project-name: 'lispflowmapping'
     branch: 'master'
     mvn-settings: 'lispflowmapping-settings'
-    mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild'
+    mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
index 0d130e14f4c1d472f40b764b669ff35038ffd339..6e6075725bc66d2f70435c4a46ee9ffd77b30e3b 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: mdsal-csit-bindingv1
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-1node-periodic
 
     # The project name
     project: 'mdsal'
     functionality: 'bindingv1'
 
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
@@ -26,7 +28,7 @@
 
     # No tools system VMs needed, but ODL system needs RAM and benefits from CPUs.
     tools_system_count: 0
-    odl_system_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-4
 
     # Features to install
     install-features: 'odl-restconf'
index 4df31f8b7a79d31255de9d1bbb42687b63fbb96f..dd0a04631e5f205ec79094e35f8bd74f4189bb8e 100644 (file)
@@ -1,29 +1,46 @@
 ---
+- project:
+    name: mdsal-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}':
+          mvn-version: 'mvn35'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'mdsal'
+    project-name: 'mdsal'
+    branch: 'master'
+    mvn-settings: 'mdsal-settings'
+    mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
+    build-node: centos7-builder-8c-8g
+    build-timeout: 90
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[mdsal] [odlparent] [yangtools]'
+
+    # Used by the release job
+    staging-profile-id: a674173c7b29d
+
 - project:
     name: mdsal-oxygen
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - '{project-name}-distribution-check-{stream}':
+          mvn-version: 'mvn35'
       - '{project-name}-maven-javadoc-jobs'
-      - gerrit-maven-merge
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'mdsal'
     project-name: 'mdsal'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'mdsal-settings'
-    mvn-goals: '-Dmaven.compile.fork=true clean install -Dintegrationtests'
+    mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
+    build-node: centos7-builder-8c-8g
     build-timeout: 90
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[mdsal] [odlparent] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a674173c7b29d
     name: mdsal-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - gerrit-maven-merge
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'mdsal'
     project-name: 'mdsal'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-8c-8g
     mvn-settings: 'mdsal-settings'
-    mvn-goals: '-Dmaven.compile.fork=true clean install -Dintegrationtests'
+    mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[mdsal] [odlparent] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a674173c7b29d
     name: mdsal-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - gerrit-maven-merge
+      - odl-maven-jobs
 
     stream: carbon
     project: 'mdsal'
     project-name: 'mdsal'
     branch: 'stable/carbon'
+    build-node: centos7-builder-8c-8g
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'mdsal-settings'
-    mvn-goals: '-Dmaven.compile.fork=true clean install -Dintegrationtests'
+    mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[mdsal] [odlparent] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a674173c7b29d
@@ -92,6 +95,7 @@
     project: 'mdsal'
     project-name: 'mdsal'
     branch: 'master'
+    build-node: centos7-builder-8c-8g
     mvn-settings: 'mdsal-settings'
-    mvn-goals: '-Dmaven.compile.fork=true clean install -Dintegrationtests'
+    mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
index 45eadc26dfc7a6f72059a7068cb5893af66c1984..c6afc49a0d87f7e560c37a4e75b30ce2744c775e 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: messaging4transport-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'messaging4transport'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index c758d82ecad8ea312e815984c85c0510e65b143d..b27a82795bc1e8cc8f233b95247b749cbe6bbb12 100644 (file)
@@ -1,28 +1,38 @@
 ---
+- project:
+    name: messaging4transport-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'messaging4transport'
+    project-name: 'messaging4transport'
+    branch: 'master'
+    mvn-settings: 'messaging4transport-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[messaging4transport]'
+
+    # Used by the release job
+    staging-profile-id: a677283157db4
+
 - project:
     name: messaging4transport-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'messaging4transport'
     project-name: 'messaging4transport'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'messaging4transport-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[messaging4transport]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a677283157db4
     name: messaging4transport-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'messaging4transport'
     project-name: 'messaging4transport'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'messaging4transport-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[messaging4transport]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a677283157db4
     name: messaging4transport-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'messaging4transport'
     project-name: 'messaging4transport'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'messaging4transport-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[messaging4transport]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a677283157db4
@@ -92,5 +84,4 @@
     project-name: 'messaging4transport'
     branch: 'master'
     mvn-settings: 'messaging4transport-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index c497cb8e7f0850e5ef71e8349c2602863e15d380..e84130304a1e4c1b35908b884831c26cac52c462 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: natapp-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'natapp'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 956eea3d5d13bccee8ed78e0d7942f8743ae8e98..5bffab7480d0849e7014a99e2589fc62631d4f66 100644 (file)
@@ -1,28 +1,38 @@
 ---
+- project:
+    name: natapp-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'natapp'
+    project-name: 'natapp'
+    branch: 'master'
+    mvn-settings: 'natapp-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'openflowplugin-merge-{stream}'
+    email-upstream: '[natapp] [openflowplugin]'
+
+    # Used by the release job
+    staging-profile-id: a679c0f4f08a8
+
 - project:
     name: natapp-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'natapp'
     project-name: 'natapp'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'natapp-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream}'
     email-upstream: '[natapp] [openflowplugin]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a679c0f4f08a8
     name: natapp-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'natapp'
     project-name: 'natapp'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'natapp-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream}'
     email-upstream: '[natapp] [openflowplugin]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a679c0f4f08a8
     name: natapp-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'natapp'
     project-name: 'natapp'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'natapp-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream}'
     email-upstream: '[natapp] [openflowplugin]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a679c0f4f08a8
@@ -92,5 +84,4 @@
     project-name: 'natapp'
     branch: 'master'
     mvn-settings: 'natapp-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 5fd1f995020f47f0f2685ddbd3bb8c4491be9ffd..8ffa8fd78ff6248e0fef3342b0281e2789b6178a 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: nemo-csit-engine
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'nemo'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 0874bb36dd651fbb0996ac4f01dca4d396cc8a10..49d944258f209364dd48b6d9a84811610cf8388e 100644 (file)
@@ -1,27 +1,36 @@
 ---
+- project:
+    name: nemo-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'nemo'
+    project-name: 'nemo'
+    branch: 'master'
+    mvn-settings: 'nemo-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[nemo]'
+
+    # Used by the release job
+    staging-profile-id: a67a9890f6202
+
 - project:
     name: nemo-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'nemo'
     project-name: 'nemo'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'nemo-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[nemo]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67a9890f6202
     name: nemo-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'nemo'
     project-name: 'nemo'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'nemo-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[nemo]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67a9890f6202
     name: nemo-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'nemo'
     project-name: 'nemo'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'nemo-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[nemo]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67a9890f6202
@@ -89,5 +80,4 @@
     project-name: 'nemo'
     branch: 'master'
     mvn-settings: 'nemo-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 65ab143da28dff59367f8f4970d8c26c49079882..1227599900e0a2755da7bed96a29fd972622bb3b 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: netconf-csit-cluster-stress
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'netconf'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index de4492d771f2037401d5af3bb0276ff637911790..46ad660fc362e6890dfddee8cec4d654d7e90e38 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: netconf-csit-clustering-scale
     jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-3node-periodic
 
     # The project name
     project: 'netconf'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 51c272d145ef9dcb504b406afd6412024acd94e0..1cc6053f4174ccd514ca52276d9f1f864e47b1e5 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: netconf-csit-clustering
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'netconf'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 546f21d02c611abac496bf83f5a28367a891f30a..9579718bcfa8dfa8f8fc738901bc73de1e060833 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: netconf-csit-callhome
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'netconf'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 74fcde32aba979042bc8b7b7a57e50e9d8f5c593..c64b959d0c5f02078fcbc8b8c98a5d45b2b82733 100644 (file)
@@ -2,15 +2,17 @@
 - project:
     name: netconf-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'netconf'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index a0dee25978e73e228f405a1e19d4302aae0a319d..0b5bc974e7987e789f4f50c49fe41ec36a12e846 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: netconf-csit-scale
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-1node-periodic
 
     # The project name
     project: 'netconf'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
@@ -35,4 +37,4 @@
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
 
     # ODL system configuration
-    odl_system_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-4
index ca5a56149c8928109752f50f604ec7d66bedf17b..90f8760655ec93fdf2cea04b0859df52b5b740c4 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: netconf-csit-userfeatures
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'netconf'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index e557f823789b5df9527c1db7f42bd539b7fa1168..5e5054050696ab99aca8ba30262b54208c2915d8 100644 (file)
@@ -1,28 +1,42 @@
 ---
+- project:
+    name: netconf-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'netconf'
+    project-name: 'netconf'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    mvn-settings: 'netconf-settings'
+    mvn-goals: 'clean deploy -Pintegrationtests'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+    build-timeout: 90
+    dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
+
+    # Used by the release job
+    staging-profile-id: a67b22fc3663f
+
 - project:
     name: netconf-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'netconf'
     project-name: 'netconf'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean install -Pintegrationtests'
+    mvn-goals: 'clean deploy -Pintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
     build-timeout: 90
     dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67b22fc3663f
     name: netconf-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'netconf'
     project-name: 'netconf'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean install -Pintegrationtests'
+    mvn-goals: 'clean deploy -Pintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
     dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67b22fc3663f
     name: netconf-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'netconf'
     project-name: 'netconf'
     branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean install -Pintegrationtests'
+    mvn-goals: 'clean deploy -Pintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
     dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67b22fc3663f
@@ -89,6 +89,7 @@
     project: 'netconf'
     project-name: 'netconf'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean install -Pintegrationtests'
+    mvn-goals: 'clean deploy -Pintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
index 6b228d3d6692954ece5d0c54b635ca40382b24ba..c45a2ca2a87de3cd996504733c8c7e08d4970196 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: netide-csit-basic
     jobs:
-      - '{project}-csit-verify-1node-{functionality}'
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-verify-1node
+      - inttest-csit-1node
 
     # The project name
     project: 'netide'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 372efdf93a53b3873e20a8a5232566f6dcca2ae6..732afd3c1c5b44f700b1e917dba04bc976c1aad3 100644 (file)
@@ -1,27 +1,36 @@
 ---
+- project:
+    name: netide-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'netide'
+    project-name: 'netide'
+    branch: 'master'
+    mvn-settings: 'netide-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'openflowjava-merge-{stream}'
+    email-upstream: '[netide] [openflowjava]'
+
+    # Used by the release job
+    staging-profile-id: a67bab3755815
+
 - project:
     name: netide-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'netide'
     project-name: 'netide'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'netide-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream}'
     email-upstream: '[netide] [openflowjava]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67bab3755815
     name: netide-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'netide'
     project-name: 'netide'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'netide-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream}'
     email-upstream: '[netide] [openflowjava]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67bab3755815
     name: netide-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'netide'
     project-name: 'netide'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'netide-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream}'
     email-upstream: '[netide] [openflowjava]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67bab3755815
@@ -89,5 +80,4 @@
     project-name: 'netide'
     branch: 'master'
     mvn-settings: 'netide-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index da0c1e428b24ff3e22468b8508af5d6472202ddc..6aff8bf1e395f776d70937a027d96aa92f2ad959 100644 (file)
 ---
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration-oxygen
+    name: netvirt-csit-hwvtep-openstack-integration-fluorine
     jobs:
-      - '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - inttest-csit-hwvtep-openstack
 
     project: 'netvirt'
-    stream: 'oxygen'
+    stream: 'fluorine'
     branch: 'master'
-    use-features-boot: 'False'
+    testplan: '{project}-{topology}-l2gw-openstack.txt'
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'placement-api,l2gw-plugin'
+    enable-openstack-compute-services: 'placement-client'
+    security-group-mode: 'stateful'
+    odl_system_flavor: v2-standard-8
+    openstack_system_flavor: v2-standard-8
+    openstack_system2_flavor: v2-standard-4
+    tools_system_count: 2
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
+
+    # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
+    enable-networking-l2gw: 'yes'
 
     topology:
       - 1node:
-          openstack_system1_count: 1
           openstack_system2_count: 1
           odl_system_count: 1
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-openstack'
       - 3node:
-          openstack_system1_count: 1
           openstack_system2_count: 1
           odl_system_count: 3
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'
 
-    testplan: '{project}-{topology}-l2gw-openstack.txt'
-
     functionality:
-      - upstream-stateful:
-          sg-mode: 'stateful'
-      - gate-stateful:
-          sg-mode: 'stateful'
+      - upstream-stateful
+      - gate-stateful
 
     openstack:
-      - ocata:
-          openstack-branch: 'stable/ocata'
-          odl-ml2-branch: 'stable/ocata'
-          openstack_system_image: '{openstack_system_image_ocata}'
-          openstack_system2_image: '{openstack_system_image_ocata}'
       - pike:
           openstack-branch: 'stable/pike'
           odl-ml2-branch: 'stable/pike'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
           openstack_system_image: '{openstack_system_image_pike}'
           openstack_system2_image: '{openstack_system_image_pike}'
+          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
       - queens:
-          openstack-branch: 'master'
-          odl-ml2-branch: 'master'
+          openstack-branch: 'stable/queens'
+          odl-ml2-branch: 'stable/queens'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
           openstack_system_image: '{openstack_system_image_pike}'
           openstack_system2_image: '{openstack_system_image_pike}'
 
+- project:
+    name: netvirt-csit-hwvtep-openstack-integration-oxygen
+    jobs:
+      - inttest-csit-hwvtep-openstack
+
+    project: 'netvirt'
+    stream: 'oxygen'
+    branch: 'stable/oxygen'
+    testplan: '{project}-{topology}-l2gw-openstack.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,l2gw-plugin'
     enable-openstack-compute-services: 'placement-client'
-    security-group-mode: '{sg-mode}'
+    security-group-mode: 'stateful'
+    odl_system_flavor: v2-standard-8
+    openstack_system_flavor: v2-standard-8
+    openstack_system2_flavor: v2-standard-4
     tools_system_count: 2
     tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
 
     # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
     enable-networking-l2gw: 'yes'
 
-- project:
-    name: netvirt-csit-hwvtep-openstack-integration-nitrogen
-    jobs:
-      - '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
-
-    project: 'netvirt'
-    stream: 'nitrogen'
-    branch: 'stable/nitrogen'
-    use-features-boot: 'False'
-
     topology:
       - 1node:
-          openstack_system1_count: 1
           openstack_system2_count: 1
           odl_system_count: 1
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-openstack'
       - 3node:
-          openstack_system1_count: 1
           openstack_system2_count: 1
           odl_system_count: 3
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'
 
-    testplan: '{project}-{topology}-l2gw-openstack.txt'
-
     functionality:
-      - upstream-stateful:
-          schedule: ''
-          sg-mode: 'stateful'
-      - gate-stateful:
-          schedule: ''
-          sg-mode: 'stateful'
+      - upstream-stateful
+      - gate-stateful
 
     openstack:
-      - ocata:
-          openstack-branch: 'stable/ocata'
-          odl-ml2-branch: 'stable/ocata'
-          openstack_system_image: '{openstack_system_image_ocata}'
-          openstack_system2_image: '{openstack_system_image_ocata}'
       - pike:
           openstack-branch: 'stable/pike'
           odl-ml2-branch: 'stable/pike'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
           openstack_system_image: '{openstack_system_image_pike}'
           openstack_system2_image: '{openstack_system_image_pike}'
+          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
       - queens:
-          openstack-branch: 'master'
-          odl-ml2-branch: 'master'
+          openstack-branch: 'stable/queens'
+          odl-ml2-branch: 'stable/queens'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
           openstack_system_image: '{openstack_system_image_pike}'
           openstack_system2_image: '{openstack_system_image_pike}'
 
+- project:
+    name: netvirt-csit-hwvtep-openstack-integration-nitrogen
+    jobs:
+      - inttest-csit-hwvtep-openstack
+
+    project: 'netvirt'
+    stream: 'nitrogen'
+    branch: 'stable/nitrogen'
+    testplan: '{project}-{topology}-l2gw-openstack.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,l2gw-plugin'
     enable-openstack-compute-services: 'placement-client'
-    security-group-mode: '{sg-mode}'
+    security-group-mode: 'stateful'
+    odl_system_flavor: v2-standard-8
+    openstack_system_flavor: v2-standard-8
+    openstack_system2_flavor: v2-standard-4
     tools_system_count: 2
     tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
 
     # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
     enable-networking-l2gw: 'yes'
 
+    topology:
+      - 1node:
+          openstack_system2_count: 1
+          odl_system_count: 1
+          enable-haproxy: 'no'
+          install-features: 'odl-netvirt-openstack'
+      - 3node:
+          openstack_system2_count: 1
+          odl_system_count: 3
+          enable-haproxy: 'yes'
+          install-features: 'odl-jolokia,odl-netvirt-openstack'
+
+    functionality:
+      - upstream-stateful
+      - gate-stateful
+
+    openstack:
+      - pike:
+          openstack-branch: 'stable/pike'
+          odl-ml2-branch: 'stable/pike'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
+          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
+      - queens:
+          openstack-branch: 'stable/queens'
+          odl-ml2-branch: 'stable/queens'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
+
 - project:
     name: netvirt-csit-hwvtep-openstack-integration-carbon
     jobs:
-      - '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - inttest-csit-hwvtep-openstack
 
     project: 'netvirt'
-
     stream: 'carbon'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    use-features-boot: 'False'
+    testplan: '{project}-{topology}-l2gw-openstack.txt'
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'placement-api,l2gw-plugin'
+    enable-openstack-compute-services: 'placement-client'
+    security-group-mode: 'stateful'
+    odl_system_flavor: v2-standard-8
+    openstack_system_flavor: v2-standard-8
+    openstack_system2_flavor: v2-standard-4
+    tools_system_count: 2
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
+
+    # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
+    enable-networking-l2gw: 'yes'
 
     topology:
       - 1node:
-          openstack_system1_count: 1
           openstack_system2_count: 1
           odl_system_count: 1
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-openstack'
       - 3node:
-          openstack_system1_count: 1
           openstack_system2_count: 1
           odl_system_count: 3
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'
 
-    testplan: '{project}-{topology}-l2gw-openstack.txt'
-
     functionality:
-      - upstream-stateful:
-          schedule: ''
-          sg-mode: 'stateful'
-      - gate-stateful:
-          schedule: ''
-          sg-mode: 'stateful'
+      - upstream-stateful
+      - gate-stateful
 
     openstack:
       - ocata:
           odl-ml2-branch: 'stable/ocata'
           openstack_system_image: '{openstack_system_image_ocata}'
           openstack_system2_image: '{openstack_system_image_ocata}'
+          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
       - pike:
           openstack-branch: 'stable/pike'
           odl-ml2-branch: 'stable/pike'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
           openstack_system_image: '{openstack_system_image_pike}'
           openstack_system2_image: '{openstack_system_image_pike}'
-
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,l2gw-plugin'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: '{sg-mode}'
-    tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
-
-    # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
-    enable-networking-l2gw: 'yes'
+          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
index b685c17f2eaee0ab6506abf12da943b87e4ae3f7..6c3f046a001c2cc935e4b8b17da032068765efea 100644 (file)
@@ -1,21 +1,78 @@
 ---
+- project:
+    name: netvirt-csit-openstack-integration-fluorine
+    jobs:
+      - inttest-csit-openstack
+
+    project: 'netvirt'
+    stream: 'fluorine'
+    branch: 'master'
+    testplan: '{project}-{topology}-openstack.txt'
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'placement-api,tempest'
+    enable-openstack-compute-services: 'placement-client'
+    security-group-mode: 'stateful'
+    odl_system_flavor: v2-standard-8
+    openstack_system_flavor: v2-standard-8
+    openstack_system2_flavor: v2-standard-4
+
+    topology:
+      - 1node:
+          openstack_system2_count: 2
+          odl_system_count: 1
+          enable-haproxy: 'no'
+          install-features: 'odl-netvirt-openstack'
+      - 3node:
+          openstack_system2_count: 3
+          odl_system_count: 3
+          enable-haproxy: 'yes'
+          install-features: 'odl-jolokia,odl-netvirt-openstack'
+
+    functionality:
+      - upstream-stateful
+      - upstream-stateful-snat-conntrack:
+          odl-snat-mode: 'conntrack'
+      - gate-stateful
+      - gate-stateful-snat-conntrack:
+          odl-snat-mode: 'conntrack'
+      - gate-minimal-cluster:
+          testplan: '{project}-{topology}-minimal-openstack.txt'
+      # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
+      - gate-tdd-wip:
+          testplan: '{project}-{topology}-tdd-wip-openstack.txt'
+          schedule: ''
+
+    openstack:
+      - pike:
+          openstack-branch: 'stable/pike'
+          odl-ml2-branch: 'stable/pike'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
+          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
+      - queens:
+          openstack-branch: 'stable/queens'
+          odl-ml2-branch: 'stable/queens'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
+
 - project:
     name: netvirt-csit-openstack-integration-oxygen
     jobs:
-      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - inttest-csit-openstack
 
     project: 'netvirt'
     stream: 'oxygen'
-    branch: 'master'
+    branch: 'stable/oxygen'
     testplan: '{project}-{topology}-openstack.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,tempest'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: v1-performance-8
-    openstack_system_flavor: v1-performance-8
-    openstack_system2_flavor: v1-performance-4
-    use-features-boot: 'False'
+    odl_system_flavor: v2-standard-8
+    openstack_system_flavor: v2-standard-8
+    openstack_system2_flavor: v2-standard-4
 
     topology:
       - 1node:
           odl-snat-mode: 'conntrack'
       - gate-minimal-cluster:
           testplan: '{project}-{topology}-minimal-openstack.txt'
+      # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
+      - gate-tdd-wip:
+          testplan: '{project}-{topology}-tdd-wip-openstack.txt'
+          schedule: ''
 
     openstack:
-      - ocata:
-          openstack-branch: 'stable/ocata'
-          odl-ml2-branch: 'stable/ocata'
-          openstack_system_image: '{openstack_system_image_ocata}'
-          openstack_system2_image: '{openstack_system_image_ocata}'
       - pike:
           openstack-branch: 'stable/pike'
           odl-ml2-branch: 'stable/pike'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
           openstack_system_image: '{openstack_system_image_pike}'
           openstack_system2_image: '{openstack_system_image_pike}'
+          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
       - queens:
-          openstack-branch: 'master'
-          odl-ml2-branch: 'master'
+          openstack-branch: 'stable/queens'
+          odl-ml2-branch: 'stable/queens'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
           openstack_system_image: '{openstack_system_image_pike}'
           openstack_system2_image: '{openstack_system_image_pike}'
 - project:
     name: netvirt-csit-openstack-integration-nitrogen
     jobs:
-      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - inttest-csit-openstack
 
     project: 'netvirt'
     stream: 'nitrogen'
     enable-openstack-services: 'placement-api,tempest'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: v1-performance-8
-    openstack_system_flavor: v1-performance-8
-    openstack_system2_flavor: v1-performance-4
-    use-features-boot: 'False'
+    odl_system_flavor: v2-standard-8
+    openstack_system_flavor: v2-standard-8
+    openstack_system2_flavor: v2-standard-4
 
     topology:
       - 1node:
           testplan: '{project}-{topology}-minimal-openstack.txt'
 
     openstack:
-      - ocata:
-          openstack-branch: 'stable/ocata'
-          odl-ml2-branch: 'stable/ocata'
-          openstack_system_image: '{openstack_system_image_ocata}'
-          openstack_system2_image: '{openstack_system_image_ocata}'
       - pike:
           openstack-branch: 'stable/pike'
           odl-ml2-branch: 'stable/pike'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
           openstack_system_image: '{openstack_system_image_pike}'
           openstack_system2_image: '{openstack_system_image_pike}'
+          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
       - queens:
-          openstack-branch: 'master'
-          odl-ml2-branch: 'master'
+          openstack-branch: 'stable/queens'
+          odl-ml2-branch: 'stable/queens'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
           openstack_system_image: '{openstack_system_image_pike}'
           openstack_system2_image: '{openstack_system_image_pike}'
 - project:
     name: netvirt-csit-openstack-integration-carbon
     jobs:
-      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - inttest-csit-openstack
 
     project: 'netvirt'
     stream: 'carbon'
     enable-openstack-services: 'placement-api,tempest'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: v1-performance-8
-    openstack_system_flavor: v1-performance-8
-    openstack_system2_flavor: v1-performance-4
-    use-features-boot: 'False'
+    odl_system_flavor: v2-standard-8
+    openstack_system_flavor: v2-standard-8
+    openstack_system2_flavor: v2-standard-4
 
     topology:
       - 1node:
           odl-ml2-branch: 'stable/ocata'
           openstack_system_image: '{openstack_system_image_ocata}'
           openstack_system2_image: '{openstack_system_image_ocata}'
+          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
       - pike:
           openstack-branch: 'stable/pike'
           odl-ml2-branch: 'stable/pike'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
           openstack_system_image: '{openstack_system_image_pike}'
           openstack_system2_image: '{openstack_system_image_pike}'
+          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
 
 - project:
     name: netvirt-csit-sfc-openstack-integration
     jobs:
-      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - inttest-csit-openstack
 
     project: 'netvirt'
     security-group-mode: 'stateful'
-    odl_system_flavor: v1-performance-4
-    openstack_system2_flavor: v1-performance-2
-    use-features-boot: 'False'
+    odl_system_flavor: v2-standard-4
+    openstack_system2_flavor: v2-standard-2
 
     topology:
       - 1node:
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
           openstack_system_image: '{openstack_system_image_pike}'
           openstack_system2_image: '{openstack_system_image_pike}'
+          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
index 043b62f1231ec341418a5727f557e5ac43098902..bb4852f00fe9e2c15e731ef1213654d9ffd1275a 100644 (file)
@@ -5,8 +5,10 @@
       - 'netvirt-daily-full-integration-{stream}'
 
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
     project-type: freestyle
     node: centos7-docker-1c-4g
     concurrent: true
-    jdk: '{jdk}'
+    jdk: '{java-version}'
     description: >
         Integration tests for the Netvirt project against different versions of
         OVS and branches. This job runs nightly.
index e4b323e677a3ae41ac8b4641646b0bd550b40b80..73b3adb169d08726512b4bf6a1a4e8e9312fbee4 100644 (file)
@@ -2,25 +2,22 @@
 - project:
     name: netvirt-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'netvirt'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
-          # ideally, master (oxygen) would gate against Queens (current master) or 'R' release
-          # bug even the pike devstack environment is still unreliable. so sticking with Ocata
-          # for now
-          os-branch: 'ocata'
+          os-branch: 'queens'
+      - oxygen:
+          branch: 'stable/oxygen'
+          os-branch: 'queens'
       - nitrogen:
           branch: 'stable/nitrogen'
-          # ideally, master (oxygen) would gate against Queens (current master)
-          # bug even the pike devstack environment is still unreliable. so sticking with Ocata
-          # for now
-          os-branch: 'ocata'
+          os-branch: 'pike'
       - carbon:
           branch: 'stable/carbon'
           os-branch: 'ocata'
@@ -47,3 +44,6 @@
       - l2gw:
           csit-list: >
               netvirt-csit-hwvtep-1node-openstack-{os-branch}-gate-stateful-{stream}
+      - tdd-wip:
+          csit-list: >
+              netvirt-csit-1node-openstack-{os-branch}-gate-tdd-wip-{stream}
index 84360509eed02d36cb9a5b54a5be05a060db2782..1f5a0ffaf35dcb8649cfd786b96b17bfa2225d2a 100644 (file)
@@ -3,15 +3,15 @@
     name: netvirt
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
       - gerrit-tox-verify
+      - odl-maven-jobs
 
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
           karaf-version: karaf3
     project: 'netvirt'
     project-name: 'netvirt'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'netvirt-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
     build-timeout: 90
-    build-node: centos7-builder-4c-16g
+    build-node: centos7-builder-8c-8g
     dependencies: >
         genius-merge-{stream},
         neutron-merge-{stream},
@@ -37,7 +31,6 @@
         ovsdb-merge-{stream},
         sfc-merge-{stream}
     email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba
     branch: 'topic/vpp'
     karaf-version: karaf3
     distribution_branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'netvirt-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
     dependencies:
     email-upstream: '[netvirt]'
-    archive-artifacts: ''
 
 - project:
     name: netvirt-sonar
@@ -73,5 +59,4 @@
     project-name: 'netvirt'
     branch: 'master'
     mvn-settings: 'netvirt-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 53aa3ef72da233143c98eb7c1059a9a91a657590..766bd81c7ce2459e277a6572619e1253efb89013 100644 (file)
@@ -1,29 +1,40 @@
 ---
+- project:
+    name: neutron-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'neutron'
+    project-name: 'neutron'
+    build-timeout: 90
+    branch: 'master'
+    mvn-settings: 'neutron-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
+    email-upstream: '[neutron] [odlparent] [aaa]'
+
+    # Used by the release job
+    staging-profile-id: a67e1b40d7419
+
 - project:
     name: neutron-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 90
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'neutron-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[neutron] [odlparent] [aaa]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67e1b40d7419
     name: neutron-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 60
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'neutron-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[neutron] [odlparent] [aaa]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67e1b40d7419
     name: neutron-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'neutron'
     build-timeout: 60
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'neutron-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[neutron] [odlparent] [aaa]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67e1b40d7419
@@ -95,5 +88,4 @@
     project-name: 'neutron'
     branch: 'master'
     mvn-settings: 'neutron-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index f41693c9f171f8b5a66133e2f8528c0f6c17d52c..b160dc6d3623499cd2966fdbaf70d29ba6878162 100644 (file)
@@ -1,27 +1,36 @@
 ---
+- project:
+    name: next-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'next'
+    project-name: 'next'
+    branch: 'master'
+    mvn-settings: 'next-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[next]'
+
+    # Used by the release job
+    staging-profile-id: a67e7c516f385
+
 - project:
     name: next-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'next'
     project-name: 'next'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'next-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[next]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67e7c516f385
     name: next-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'next'
     project-name: 'next'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'next-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[next]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67e7c516f385
     name: next-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'next'
     project-name: 'next'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'next-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[next]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67e7c516f385
@@ -88,6 +79,5 @@
     project: 'next'
     project-name: 'next'
     branch: 'master'
-    mvn-settings: 'tsdr-settings'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
+    mvn-settings: 'next-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index e82909d6bbf559c56357549eed3cc9027f23de7a..6d21673ae47dea74c73f1a4689a9fee080dc2a95 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: nic-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'nic'
@@ -13,8 +13,6 @@
 
     # Project branches
     stream:
-      - oxygen:
-          branch: 'master'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 593f72cb917b4d51ce1a7754516c6fe4030d9322..bf200779bc98a87860e09ecf472cf05540f1e5c1 100644 (file)
@@ -1,27 +1,38 @@
 ---
+- project:
+    name: nic-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'nic'
+    project-name: 'nic'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    mvn-settings: 'nic-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}'
+    email-upstream: '[nic] [vtn] [groupbasedpolicy]'
+
+    # Used by the release job
+    staging-profile-id: a67ef386204aa
+
 - project:
     name: nic-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'nic'
     project-name: 'nic'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'nic-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}'
     email-upstream: '[nic] [vtn] [groupbasedpolicy]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67ef386204aa
     name: nic-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'nic'
     project-name: 'nic'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'nic-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}'
     email-upstream: '[nic] [vtn] [groupbasedpolicy]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67ef386204aa
     name: nic-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'nic'
     project-name: 'nic'
     branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'nic-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}'
     email-upstream: '[nic] [vtn] [groupbasedpolicy]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67ef386204aa
@@ -88,6 +83,6 @@
     project: 'nic'
     project-name: 'nic'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'nic-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 50d924e573037a6dbef520494ef029208bcc4db1..142e659d88c675bf561aa178691fc51847772a2a 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: ocpplugin-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'ocpplugin'
@@ -13,8 +13,6 @@
 
     # Project branches
     stream:
-      - oxygen:
-          branch: 'master'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 125e70e72ca5dcea42d789a3af745105ab9b0525..a7c7c562802db897be7f85913ec62a5b651bf4a2 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: ocpplugin-csit-scalability
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'ocpplugin'
@@ -13,8 +13,6 @@
 
     # Project branches
     stream:
-      - oxygen:
-          branch: 'master'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 56e4e296999c4469c846959239c39c5555e21b41..f9e55c810e20df10dc2c535d6853573105b896b6 100644 (file)
@@ -1,27 +1,36 @@
 ---
+- project:
+    name: ocpplugin-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'ocpplugin'
+    project-name: 'ocpplugin'
+    branch: 'master'
+    mvn-settings: 'ocpplugin-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]'
+
+    # Used by the release job
+    staging-profile-id: a687673279f9c
+
 - project:
     name: ocpplugin-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'ocpplugin'
     project-name: 'ocpplugin'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'ocpplugin-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a687673279f9c
     name: ocpplugin-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'ocpplugin'
     project-name: 'ocpplugin'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'ocpplugin-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a687673279f9c
     name: ocpplugin-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'ocpplugin'
     project-name: 'ocpplugin'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'ocpplugin-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a687673279f9c
@@ -89,5 +80,4 @@
     project-name: 'ocpplugin'
     branch: 'master'
     mvn-settings: 'ocpplugin-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
similarity index 91%
rename from jjb/opendaylight-infra-check-image-protection.sh
rename to jjb/odl-openstack-check-image-protection.sh
index df660c96a9996cfb612d27d30c5e3e0dd8e8cb82..980e70e15f798f28feaea8c65f41d8845897dfe7 100644 (file)
@@ -8,7 +8,6 @@
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
-
 # Checks the image "protected" value and set "True" marker
 #
 # The script is involked by 'builder-verify-image-protection', searches
 # setting. If the image protect setting is not "True", sets the
 # image protect setting to "True" to prevent the image from getting purged
 # by the cleanup old images job.
+echo "---> Check image protection"
 
-virtualenv "/tmp/v/openstack"
 # shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
 source "/tmp/v/openstack/bin/activate"
-pip install --upgrade pip
-pip install --upgrade python-openstackclient
-pip install --upgrade pipdeptree
-pipdeptree
 
 declare -a images
 readarray -t images <<< "$(grep -r _system_image: --include \*.yaml \
similarity index 59%
rename from jjb/opendaylight-infra-cleanup-old-images.sh
rename to jjb/odl-openstack-cleanup-old-images.sh
index 6483788bc2b9a8df507a3ec27a576b71a0470684..db639d1a4dca5e3b7e13b209dd7a1bd4895c592f 100644 (file)
@@ -1,13 +1,16 @@
 #!/bin/bash
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
-# Copyright (c) 2017 The Linux Foundation and others.
+# Copyright (c) 2017 - 2018 The Linux Foundation and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
+# Removes openstack images older than 30 days in the cloud
+echo "---> Cleanup old images"
 
-lftools openstack --os-cloud vex \
-    image cleanup --days=30
+# shellcheck source=/tmp/v/lftools/bin/activate disable=SC1091
+source "/tmp/v/lftools/bin/activate"
+lftools openstack --os-cloud vex image cleanup --days=30
similarity index 86%
rename from jjb/opendaylight-infra-cleanup-orphaned-nodes.sh
rename to jjb/odl-openstack-cleanup-orphaned-nodes.sh
index 1a832fe092782c4f3dd0d7f32c8cc0ba57e96d29..1b7f0c68e47389c6ab0d7cd2f2d63f12bf48b0f2 100644 (file)
@@ -1,7 +1,7 @@
 #!/bin/bash
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
-# Copyright (c) 2017 The Linux Foundation and others.
+# Copyright (c) 2017 - 2018 The Linux Foundation and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 ##############################################################################
 echo "---> Cleanup orphaned servers"
 
-virtualenv "/tmp/v/openstack"
-# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
-source "/tmp/v/openstack/bin/activate"
-pip install --upgrade pip
-pip install --upgrade python-openstackclient python-heatclient
-pip install --upgrade pipdeptree
-pipdeptree
-
 minion_in_jenkins() {
     # Usage: check_stack_in_jenkins STACK_NAME JENKINS_URL [JENKINS_URL...]
     # Returns: 0 If stack is in Jenkins and 1 if stack is not in Jenkins.
@@ -51,13 +43,22 @@ minion_in_jenkins() {
 # Fetch server list before fetching active minions to minimize race condition
 # where we might be trying to delete servers while jobs are trying to start
 
+# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
+source "/tmp/v/openstack/bin/activate"
+
 # We purposely need word splitting here to create the OS_SERVERS array.
 # shellcheck disable=SC2207
-OS_SERVERS=($(openstack server list -f value -c "Name" | grep -E 'prd|snd'))
+mapfile -t OS_SERVERS < <(openstack server list -f value -c "Name" | grep -E 'prd|snd')
+
+deactivate
 
 #############################
 ## DELETE ORPHANED SERVERS ##
 #############################
+
+# shellcheck source=/tmp/v/lftools/bin/activate disable=SC1091
+source "/tmp/v/lftools/bin/activate"
+
 # Search for servers that are not in use by either releng or sandbox silos and
 # delete them.
 for server in "${OS_SERVERS[@]}"; do
@@ -69,6 +70,9 @@ for server in "${OS_SERVERS[@]}"; do
         continue
     else
         echo "Deleting $server"
-        openstack server delete "$server"
+        lftools openstack --os-cloud vex \
+            server remove --minutes 15 "$server"
     fi
 done
+
+deactivate
similarity index 72%
rename from jjb/opendaylight-infra-cleanup-stale-nodes.sh
rename to jjb/odl-openstack-cleanup-stale-nodes.sh
index 2ec19ee8e3736aea19636874b675fcba91203e65..ddd104180613badd389c4da532de706874a6da05 100644 (file)
@@ -1,13 +1,14 @@
 #!/bin/bash
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
-# Copyright (c) 2017 The Linux Foundation and others.
+# Copyright (c) 2017 - 2018 The Linux Foundation and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
+echo "---> Cleanup stale nodes"
 
 # Todo: As a safe check we could obtain the list of active jobs from Jenkins and
 # compute the checksum from $JOB_NAME to check if any active nodes exist and
@@ -15,7 +16,7 @@
 # 24H timeout in place for all jobs therefore all jobs are expected to complete
 # within the timeout.
 
-lftools openstack --os-cloud vex \
-    server list --days=1
-lftools openstack --os-cloud vex \
-    server cleanup --days=1
+# shellcheck source=/tmp/v/lftools/bin/activate disable=SC1091
+source "/tmp/v/lftools/bin/activate"
+lftools openstack --os-cloud vex server list --days=1
+lftools openstack --os-cloud vex server cleanup --days=1
similarity index 96%
rename from jjb/opendaylight-infra-cleanup-stale-stacks.sh
rename to jjb/odl-openstack-cleanup-stale-stacks.sh
index 6f00ac81b3ad063da702322a82a86cc67b1db59c..16559c9feb8c5a3079a0415a579808b071899f1a 100644 (file)
 # Cleanup stale stacks in the cloud
 # Requires the variable JENKINS_URLS declared in the job as a space separated
 # list of Jenkins instances to check for active builds.
+echo "---> Cleanup stale stacks"
 
-virtualenv "/tmp/v/openstack"
 # shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
 source "/tmp/v/openstack/bin/activate"
-pip install --upgrade pip
-pip install --upgrade python-openstackclient python-heatclient
-pip install --upgrade pipdeptree
-pipdeptree
 
 stack_in_jenkins() {
     # Usage: check_stack_in_jenkins STACK_NAME JENKINS_URL [JENKINS_URL...]
diff --git a/jjb/odl-openstack-install.sh b/jjb/odl-openstack-install.sh
new file mode 100644 (file)
index 0000000..adf7d92
--- /dev/null
@@ -0,0 +1,20 @@
+#!/bin/bash
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2017, 2018 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+# Installs the openstack cli to /tmp/v/openstack
+echo "---> Install openstack cli into /tmp/v/openstack"
+
+virtualenv "/tmp/v/openstack"
+# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
+source "/tmp/v/openstack/bin/activate"
+pip install --upgrade pip
+pip install --upgrade python-openstackclient python-heatclient
+pip install --upgrade pipdeptree
+pipdeptree
index 840280f6477ddaf8d8b8b02275dd74a8957a54f1..24da0238326a059a50b5c16bbb1d5da260b7563a 100644 (file)
@@ -2,9 +2,8 @@
 - project:
     name: odlparent-master
     jobs:
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - gerrit-maven-merge
+      - odl-maven-jobs
       - gerrit-tox-verify
 
     project: odlparent
     branch: master
     distribution_branch: master
 
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: mvn33
     mvn-settings: odlparent-settings
-    mvn-goals: clean install
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: mvn33
+    mvn-version: mvn35
 
     dependencies: ''
     email-upstream: '[odlparent]'
     # Used by the release job
     staging-profile-id: 880d5ac25eaa
 
+- project:
+    name: odlparent-3.1.x
+    jobs:
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+      - gerrit-tox-verify
+
+    project: odlparent
+    project-name: odlparent
+    stream: 3.1.x
+    branch: 3.1.x
+    distribution_branch: master
+
+    mvn-settings: odlparent-settings
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+    dependencies: ''
+    email-upstream: '[odlparent]'
+    archive-artifacts: >
+        **/*.prop
+        **/*.log
+        **/target/surefire-reports/*-output.txt
+        **/target/failsafe-reports/failsafe-summary.xml
+        **/hs_err_*.log
+        **/target/feature/feature.xml
+
+    # Used by the release job
+    javadoc-path: org.opendaylight.$PROJECT/$STREAM
+    staging-profile-id: 880d5ac25eaa
+
+- project:
+    name: odlparent-3.0.x
+    jobs:
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+      - gerrit-tox-verify
+
+    project: odlparent
+    project-name: odlparent
+    stream: 3.0.x
+    branch: 3.0.x
+    distribution_branch: master
+
+    mvn-settings: odlparent-settings
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+    dependencies: ''
+    email-upstream: '[odlparent]'
+    archive-artifacts: >
+        **/*.prop
+        **/*.log
+        **/target/surefire-reports/*-output.txt
+        **/target/failsafe-reports/failsafe-summary.xml
+        **/hs_err_*.log
+        **/target/feature/feature.xml
+
+    # Used by the release job
+    javadoc-path: org.opendaylight.$PROJECT/$STREAM
+    staging-profile-id: 880d5ac25eaa
+
 - project:
     name: odlparent-2.0.x
     jobs:
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - gerrit-maven-merge
+      - odl-maven-jobs
       - gerrit-tox-verify
 
     project: odlparent
     branch: 2.0.x
     distribution_branch: master
 
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: mvn33
     mvn-settings: odlparent-settings
-    mvn-goals: clean install
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: mvn33
 
     dependencies: ''
     email-upstream: '[odlparent]'
     name: odlparent-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - gerrit-maven-merge
+      - odl-maven-jobs
       - gerrit-tox-verify
 
     stream: carbon
     project-name: 'odlparent'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'odlparent-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[odlparent]'
     project-name: 'odlparent'
     branch: 'master'
     mvn-settings: 'odlparent-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index c8ba5c7a26e7cc1b525abc195c4c15027cc8c2a8..a614b79684c0b88e56e4ba160ba3bfd7a6f590cb 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: of-config-csit-basic
     jobs:
-      - '{project}-csit-verify-1node-{functionality}'
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-verify-1node
+      - inttest-csit-1node
 
     # The project name
     project: 'of-config'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index cce3332fc99ffb78a3ec48dbd5946545df4c2d4a..c7a309ad8e9e4db2986732970f528c30b095e3ff 100644 (file)
@@ -1,27 +1,36 @@
 ---
+- project:
+    name: of-config-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'of-config'
+    project-name: 'of-config'
+    branch: 'master'
+    mvn-settings: 'of-config-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: netconf-merge-{stream}'
+    email-upstream: '[of-config] [netconf]'
+
+    # Used by the release job
+    staging-profile-id: a6880455efe67
+
 - project:
     name: of-config-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'of-config'
     project-name: 'of-config'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'of-config-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: netconf-merge-{stream}'
     email-upstream: '[of-config] [netconf]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a6880455efe67
     name: of-config-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'of-config'
     project-name: 'of-config'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'of-config-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: netconf-merge-{stream}'
     email-upstream: '[of-config] [netconf]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a6880455efe67
     name: of-config-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'of-config'
     project-name: 'of-config'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'of-config-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: netconf-merge-{stream}'
     email-upstream: '[of-config] [netconf]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a6880455efe67
@@ -89,5 +80,4 @@
     project-name: 'of-config'
     branch: 'master'
     mvn-settings: 'of-config-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 68b6c8c1aba36c37f02cea055bed449addb33194..2cdba404694c2c9a8605b46ab533ed627ce6f26e 100644 (file)
@@ -1,26 +1,34 @@
 ---
+- project:
+    name: circuitsw-fluorine
+    jobs:
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'ofextensions/circuitsw'
+    project-name: 'circuitsw'
+    branch: 'master'
+    mvn-settings: 'ofextensions-circuitsw-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[circuitsw]'
+
+    # Used by the release job
+    staging-profile-id: a68970cf5b25c
+
 - project:
     name: circuitsw-oxygen
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'ofextensions-circuitsw-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[circuitsw]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68970cf5b25c
 - project:
     name: circuitsw-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'ofextensions-circuitsw-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[circuitsw]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68970cf5b25c
 - project:
     name: circuitsw-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
     branch: 'stable/carbon'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'ofextensions-circuitsw-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[circuitsw]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68970cf5b25c
@@ -85,5 +75,4 @@
     project-name: 'circuitsw'
     branch: 'master'
     mvn-settings: 'ofextensions-circuitsw-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 0659504abc0fd2b416357dafd047d71e83c93cb9..b3afb0481f55f737e338a0c78e8dba94b989a7c9 100644 (file)
@@ -48,6 +48,7 @@ for try in $(seq $STACK_RETRIES); do
             CREATE_FAILED)
                 reason=$(openstack stack show "$STACK_NAME" -f value -c stack_status_reason)
                 echo "ERROR: Failed to initialize infrastructure. Reason: $reason"
+                openstack stack resource list -n 25 "$STACK_NAME"
 
                 echo "Deleting stack and possibly retrying to create..."
                 openstack stack delete --yes "$STACK_NAME"
index 77165377681e2d20d0004db4946a826fd37528e6..5a921c0cbca9301643ab6f57e4d7abceb72717e8 100644 (file)
@@ -3,26 +3,17 @@
     name: openflowjava-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'openflowjava'
     project-name: 'openflowjava'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'openflowjava-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68a1507dae22
     name: openflowjava-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'openflowjava'
     project-name: 'openflowjava'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'openflowjava-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68a1507dae22
@@ -64,5 +46,4 @@
     project-name: 'openflowjava'
     branch: 'master'
     mvn-settings: 'openflowjava-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index e098a9845e2788c6961d5cfc74c672bc30731ee3..138541bb299e55eed7f0bc512e2a51764169db92 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-cbench
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'openflowplugin'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
@@ -25,9 +27,9 @@
           scope: 'only'
 
     # Job images
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-standard-4'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
-    tools_system_flavor: 'v1-performance-2'
+    tools_system_flavor: 'v2-highcpu-2'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-drop-test'
index 4b09a8a0da89da3ed71aaf4f2e2a0405e677c7e8..dc05f7ade8ea570e32c3cbcef6abdf22e0d5de68 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-clustering-bulkomatic
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'openflowplugin'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 3c8aa03537f84cc360b032ae3905ba90671d877e..78ba1366d4c7066105f94f9b187c10208aad6d9b 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-clustering-perf-bulkomatic
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'openflowplugin'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
@@ -27,7 +29,7 @@
           scope: 'only'
 
     # Job images
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-standard-4'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
 
     # Features to install
index b14b2d07ad51c78bb55e6be8227fc6f96e8175be..5b564592c1ee766586cebb583d5f273b1440a6bc 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-clustering
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'openflowplugin'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index ffbfa0fc0864500aa9ca55e91668d9e4a51efbf3..a4e70c5843866992d778944533ab781fb0f6c503 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-flow-services
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'openflowplugin'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 4179e504454712cb6daf939953fcb0e6f33902b6..795e0365a828ff9f0e3dbfc22428b86d5f7bab3d 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-longevity
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'openflowplugin'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 1c913d8444ff1c91cceade3a6c881d8c05ace5c2..bba9cdabe697f26f3c87a8acc574c677b8c3278e 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-perf-bulkomatic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'openflowplugin'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
@@ -27,7 +29,7 @@
           scope: 'only'
 
     # Job images
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-standard-4'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
 
     # Features to install
index b1eb7dada72f187b249af15357fb5df2bf945c77..87a5ece011655ca2b1f0a5fbb12707b14e49d489 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-perf-stats-collection
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'openflowplugin'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
@@ -27,7 +29,7 @@
           scope: 'only'
 
     # Job images
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-standard-4'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
 
     # Features to install
index d9f0d34a64109efc582695a5e67a095b1fc23184..7cb70f9ea0d3fa180f5d8b865ae65edeb3501b78 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: openflowplugin-csit-sanity
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'openflowplugin'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 8f2ed52f4819729c72cf7f421c72e931c8152ea2..381a280525aa4205589b72c70668ae2f1171a707 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-scale-link
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'openflowplugin'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index e25dde647bb5f92d1e0183fd9a58335236baf456..d5caa6758100a9385f912684ca25b6da08018d33 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-scale-switch
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'openflowplugin'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
@@ -25,9 +27,9 @@
           scope: 'only'
 
     # Job images
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-standard-4'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
-    tools_system_flavor: 'v1-performance-2'
+    tools_system_flavor: 'v2-highcpu-2'
 
     # Features to install
     install-features: >
index dc36c678b3e70c4ef806b901b2a939c1a8ef0927..e138893a51d14b9b5b42661a76bee220b3d27203 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-scale
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'openflowplugin'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
@@ -27,7 +29,7 @@
           scope: 'only'
 
     # Job images
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-standard-4'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
 
     # Features to install
index 184a2ae1272c04fa3746a2ec759294b22d58ba81..01a735dccfbeeec4364b1192e0e3cda2d56e6889 100644 (file)
@@ -2,19 +2,22 @@
 - project:
     name: openflowplugin-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'openflowplugin'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
-          os-branch: 'ocata'
+          os-branch: 'queens'
+      - oxygen:
+          branch: 'stable/oxygen'
+          os-branch: 'queens'
       - nitrogen:
           branch: 'stable/nitrogen'
-          os-branch: 'ocata'
+          os-branch: 'pike'
       - carbon:
           branch: 'stable/carbon'
           os-branch: 'ocata'
index 166a55f31c90d61758d7b46ae62f993b6cd5b916..4bc720acb50029e33a897b9c28f7f4aec092afa0 100644 (file)
@@ -1,26 +1,47 @@
 ---
 - project:
-    name: openflowplugin-oxygen
+    name: openflowplugin-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
     mvn-settings: 'openflowplugin-settings'
-    mvn-goals: 'clean install javadoc:aggregate'
+    mvn-goals: 'clean deploy javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: >
+        odlparent-merge-{stream},
+        yangtools-merge-{stream},
+        controller-merge-{stream},
+        openflowjava-merge-{stream}
+    email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
+    archive-artifacts: 'model/*/target/site/**'
+
+    # Used by the release job
+    staging-profile-id: a68a76dc1b44c
+
+- project:
+    name: openflowplugin-oxygen
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: oxygen
+    project: 'openflowplugin'
+    project-name: 'openflowplugin'
+    branch: 'stable/oxygen'
+    build-node: centos7-builder-2c-8g
     build-timeout: 90
+    mvn-settings: 'openflowplugin-settings'
+    mvn-goals: 'clean deploy javadoc:aggregate'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: >
         odlparent-merge-{stream},
         yangtools-merge-{stream},
     name: openflowplugin-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
     mvn-settings: 'openflowplugin-settings'
-    mvn-goals: 'clean install javadoc:aggregate'
+    mvn-goals: 'clean deploy javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: >
         odlparent-merge-{stream},
     name: openflowplugin-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
     karaf-version: 'karaf3'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'openflowplugin-settings'
-    mvn-goals: 'clean install javadoc:aggregate'
+    mvn-goals: 'clean deploy javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: >
         odlparent-merge-{stream},
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
     mvn-settings: 'openflowplugin-settings'
-    mvn-goals: 'clean install javadoc:aggregate'
+    mvn-goals: 'clean deploy javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 94b69ef54d7f36fbbcc0bd492a954b8c419fca99..2ace6c4ad9aacf6c928a3f8f0eaf838835c5ce13 100644 (file)
@@ -6,11 +6,16 @@
       - 'opflex-merge-{stream}'
 
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
+      - oxygen:
+          branch: 'stable/oxygen'
+          libuv-version: '1.8.0'
+          rapidjson-version: '1.0.2'
+          openvswitch-version: '2.6.0'
       - nitrogen:
           branch: 'stable/nitrogen'
           libuv-version: '1.8.0'
@@ -32,7 +37,7 @@
     project-type: freestyle
     node: centos7-builder-2c-8g
     concurrent: true
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
@@ -92,7 +97,7 @@
     name: 'opflex-merge-{stream}'
 
     node: centos7-builder-2c-8g
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
index 1272d6bfadc879c3832f9ce20cf4e317509bb2f1..3d38119e4edc01230e8b3df8b1e1c58932efd0d2 100644 (file)
@@ -5,11 +5,16 @@
       - 'opflex-release-{stream}'
 
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
+      - oxygen:
+          branch: 'stable/oxygen'
+          libuv-version: '1.8.0'
+          rapidjson-version: '1.0.2'
+          openvswitch-version: '2.6.0'
       - nitrogen:
           branch: 'stable/nitrogen'
           libuv-version: '1.8.0'
@@ -39,7 +44,7 @@
     name: 'opflex-release-{stream}'
 
     node: centos7-builder-2c-8g
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     ######################
     # Default parameters #
index 57b3457a5a7ff56478188de70fa2ee75f4a0d047..6e96ffac576e3377971db4e1ffaafe3388ca3951 100644 (file)
@@ -1,24 +1,38 @@
 ---
 - project:
-    name: ovil
+    name: ovil-fluorine
     jobs:
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
       - gerrit-tox-verify
 
+    stream: fluorine
     project: ovil
     project-name: ovil
-    stream:
-      - oxygen:
-          branch: master
+    branch: 'master'
+    mvn-settings: ovil-settings
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+    dependencies: ''
+    email-upstream: '[ovil]'
+
+    # Used by the release job
+    staging-profile-id: 7b48866c207d8
+
+- project:
+    name: ovil-oxygen
+    jobs:
+      - odl-maven-jobs
+      - gerrit-tox-verify
+
+    stream: oxygen
+    project: ovil
+    project-name: ovil
+    branch: 'stable/oxygen'
     mvn-settings: ovil-settings
-    mvn-goals: clean install
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: mvn33
 
     dependencies: ''
     email-upstream: '[ovil]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 7b48866c207d8
@@ -31,5 +45,4 @@
     project-name: 'ovil'
     branch: 'master'
     mvn-settings: 'ovil-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 2fc767152867562d957f17084a4c6136fc195f9d..e0e4969a03c80675c17d29578cfde483abf9de22 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: ovsdb-csit-clustering
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-3node-{functionality}'
+      - inttest-csit-3node
+      - inttest-csit-verify-3node
     # The project name
     project: 'ovsdb'
 
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index ed3744c930e2468003492137ae0602162fb4639a..b88d63f4601330dd51bd1dabb2fe2e4a4ba29990 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: ovsdb-csit-southbound
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
     # The project name
     project: 'ovsdb'
 
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 60473bb322df49fcb79db4fc03befb1cd51b85c1..0e24962d8046d150eafb5cc7030a3ed2717faaa4 100644 (file)
@@ -5,8 +5,10 @@
       - 'ovsdb-daily-full-integration-{stream}'
 
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
@@ -95,7 +97,7 @@
 
     project-type: freestyle
     node: centos7-docker-1c-4g
-    jdk: '{jdk}'
+    jdk: '{java-version}'
     description: >
         Integration tests for the OVSDB project against different versions of
         OVS and branches. This job runs nightly.
index ae1f2b693faa44d7b633d0a78805c55e7907d2e2..8495123cbd9d3d766336dfe1659b1a3bc257073a 100644 (file)
@@ -2,18 +2,21 @@
 - project:
     name: ovsdb-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'ovsdb'
 
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
-          os-branch: 'pike'
+          os-branch: 'queens'
+      - oxygen:
+          branch: 'stable/oxygen'
+          os-branch: 'queens'
       - nitrogen:
           branch: 'stable/nitrogen'
-          os-branch: 'ocata'
+          os-branch: 'pike'
       - carbon:
           branch: 'stable/carbon'
           os-branch: 'ocata'
index 53392a17193e4fd9848cb1de29000a2c7fb73dc9..47413b7095846a3f9e4259633334d64c0b266b6b 100644 (file)
@@ -12,7 +12,7 @@
 
     project-type: freestyle
     node: centos7-docker-1c-4g
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
index 79c14e3504ec321644e25a14cac8bfc57b6cd2fe..60064bd31a1fd7a8b0a577c2812f7e1340c15a30 100644 (file)
@@ -1,28 +1,40 @@
 ---
+- project:
+    name: ovsdb-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'ovsdb'
+    project-name: 'ovsdb'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    mvn-settings: 'ovsdb-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
+
+    # Used by the release job
+    staging-profile-id: a68b188166958
+
 - project:
     name: ovsdb-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'ovsdb'
     project-name: 'ovsdb'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'ovsdb-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68b188166958
     name: ovsdb-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'ovsdb'
     project-name: 'ovsdb'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'ovsdb-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68b188166958
     name: ovsdb-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'ovsdb'
     project-name: 'ovsdb'
     branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'ovsdb-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68b188166958
index a9215e6b2e9e67b3685355af9299c549e1c3295a..0b892c04d353a6c7530d763710b39aeef194a9d8 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: p4plugin-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'p4plugin'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
 
     install:
       - all:
index e7e89ea6a75dfc307bbe7058893a031525be0604..90802ab7385a9fa728cac918291c36510459e038 100644 (file)
@@ -1,28 +1,38 @@
 ---
+- project:
+    name: p4plugin-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'p4plugin'
+    project-name: 'p4plugin'
+    branch: 'master'
+    mvn-settings: 'p4plugin-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[p4plugin]'
+
+    # Used by the release job
+    staging-profile-id: a68bf26e208d4
+
 - project:
     name: p4plugin-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'p4plugin'
     project-name: 'p4plugin'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'p4plugin-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[p4plugin]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68bf26e208d4
@@ -36,5 +46,4 @@
     project-name: 'p4plugin'
     branch: 'master'
     mvn-settings: 'p4plugin-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/packaging/build-rpm-snap-docker.sh b/jjb/packaging/build-rpm-snap-docker.sh
new file mode 100644 (file)
index 0000000..871d2c2
--- /dev/null
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Options:
+#   -x: Echo commands
+#   -e: Fail on errors
+#   -o pipefail: Fail on errors in scripts this calls, give stacktrace
+set -ex -o pipefail
+
+env | grep STREAM > env-file
+
+scripts_path=/builder/jjb/packaging
+
+if [ "$DISTRO" == "epel-7" ]; then
+  docker_id=$(sudo docker run --env-file env-file --name build_rpm_epel -di --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro centos /usr/lib/systemd/systemd)
+  sudo docker exec $docker_id /usr/bin/yum -y install sudo rpmdevtools rpmbuild git python-virtualenv python
+elif [ "$DISTRO" == "opensuse-42" ]; then
+  docker_id=$(sudo docker run --env-file env-file --name build_rpm_suse -di --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro opensuse /usr/lib/systemd/systemd)
+  sudo docker exec $docker_id /usr/bin/zypper -n install sudo rpmdevtools rpmbuild git python-virtualenv python
+fi
+
+sudo docker cp "$(pwd)"/packaging/ $docker_id:/packaging
+
+sudo docker exec $docker_id git clone https://git.opendaylight.org/gerrit/releng/builder
+
+sudo docker exec $docker_id /bin/bash $scripts_path/build-rpm-snap.sh
index 64c8ff1f08db2eaead6dd80e5e7c7b4f068d244b..bcb79b5f8330ac1f28cc4fa7c8444a596b03f2d4 100644 (file)
@@ -21,6 +21,8 @@ elif [ "$STREAM" == "nitrogen" ]; then
   VERSION_MAJOR=7
 elif [ "$STREAM" == "oxygen" ]; then
   VERSION_MAJOR=8
+elif [ "$STREAM" == "fluorine" ]; then
+  VERSION_MAJOR=9
 else
   echo "Unable to convert stream to major version"
   exit 1
@@ -33,17 +35,3 @@ fi
                                          latest_snap \
                                          --major "$VERSION_MAJOR"
 
-# Publish RPMs to Nexus if in production Jenkins, else host on sandbox Jenkins
-if [ "$SILO" == "sandbox" ]; then
-  # TODO: Host RPMs on Jenkins temporarily
-  echo "Not uploading RPMs to Nexus because running in sandbox"
-elif  [ "$SILO" == "releng" ]; then
-  # Move RPMs (SRPM and noarch) to dir of files that will be uploaded to Nexus
-  UPLOAD_FILES_PATH="$WORKSPACE/upload_files"
-  mkdir -p "$UPLOAD_FILES_PATH"
-  cp "/home/$USER/rpmbuild/RPMS/noarch/"*.rpm "$_"
-  cp "/home/$USER/rpmbuild/SRPMS/"*.rpm "$_"
-else
-  echo "Unknown Jenkins silo: $SILO"
-  exit 1
-fi
index 9218d5a5fba25473e9554206c554ddfe5524354f..e5066a498036564a9aac8333529ed9d1f4b3e3b5 100644 (file)
@@ -20,10 +20,10 @@ $PYTHON -m pip install -r "$WORKSPACE/packaging/packages/requirements.txt"
 # If URL is to zip, check if there's a tar.gz available to avoid repackaging.
 if [[ $DOWNLOAD_URL = *.zip ]]; then
   # shellcheck disable=SC2154
-  candidate_tarball_url="${{DOWNLOAD_URL//zip/tar.gz}}"
+  candidate_tarball_url="${DOWNLOAD_URL//zip/tar.gz}"
   # shellcheck disable=SC2154
   url_status=$(curl --silent --head --location --output /dev/null --write-out \
-    '%{{http_code}}' "$candidate_tarball_url")
+    '%{http_code}' "$candidate_tarball_url")
   if [[ $url_status = 2* ]]; then
     DOWNLOAD_URL="$candidate_tarball_url"
   fi
@@ -43,8 +43,8 @@ elif  [ "$SILO" == "releng" ]; then
   # Move RPMs (SRPM and noarch) to dir of files that will be uploaded to Nexus
   UPLOAD_FILES_PATH="$WORKSPACE/upload_files"
   mkdir -p "$UPLOAD_FILES_PATH"
-  cp "/home/$USER/rpmbuild/RPMS/noarch/"*.rpm "$_"
-  cp "/home/$USER/rpmbuild/SRPMS/"*.rpm "$_"
+  cp "$HOME/rpmbuild/RPMS/noarch/"*.rpm "$_"
+  cp "$HOME/rpmbuild/SRPMS/"*.rpm "$_"
 else
   echo "Unknown Jenkins silo: $SILO"
   exit 1
index 2ccc50078f18452dfe42bc5aabf50aa3d3c1d9a7..6112a2a78d7d27b5bad180cc3431e38e71db6bc6 100644 (file)
@@ -6,23 +6,49 @@
 #   -o pipefail: Fail on errors in scripts this calls, give stacktrace
 set -ex -o pipefail
 
-# Update mirror list to avoid slow/hung one
-sudo yum update -y yum-plugin-fastestmirror
+# Use local RPM in build-out dir if URL not passed
+URL=${URL:-"$HOME/rpmbuild/RPMS/noarch/*.rpm"}
 
-# Install ODL from RPM path, RPM URL or .repo file url
-# NB: Paths must be anchored at root
-if [[ $URL == /*  ]]; then
-  # If path is globbed (/path/to/*.rpm), expand it
-  path=$(sudo find / -wholename $URL)
-  sudo yum install -y "$path"
-elif [[ $URL == *.rpm ]]; then
-  sudo yum install -y "$URL"
-elif [[ $URL == *.repo ]]; then
-  # shellcheck disable=SC2154
-  repo_file="${{URL##*/}}"
-  sudo curl --silent -o /etc/yum.repos.d/"$repo_file" "$URL"
-  sudo yum install -y opendaylight
+if [ -f /usr/bin/yum ]; then
+  # Update mirror list to avoid slow/hung one
+  sudo yum update -y yum-plugin-fastestmirror
+
+  # Install ODL from RPM path, RPM URL or .repo file url
+  # NB: Paths must be anchored at root
+  if [[ $URL == /*  ]]; then
+    # If path is globbed (/path/to/*.rpm), expand it
+    path=$(sudo find / -wholename $URL)
+    sudo yum install -y "$path"
+  elif [[ $URL == *.rpm ]]; then
+    sudo yum install -y "$URL"
+  elif [[ $URL == *.repo ]]; then
+    # shellcheck disable=SC2154
+    repo_file="${URL##*/}"
+    sudo curl --silent -o /etc/yum.repos.d/"$repo_file" "$URL"
+    sudo yum install -y opendaylight
+  else
+    echo "URL is not a link to .rpm or .repo"
+    exit 1
+  fi
+elif [ -f /usr/bin/zypper ]; then
+  # Install ODL from RPM path, RPM URL or .repo file url
+  # NB: Paths must be anchored at root
+  if [[ $URL == /*  ]]; then
+    # If path is globbed (/path/to/*.rpm), expand it
+    path=$(sudo find /root -wholename $URL)
+    sudo zypper -n --no-gpg-checks install "$path"
+  elif [[ $URL == *.rpm ]]; then
+    sudo zypper -n --no-gpg-checks install "$URL"
+  elif [[ $URL == *.repo ]]; then
+    # shellcheck disable=SC2154
+    repo_file="${URL##*/}"
+    sudo curl --silent -o /etc/zypp/repos.d/"$repo_file" "$URL"
+    sudo zypper -n --no-gpg-checks install opendaylight
+  else
+    echo "URL is not a link to .rpm or .repo"
+    exit 1
+  fi
 else
-  echo "URL is not a link to .rpm or .repo"
+  echo "The package manager is not supported (not yum or zypper)"
   exit 1
 fi
diff --git a/jjb/packaging/packaging-macros.yaml b/jjb/packaging/packaging-macros.yaml
new file mode 100644 (file)
index 0000000..5abfaf2
--- /dev/null
@@ -0,0 +1,24 @@
+# Integration/Packaging macros
+---
+- builder:
+    name: install-test-uninstall-rpm
+    builders:
+      - inject:
+          properties-content: 'URL=/home/$USER/rpmbuild/RPMS/noarch/*.rpm'
+      # Install deps needed interactive Karaf shell tests
+      - shell: |
+          # Install expect to interact with Karaf shell
+          # Install nmap to check status of ODL's SSH port
+          sudo yum install -y expect nmap
+      - shell: !include-raw: test-rpm-deps.sh
+      - shell: !include-raw: install-rpm.sh
+      - shell: !include-raw: start-odl.sh
+      - shell: !include-raw: test-ports-nofeature.sh
+      - shell: !include-raw: test-karaf-oxygensafe.expect
+      # Disable this test until ODLPARENT-139 is fixed
+      # - shell: !include-raw: test-rest-ok.sh
+      - shell: !include-raw: stop-odl.sh
+      - shell: !include-raw: uninstall-rpm.sh
+      - shell: |
+          # Remove old host key so future installs don't fail to SSH
+          rm /home/jenkins/.ssh/known_hosts || echo "No known_hosts file"
index c51975138c695791c7db4a69ac08273cdfb4311f..8a7c0b0ee2e37c5a199faae5bf42c63cd33cd749 100644 (file)
@@ -5,21 +5,27 @@
 
     jobs:
       - 'packaging-build-rpm-{stream}'
-      - 'packaging-build-rpm-snap-{stream}'
+      - 'packaging-build-rpm-{distro}-snap-{stream}'
       - 'packaging-build-deb-{stream}'
       - 'packaging-verify-full-rpm-master'
       - 'packaging-verify-rpm-master'
       - 'packaging-test-rpm-master'
       - 'packaging-test-rpm-upgrade-master'
       - 'packaging-test-deb-master'
-      - gerrit-tox-verify
+      - gerrit-tox-verify:
+          branch: master
+          stream: master
 
     project: 'integration/packaging'
 
     stream:
+      - fluorine
       - carbon
       - nitrogen
       - oxygen
+    distro:
+      - opensuse-42
+      - epel-7
     branch: 'master'
 
     # common parameters required for 'lf-infra-deploy-maven-file' builder
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: build-rpm.sh
-      - shell: !include-raw: test-rpm-deps.sh
-      - inject:
-          properties-content: 'URL=/home/$USER/rpmbuild/RPMS/noarch/*.rpm'
-      - shell: !include-raw: install-rpm.sh
-      - shell: !include-raw: start-odl.sh
-      - shell: |
-          # Install expect to interact with Karaf shell
-          sudo yum install -y expect
-          # Install nmap to check status of ODL's SSH port
-          sudo yum install -y nmap
-      - shell: !include-raw: test-karaf.expect
-      - shell: !include-raw: stop-odl.sh
+      - shell: !include-raw-escape: build-rpm.sh
+      - install-test-uninstall-rpm
       - lf-infra-deploy-maven-file:
           global-settings-file: 'global-settings'
           settings-file: 'packaging-settings'
 
 
 - job-template:
-    name: 'packaging-build-rpm-snap-{stream}'
+    name: 'packaging-build-rpm-{distro}-snap-{stream}'
 
-    node: centos7-builder-2c-8g
+    node: centos7-docker-2c-8g
 
     project-type: freestyle
 
 
     builders:
       - inject:
-          properties-content: 'STREAM={stream}'
-      - shell: !include-raw: build-rpm-snap.sh
-      - shell: !include-raw: test-rpm-deps.sh
+          properties-content: |
+              STREAM={stream}
+              DISTRO={distro}
+      - shell: !include-raw: build-rpm-snap-docker.sh
+      - shell: !include-raw: test-rpm-docker.sh
       - lf-infra-deploy-maven-file:
           global-settings-file: 'global-settings'
           settings-file: 'packaging-settings'
           mvn-version: '{mvn-version}'
-          repo-id: 'opendaylight-{stream}-epel-7-x86_64-devel'
+          repo-id: 'opendaylight-{stream}-{distro}-x86_64-devel'
           group-id: '{group-id}'
           upload-files-dir: '{upload-files-dir}'
           maven-repo-url: '{maven-repo-url}'
           build-timeout: '{build-timeout}'
 
     builders:
-      # TODO: Install/test each RPM? Will require builder script changes.
       # Test Nitrogen 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.7.0/karaf-0.7.0.tar.gz'
-      - shell: !include-raw: build-rpm.sh
+      - shell: !include-raw-escape: build-rpm.sh
+      - install-test-uninstall-rpm
 
       # Test Oxygen pre-release autorelease tarball
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2052/org/opendaylight/integration/karaf/0.8.0/karaf-0.8.0.tar.gz'
-      - shell: !include-raw: build-rpm.sh
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2106/org/opendaylight/integration/karaf/0.8.0/karaf-0.8.0.tar.gz'
+      - shell: !include-raw-escape: build-rpm.sh
+      - install-test-uninstall-rpm
 
       # Test Oxygen multipatch zip (no parallel tarball available)
       - 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.8.0-SNAPSHOT/karaf-0.8.0-20171128.175421-68.zip'
-      - shell: !include-raw: build-rpm.sh
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.0-SNAPSHOT/karaf-0.8.0-20180305.133042-180.zip'
+      - shell: !include-raw-escape: build-rpm.sh
+      - install-test-uninstall-rpm
 
       # Test latest Oxygen snapshot
       - inject:
           properties-content: 'STREAM=oxygen'
       - shell: !include-raw: build-rpm-snap.sh
+      - install-test-uninstall-rpm
 
     triggers:
       - gerrit:
           server-name: '{gerrit-server-name}'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'rpm-verify'
           projects:
             - project-compare-type: ANT
               project-pattern: '{project}'
           build-timeout: '{build-timeout}'
 
     builders:
-      # TODO: Install/test each RPM. Will require builder script changes.
       # Test Carbon SR2 tarball
       - inject:
           # yamllint disable-line rule:line-length
           properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.6.2-Carbon/distribution-karaf-0.6.2-Carbon.tar.gz'
-      - shell: !include-raw: build-rpm.sh
+      - shell: !include-raw-escape: build-rpm.sh
+      - install-test-uninstall-rpm
 
       # Test Carbon multipatch zip (no parallel tarball available)
+      # 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/distribution-karaf/0.6.3-SNAPSHOT/distribution-karaf-0.6.3-20171128.221258-1.zip'
-      - shell: !include-raw: build-rpm.sh
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/distribution-karaf/0.6.4-SNAPSHOT/distribution-karaf-0.6.4-20180305.151247-2.zip'
+      - shell: !include-raw-escape: build-rpm.sh
+      - install-test-uninstall-rpm
 
       # Test latest Carbon snapshot
       - inject:
           properties-content: 'STREAM=carbon'
       - shell: !include-raw: build-rpm-snap.sh
+      - install-test-uninstall-rpm
 
       # Test Nitrogen 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.7.0/karaf-0.7.0.tar.gz'
-      - shell: !include-raw: build-rpm.sh
+      - shell: !include-raw-escape: build-rpm.sh
+      - install-test-uninstall-rpm
 
       # Test Nitrogen SR1 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.7.1/karaf-0.7.1.tar.gz'
-      - shell: !include-raw: build-rpm.sh
+      - shell: !include-raw-escape: build-rpm.sh
+      - install-test-uninstall-rpm
 
       # Test Nitrogen multipatch zip (no parallel tarball available)
+      # 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.7.2-SNAPSHOT/karaf-0.7.2-20171128.223150-2.zip'
-      - shell: !include-raw: build-rpm.sh
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.7.3-SNAPSHOT/karaf-0.7.3-20180305.153647-3.zip'
+      - shell: !include-raw-escape: build-rpm.sh
+      - install-test-uninstall-rpm
 
       # Test latest Nitrogen snapshot
       - inject:
           properties-content: 'STREAM=nitrogen'
       - shell: !include-raw: build-rpm-snap.sh
+      - install-test-uninstall-rpm
 
       # Test Oxygen pre-release autorelease tarball
+      # 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-2052/org/opendaylight/integration/karaf/0.8.0/karaf-0.8.0.tar.gz'
-      - shell: !include-raw: build-rpm.sh
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2106/org/opendaylight/integration/karaf/0.8.0/karaf-0.8.0.tar.gz'
+      - shell: !include-raw-escape: build-rpm.sh
+      - install-test-uninstall-rpm
 
       # Test Oxygen multipatch zip (no parallel tarball available)
+      # 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.8.0-SNAPSHOT/karaf-0.8.0-20171128.175421-68.zip'
-      - shell: !include-raw: build-rpm.sh
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.0-SNAPSHOT/karaf-0.8.0-20180305.133042-180.zip'
+      - shell: !include-raw-escape: build-rpm.sh
+      - install-test-uninstall-rpm
 
       # Test latest Oxygen snapshot
       - inject:
           properties-content: 'STREAM=oxygen'
       - shell: !include-raw: build-rpm-snap.sh
+      - install-test-uninstall-rpm
 
     triggers:
       - timed: '@daily'
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: install-rpm.sh
-      - shell: !include-raw: start-odl.sh
       - shell: |
           # Install expect to interact with Karaf shell
-          sudo yum install -y expect
           # Install nmap to check status of ODL's SSH port
-          sudo yum install -y nmap
-      - shell: !include-raw: test-karaf.expect
+          sudo yum install -y expect nmap
+      - shell: !include-raw-escape: install-rpm.sh
+      - shell: !include-raw: start-odl.sh
+      - shell: !include-raw-escape: test-ports-nofeature.sh
+      - shell: !include-raw: test-karaf-oxygensafe.expect
+      # Disable this test until ODLPARENT-139 is fixed
+      # - shell: !include-raw-escape: test-rest-ok.sh
       - shell: !include-raw: stop-odl.sh
+      - shell: !include-raw: uninstall-rpm.sh
 
     publishers:
       # TODO: Remove the archive publisher
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: install-rpm.sh
+      - shell: !include-raw-escape: install-rpm.sh
       - shell: !include-raw: start-odl.sh
       - shell: |
           # Install expect to interact with Karaf shell
           sudo yum install -y expect
           # Install nmap to check status of ODL's SSH port
           sudo yum install -y nmap
-      - shell: !include-raw: test-karaf.expect
+      - shell: !include-raw: test-karaf-oxygensafe.expect
       - shell: !include-raw: stop-odl.sh
       - shell: !include-raw: test-rpm-upgrade.sh
       - shell: !include-raw: start-odl.sh
-      - shell: !include-raw: test-karaf.expect
+      - shell: !include-raw: test-karaf-oxygensafe.expect
       - shell: !include-raw: stop-odl.sh
+      - shell: !include-raw: uninstall-rpm.sh
 
     publishers:
       - lf-infra-publish
           artifacts: '{archive-artifacts}'
       - string:
           name: PACKAGE
-          default: 'ppa:odl-team/carbon'
+          default: 'ppa:odl-team/nitrogen'
           description: 'Link to .deb package or name of PPA repo'
 
     scm:
           sudo apt-get install -y expect
           # Install nmap to check status of ODL's SSH port
           sudo apt-get install -y nmap
-      - shell: !include-raw: test-karaf.expect
+      - shell: !include-raw: test-karaf-oxygensafe.expect
       - shell: !include-raw: stop-odl.sh
 
     publishers:
index 1e09b8f18e61f1082b49867c207924b2ad705361..ada5622d4fc0c2f76d016ae16c688dd89158c085 100644 (file)
@@ -12,5 +12,11 @@ sudo systemctl start opendaylight
 # Check systemd status of OpenDaylight, will fail if rc is nonzero
 sudo systemctl status opendaylight
 
+# Wait up to 60 seconds for ODL's Java process to start
+for i in $(seq 20); do
+  pgrep java && break || sleep 3
+  echo "Waited $((i * 3)) seconds for ODL Java process to start"
+done
+
 # Verify Java process is running, will fail if rc is nonzero
 pgrep java
index 912a91f52f118906a8fa861fdcc302096e1efabc..c9e617db4c058a6061b79d86aa0252b70b1a8da1 100644 (file)
@@ -30,6 +30,6 @@ sudo apt-get install -y ansible
 sudo cp -R $WORKSPACE/ansible /etc/ansible/roles/opendaylight
 
 # Install OpenDaylight via repo using example Ansible playbook
-sudo ansible-playbook -i "localhost," -c local $WORKSPACE/ansible/examples/deb_repo_install_playbook.yml
+sudo ansible-playbook -i "localhost," -c local $WORKSPACE/ansible/examples/deb_repo.yml
 
 # Add more tests
index b1588a1cd56b3b5ff63d52171581747956667701..d408377c62d35c0b5714ed34bffa893da2581c68 100644 (file)
@@ -23,6 +23,6 @@ sudo yum install -y ansible
 sudo cp -R $WORKSPACE/ansible /etc/ansible/roles/opendaylight
 
 # Install OpenDaylight via repo using example Ansible playbook
-sudo ansible-playbook -i "localhost," -c local $WORKSPACE/ansible/examples/odl_6_testing_playbook.yml
+sudo ansible-playbook -i "localhost," -c local $WORKSPACE/ansible/examples/rpm_8_devel.yml
 
 # Add more tests
diff --git a/jjb/packaging/test-karaf-oxygensafe.expect b/jjb/packaging/test-karaf-oxygensafe.expect
new file mode 100644 (file)
index 0000000..8b5fbcd
--- /dev/null
@@ -0,0 +1,68 @@
+#!/usr/bin/expect
+# This script starts the Karaf shell and sends the password for SSH auth.
+# Further tests in Karaf shell can be done here
+
+# Echo commands
+log_user 1
+
+# Time expect will wait for output
+set timeout 30
+
+# Default password
+set password "karaf"
+# Default prompt
+set prompt "opendaylight-user@root>"
+
+# Wait for Karaf SSH server to come online
+send_user "Waiting on OpenDaylight to start listening for SSH on port 8101\n"
+exec bash -c "while ! nmap -Pn -p8101 localhost | grep -q open; do sleep 0.1; done"
+
+# SSH into Karaf shell
+spawn ssh -p 8101 -o StrictHostKeyChecking=no karaf@127.0.0.1
+
+# Auth to Karaf shell
+expect "Password authentication"
+expect "Password: "
+send "$password\r"
+
+# Show features to make debugging easier
+expect "$prompt"
+send "feature:list\r"
+
+# Verify that a major feature is present
+expect "$prompt"
+send "feature:list | grep odl-netvirt-openstack\r"
+expect {{
+  timeout {{
+    send_user "\nTest feature not found\n"
+    exit 1
+  }}
+  "OpenDaylight :: NetVirt :: OpenStack" {{
+    send_user "\nTest feature available\n"
+  }}
+}}
+
+# Disable this test until ODLPARENT-139 is fixed
+# Install feature
+# expect "$prompt"
+# send "feature:install odl-netvirt-openstack\r"
+# expect {{
+#   "Error executing command: Can't install feature" {{
+#     send_user "\nFailed to install test feature\n"
+#     exit 1
+#   }}
+# }}
+
+# Verify installed feature is actually installed
+# expect "$prompt"
+# The -i flag will only show installed features
+# send "feature:list -i | grep odl-netvirt-openstack\r"
+# expect {{
+#   timeout {{
+#     send_user "\nTest feature not installed\n"
+#     exit 1
+#   }}
+#   "OpenDaylight :: NetVirt :: OpenStack" {{
+#     send_user "\nTest feature installed successfully\n"
+#   }}
+# }}
index 5368e208ba57916312e1457b357b91a742185b68..fcbfaf64794971485ba70b4dd9f621cfa321738e 100644 (file)
@@ -54,7 +54,7 @@ expect {{
 
 # Verify installed feature is actually installed
 expect "$prompt"
-# The -i flag will only show installed features
+# The -i flag will show only installed features
 send "feature:list -i | grep odl-netvirt-openstack\r"
 expect {{
   timeout {{
diff --git a/jjb/packaging/test-ports-nofeature.sh b/jjb/packaging/test-ports-nofeature.sh
new file mode 100644 (file)
index 0000000..a6cc205
--- /dev/null
@@ -0,0 +1,73 @@
+#!/bin/bash
+
+# Options:
+#   -x: Echo commands
+#   -e: Fail on errors
+#   -o pipefail: Fail on errors in scripts this calls, give stacktrace
+set -ex -o pipefail
+
+# Ports that should be open after ODL is started with default features
+# Port 1099: Karaf rmiRegistryPort
+# Port 8101: Karaf SSH Shell port
+# Port 44444: Karaf rmiServerPort
+declare -a expected_ports=("1099" "8101" "44444")
+
+# Ports that should only be open after odl-nevirt-openstack is installed
+# 8080 is Nitrogen and Carbon only, not Oxygen
+declare -a unexpected_ports=("2550" "6633" "6640" "6644" "6653" "8080" "8181" "8185")
+
+# Make sure expected ports open
+COUNT="0"
+while true; do
+    open_ports=()
+    closed_ports=()
+    for port in "${expected_ports[@]}"
+    do
+        if nmap -Pn -p$port localhost | grep -q open; then
+            echo "Port $port is open"
+            open_ports+=("$port")
+        else
+            echo "Port $port is not yet open"
+            closed_ports+=("$port")
+        fi
+    done
+    if [[ ${#open_ports[@]} -eq ${#expected_ports[@]} && ${#closed_ports[@]} -eq 0 ]]; then
+        echo "All expected ports are open"
+        echo "Open ports:"
+        printf '%s\n' "${open_ports[@]}"
+        echo "Closed ports:"
+        printf '%s\n' "${closed_ports[@]}"
+        break
+    elif [ $COUNT -gt 300 ]; then
+        echo "Timeout waiting ports to open"
+        echo "Open ports:"
+        printf '%s\n' "${open_ports[@]}"
+        echo "Closed ports:"
+        printf '%s\n' "${closed_ports[@]}"
+        exit 1
+    else
+        ((COUNT+=5))
+        sleep 5
+    fi
+done
+
+# Make sure unexpected ports are not open
+open_ports=()
+closed_ports=()
+for port in "${unexpected_ports[@]}"
+do
+    if nmap -Pn -p$port localhost | grep -q open; then
+        echo "Port $port is open"
+        open_ports+=("$port")
+    else
+        echo "Port $port is not open"
+        closed_ports+=("$port")
+    fi
+done
+if [[ ${#closed_ports[@]} -eq ${#unexpected_ports[@]} && ${#open_ports[@]} -eq 0 ]]; then
+    echo "No unexpected ports are open"
+    echo "Open ports:"
+    printf '%s\n' "${open_ports[@]}"
+    echo "Closed ports:"
+    printf '%s\n' "${closed_ports[@]}"
+fi
diff --git a/jjb/packaging/test-rest-ok.sh b/jjb/packaging/test-rest-ok.sh
new file mode 100644 (file)
index 0000000..a2ed5e5
--- /dev/null
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Options:
+#   -x: Echo commands
+#   -e: Fail on errors
+#   -o pipefail: Fail on errors in scripts this calls, give stacktrace
+set -ex -o pipefail
+
+echo "Waiting for ODL REST API to come up..."
+COUNT="0"
+while true; do
+    # Will fail if 8181 isn't open, check for that first
+    RESP=$( curl --user admin:admin --silent --head --output /dev/null --write-out '%{http_code}' http://localhost:8181/restconf/modules )
+    echo "Curl of ODL REST API HTTP response code: $RESP"
+    if [[ $RESP = *200* ]]; then
+        echo "ODL REST API returned 200"
+        break
+    elif [ $COUNT -gt 120 ]; then
+        echo "Timeout waiting for HTTP 200 from REST API"
+        exit 1
+    else
+        ((COUNT+=1))
+        sleep 1
+    fi
+done
index 6def490d0721d740f4215ee6ab3ca72979f3b0b5..982fb5c27c564d8c12e0a0254cc406ccef895286 100644 (file)
@@ -7,12 +7,16 @@
 set -ex -o pipefail
 
 # Verify exactly 1 RPM is in the path we expect
-set -- /home/$USER/rpmbuild/RPMS/noarch/*.rpm
-# shellcheck disable=SC1054
-[ $# -eq 1 ] || {{ echo "Expected 1 RPM, found $#"; exit 1; }}
+set -- $HOME/rpmbuild/RPMS/noarch/*.rpm
+if [ $# -eq 1 ]; then
+    echo "Found one RPM in build out dir, as expected"
+else
+    echo "Expected 1 RPM, found $#"
+    echo 1
+fi
 
 # If path is globbed (/path/to/*.rpm), expand it
-path=$(sudo find / -wholename /home/$USER/rpmbuild/RPMS/noarch/*.rpm)
+path=$(sudo find / -wholename $HOME/rpmbuild/RPMS/noarch/*.rpm)
 
 # If no RPM found, fail clearly
 if [ -z $path ]; then
@@ -20,18 +24,31 @@ if [ -z $path ]; then
     exit 1
 fi
 
-# Requirements for package where SRPM was built into noarch on CentOS CBS
-# rpm -qp opendaylight-8.0.0-0.1.20171125rel2049.el7.noarch.rpm --requires
-# shellcheck disable=SC2034
-declare -a expected_deps=( "/bin/bash"
-                           "/bin/sh"
-                           "java >= 1:1.8.0"
-                           "rpmlib(CompressedFileNames) <= 3.0.4-1"
-                           "rpmlib(FileDigests) <= 4.6.0-1"
-                           "rpmlib(PartialHardlinkSets) <= 4.0.4-1"
-                           "rpmlib(PayloadFilesHavePrefix) <= 4.0-1"
-                           "shadow-utils"
-                           "rpmlib(PayloadIsXz) <= 5.2-1" )
+
+if [ -f /usr/bin/yum ]; then
+  # Requirements for package where SRPM was built into noarch on CentOS CBS
+  # rpm -qp opendaylight-8.0.0-0.1.20171125rel2049.el7.noarch.rpm --requires
+  # shellcheck disable=SC2034
+  declare -a expected_deps=( "/bin/bash"
+                             "/bin/sh"
+                             "java >= 1:1.8.0"
+                             "rpmlib(CompressedFileNames) <= 3.0.4-1"
+                             "rpmlib(FileDigests) <= 4.6.0-1"
+                             "rpmlib(PartialHardlinkSets) <= 4.0.4-1"
+                             "rpmlib(PayloadFilesHavePrefix) <= 4.0-1"
+                             "shadow-utils"
+                             "rpmlib(PayloadIsXz) <= 5.2-1" )
+
+elif [ -f /usr/bin/zypper ]; then
+  declare -a expected_deps=( "/bin/bash"
+                             "/bin/sh"
+                             "java >= 1.8.0"
+                             "rpmlib(CompressedFileNames) <= 3.0.4-1"
+                             "rpmlib(PayloadFilesHavePrefix) <= 4.0-1"
+                             "shadow"
+                             "rpmlib(PayloadIsLzma) <= 4.4.6-1" )
+
+fi
 
 # Karaf 4 distros also have a /usr/bin/env requirement INTPAK-120
 if [[ ! $path == *opendaylight-6*  ]]; then
@@ -39,18 +56,19 @@ if [[ ! $path == *opendaylight-6*  ]]; then
 fi
 
 # shellcheck disable=SC2034
-mapfile -t actual_deps < <( rpm -qp /home/$USER/rpmbuild/RPMS/noarch/*.rpm --requires )
+mapfile -t actual_deps < <( rpm -qp $HOME/rpmbuild/RPMS/noarch/*.rpm --requires )
 # shellcheck disable=SC2154 disable=SC2145
-printf 'Dependency found: %s\n' "${{actual_deps[@]}}"
+printf 'Dependency found: %s\n' "${actual_deps[@]}"
 
 # shellcheck disable=SC2154,SC2145,SC2034,SC2207
-diff_deps=(`echo "${{expected_deps[@]}}" "${{actual_deps[@]}}" | tr ' ' '\n' | sort | uniq -u`)
+diff_deps=(`echo "${expected_deps[@]}" "${actual_deps[@]}" | tr ' ' '\n' | sort | uniq -u`)
+
 # shellcheck disable=SC2154 disable=SC2145 disable=SC2068 disable=SC2170 disable=SC1083
-if [ ${{#diff_deps[*]}} -eq 0 ]; then
+if [ ${#diff_deps[*]} -eq 0 ]; then
     echo "RPM requirements are as expected"
 else
     echo "RPM requirements don't match the expected requirements"
     # shellcheck disable=SC2154 disable=SC2145
-    printf 'Dependency mismatch: %s\n' ${{diff_deps[@]}}
+    printf 'Dependency mismatch: %s\n' ${diff_deps[@]}
     exit 1
 fi
diff --git a/jjb/packaging/test-rpm-docker.sh b/jjb/packaging/test-rpm-docker.sh
new file mode 100644 (file)
index 0000000..a5c15f4
--- /dev/null
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# Options:
+#   -x: Echo commands
+#   -e: Fail on errors
+#   -o pipefail: Fail on errors in scripts this calls, give stacktrace
+set -ex -o pipefail
+
+scripts_path=/builder/jjb/packaging
+
+# A docker container must have been created by the build script
+if [ "$DISTRO" == "epel-7" ]; then
+  docker_id=$(sudo docker ps -qf name=build_rpm_epel)
+  sudo docker exec $docker_id /usr/bin/yum -y install curl expect nmap openssh
+elif [ "$DISTRO" == "opensuse-42" ]; then
+  docker_id=$(sudo docker ps -qf name=build_rpm_suse)
+  sudo docker exec $docker_id /usr/bin/zypper -n install curl expect nmap openssh
+fi
+
+sudo docker exec $docker_id /bin/bash $scripts_path/test-rpm-deps.sh
+
+sudo docker exec $docker_id /bin/bash $scripts_path/install-rpm.sh
+
+sudo docker exec $docker_id /bin/bash $scripts_path/start-odl.sh
+
+sudo docker exec $docker_id /bin/bash $scripts_path/test-ports-nofeature.sh
+
+# Don't install test feature and check REST for Oxygen, ODLPARENT-139 breaks it
+if [ "$STREAM" == "oxygen" ]; then
+  sudo docker exec $docker_id /usr/bin/expect $scripts_path/test-karaf-oxygensafe.expect
+else
+  sudo docker exec $docker_id /usr/bin/expect $scripts_path/test-karaf.expect
+  sudo docker exec $docker_id /bin/bash $scripts_path/test-rest-ok.sh
+fi
+
+sudo docker exec $docker_id /bin/bash $scripts_path/stop-odl.sh
+
+sudo docker exec $docker_id /bin/bash $scripts_path/uninstall-rpm.sh
+
+if [ "$SILO" == "sandbox" ]; then
+  echo "Not uploading RPMs to Nexus because running in sandbox"
+elif [ "$SILO" == "releng" ]; then
+  RPM_NAME=$(sudo docker exec $docker_id find /root/rpmbuild/RPMS/noarch/ -wholename '*.rpm')
+  SRPM_NAME=$(sudo docker exec $docker_id find /root/rpmbuild/SRPMS/ -wholename '*.rpm')
+  UPLOAD_FILES_PATH="$WORKSPACE/upload_files"
+  mkdir -p "$UPLOAD_FILES_PATH"
+  sudo docker cp $docker_id:$RPM_NAME "$_"
+  sudo docker cp $docker_id:$SRPM_NAME "$_"
+else
+  echo "Unknown Jenkins silo: $SILO"
+  exit 1
+fi
diff --git a/jjb/packaging/uninstall-rpm.sh b/jjb/packaging/uninstall-rpm.sh
new file mode 100644 (file)
index 0000000..0b339a8
--- /dev/null
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# Options:
+#   -x: Echo commands
+#   -e: Fail on errors
+#   -o pipefail: Fail on errors in scripts this calls, give stacktrace
+set -ex -o pipefail
+
+if [ -f /usr/bin/yum ]; then
+  # Uninstall ODL
+  sudo yum remove -y opendaylight
+
+  # Verify ODL not installed
+  if yum list installed opendaylight; then
+    # Fail if exit code 0, ie ODL is still installed
+    echo "OpenDaylight unexpectedly still installed"
+    exit 1
+  else
+    echo "OpenDaylight not installed, as expected"
+  fi
+elif [ -f /usr/bin/zypper ]; then
+  # Uninstall ODL
+  sudo zypper -n remove opendaylight
+
+  # Verify ODL not installed
+  if zypper search --installed-only opendaylight; then
+    # Fail if exit code 0, ie ODL is still installed
+    echo "OpenDaylight unexpectedly still installed"
+    exit 1
+  else
+    echo "OpenDaylight not installed, as expected"
+  fi
+else
+  echo "The package manager is not supported (not yum or zypper)"
+  exit 1
+fi
index 671609f2d6b1dbb694c1e6979bfa976082a1e1a1..13eb0eb1f2ce91c49912c104b750295f61f8e444 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: packetcable-csit-pcmm
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'packetcable'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 9022c073abbf6ff1bfbc8cc8c15da2c5591c7ec4..14a83cd2283ed95041c31c3b7f03f4c0f477bb7f 100644 (file)
@@ -1,27 +1,36 @@
 ---
+- project:
+    name: packetcable-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'packetcable'
+    project-name: 'packetcable'
+    branch: 'master'
+    mvn-settings: 'packetcable-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[packetcable]'
+
+    # Used by the release job
+    staging-profile-id: a68ca4a24655c
+
 - project:
     name: packetcable-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'packetcable'
     project-name: 'packetcable'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'packetcable-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[packetcable]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68ca4a24655c
     name: packetcable-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'packetcable'
     project-name: 'packetcable'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'packetcable-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[packetcable]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68ca4a24655c
     name: packetcable-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'packetcable'
     project-name: 'packetcable'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'packetcable-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[packetcable]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68ca4a24655c
@@ -89,5 +80,4 @@
     project-name: 'packetcable'
     branch: 'master'
     mvn-settings: 'packetcable-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 55411c36c67be86b1a264f9fe7315b144ce983db..c745e21788534770c48f7cf972302ff03db62e65 100644 (file)
@@ -1,28 +1,36 @@
 ---
+- project:
+    name: persistence-fluorine
+    jobs:
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'persistence'
+    project-name: 'persistence'
+    branch: 'master'
+    jdk: openjdk7
+    mvn-settings: 'persistence-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[persistence]'
+
+    # Used by the release job
+    staging-profile-id: a68d3c2bb44d1
+
 - project:
     name: persistence-oxygen
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'persistence'
     project-name: 'persistence'
-    branch: 'master'
+    branch: 'stable/oxygen'
     jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'persistence-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[persistence]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68d3c2bb44d1
 - project:
     name: persistence-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'persistence'
     project-name: 'persistence'
     branch: 'stable/nitrogen'
     jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'persistence-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[persistence]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68d3c2bb44d1
@@ -58,9 +56,7 @@
 - project:
     name: persistence-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'persistence'
     branch: 'stable/carbon'
     karaf-version: karaf3
     jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'persistence-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[persistence]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68d3c2bb44d1
@@ -92,5 +80,4 @@
     project-name: 'persistence'
     branch: 'master'
     mvn-settings: 'persistence-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 48e947e807b096f90092d63a1fafd6f595445955..cc31c2a77e0a60d0194309980e1f2a4595132b11 100644 (file)
@@ -3,6 +3,7 @@
 
 - defaults:
     name: global
+    prefix: ''  # A prefix for job names sandbox for example: user-
 
     karaf-version: karaf4
     build-days-to-keep: 30
@@ -10,7 +11,7 @@
 
     # Timeout in minutes
     build-timeout: 360
-    build-node: centos7-builder-2c-8g
+    build-node: centos7-builder-4c-4g
     schedule: ''
     schedule-saturday: 'H H * * 6'
     schedule-weekly: 'H 23 * * 6'
@@ -43,6 +44,7 @@
     enable-openstack-plugins: 'networking-odl'
     enable-openstack-services: ''
     enable-openstack-compute-services: ''
+    enable-openstack-network-services: 'neutron,neutron-api,neutron-dhcp,neutron-metadata-agent'
     ipsec-vxlan-tunnels-enabled: 'no'
     lbaas-service-provider: ''
     num-openstack-sites: 1
@@ -55,6 +57,7 @@
     tenant-network-type: 'vxlan'
     odl-sfc-driver: 'odl'
     odl-snat-mode: 'controller'
+    openstack_legacy_default_network_services: 'q-dhcp,q-meta,q-svc'
 
     # openstack-infra-parameters defaults
     archive-artifacts: ''
     bundle-url: 'last'
 
     # CSIT images configuration
-    openstack_system_image_newton: 'CentOS 7 - devstack-newton - 20171014-2147'
     openstack_system_image_ocata: ZZCI - CentOS 7 - devstack-ocata - 20171208-1649
     openstack_system_image_pike: ZZCI - CentOS 7 - devstack-pike - 20171208-1649
     stack-template: csit-2-instance-type.yaml
     docker_system_count: 1
-    docker_system_flavor: v1-performance-1
+    docker_system_flavor: v2-standard-1
     docker_system_image: ZZCI - CentOS 7 - docker - 20180109-0346
     odl_system_count: 1
-    odl_system_flavor: v1-performance-2
-    odl_system_image: ZZCI - CentOS 7 - builder - 20180109-0417
+    odl_system_flavor: v2-highcpu-4
+    odl_system_image: ZZCI - CentOS 7 - builder - 20180201-2139
     openstack_system_count: 1
-    openstack_system_flavor: v1-performance-4
+    openstack_system_flavor: v2-standard-4
     openstack_system_image: ZZCI - CentOS 7 - devstack - 20171208-1648
     openstack_system2_count: 0
-    openstack_system2_flavor: v1-performance-1
+    openstack_system2_flavor: v2-standard-1
     openstack_system2_image: ZZCI - CentOS 7 - devstack - 20171208-1648
     tools_system_count: 1
-    tools_system_flavor: v1-performance-1
+    tools_system_flavor: v2-highcpu-2
     tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
 
     # Default Robot framework options
     # Maven / Java
     java-version: 'openjdk8'
     jre: 'openjdk8'
-    jdk: 'openjdk8'
     opendaylight-infra-mvn-opts: |
         --show-version
         --batch-mode
     10-exclude-value: ''
 
     # Manual CSIT job lists used by sanity or periodic in nature.
+    csit-high-frequency-list-fluorine: >
+        netvirt-csit-1node-openstack-queens-upstream-stateful-fluorine
     csit-high-frequency-list-oxygen: >
-        netvirt-csit-1node-openstack-ocata-upstream-stateful-oxygen
+        netvirt-csit-1node-openstack-queens-upstream-stateful-oxygen
     csit-high-frequency-list-nitrogen: >
-        netvirt-csit-1node-openstack-ocata-upstream-stateful-nitrogen
+        netvirt-csit-1node-openstack-pike-upstream-stateful-nitrogen
     csit-high-frequency-list-carbon: >
-        netvirt-csit-1node-openstack-newton-nodl-v2-upstream-stateful-carbon
+        netvirt-csit-1node-openstack-ocata-upstream-stateful-carbon
+    csit-sanity-list-fluorine: >
+        openflowplugin-csit-1node-sanity-only-fluorine
     csit-sanity-list-oxygen: >
         openflowplugin-csit-1node-sanity-only-oxygen
     csit-sanity-list-nitrogen: >
         openflowplugin-csit-1node-sanity-only-nitrogen
     csit-sanity-list-carbon: >
         openflowplugin-csit-1node-sanity-only-carbon
+    csit-weekly-list-fluorine: >
+        controller-csit-1node-notifications-longevity-only-fluorine,
+        controller-csit-3node-drb-partnheal-longevity-only-fluorine,
+        controller-csit-3node-drb-precedence-longevity-only-fluorine,
+        controller-csit-3node-ddb-expl-lead-movement-longevity-only-fluorine,
+        bgpcep-csit-3node-bgpclustering-longevity-only-fluorine,
+        distribution-deploy-fluorine,
+        distribution-offline-fluorine,
+        openflowplugin-csit-1node-longevity-only-fluorine
     csit-weekly-list-oxygen: >
         controller-csit-1node-notifications-longevity-only-oxygen,
         controller-csit-3node-drb-partnheal-longevity-only-oxygen,
index da34793f3870e7356ff8f4f25194ada670fee405..62a110906d369ef8a3c90ada4d0a50548df215f3 100644 (file)
@@ -2,15 +2,20 @@
 - project:
     name: builder-jobs
     jobs:
-      - '{project-name}-ci-jobs'
+      - '{project-name}-rtd-jobs':
+          project-pattern: releng/builder
+          rtd-project: opendaylight-releng-builder
+      - gerrit-jenkins-cfg-merge:
+          jenkins-silos: releng sandbox
+      - gerrit-jjb-deploy-job
+      - gerrit-jjb-merge:
+          build-node: centos7-builder-4c-4g
+          build-timeout: 90
+      - gerrit-jjb-verify
       - builder-check-poms
+      - builder-copy-sandbox-logs
+      - builder-openstack-cron
       - gerrit-tox-verify
-      # OpenStack Related
-      - 'builder-verify-image-protection'
-      - 'builder-cleanup-old-images'
-      - 'builder-delete-orphaned-nodes'
-      - 'builder-delete-stale-nodes'
-      - 'builder-delete-stale-stacks'
       # Automation for docs and jobs
       - 'builder-update-image-list'
 
     project-name: builder
     stream: master
     branch: master
-    build-node: centos7-builder-2c-8g
+    build-node: centos7-builder-2c-2g
     archive-artifacts: '**/*.log'
     build-timeout: 30
+    jjb-version: 2.0.0
+    jenkins-urls: >
+      https://jenkins.opendaylight.org/releng
+      https://jenkins.opendaylight.org/sandbox
 
 - project:
     name: packer-jobs
@@ -33,7 +42,7 @@
     project-name: builder
     branch: master
     archive-artifacts: '**/*.log'
-    build-node: centos7-builder-2c-8g
+    build-node: centos7-builder-2c-1g
 
     platforms:
       - centos
 
     templates:
       - devstack
-      - devstack-pre-pip-newton:
-          build-timeout: 75
       - devstack-pre-pip-ocata:
-          build-timeout: 60
+          build-timeout: 75
       - devstack-pre-pip-pike:
           build-timeout: 75
       - gbp
@@ -61,8 +68,6 @@
         templates: mininet-ovs-2.5
       - platforms: centos
         templates: mininet-ovs-2.6
-      - platforms: ubuntu-14.04
-        templates: devstack-pre-pip-newton
       - platforms: ubuntu-14.04
         templates: devstack-pre-pip-ocata
       - platforms: ubuntu-14.04
@@ -73,8 +78,6 @@
         templates: mininet-ovs-2.5
       - platforms: ubuntu-14.04
         templates: mininet-ovs-2.6
-      - platforms: ubuntu-16.04
-        templates: devstack-pre-pip-newton
       - platforms: ubuntu-16.04
         templates: devstack-pre-pip-ocata
       - platforms: ubuntu-16.04
@@ -84,7 +87,7 @@
 
 - job-template:
     name: builder-check-poms
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-1g
 
     project-type: freestyle
 
           email-prefix: '[releng]'
       - lf-infra-publish
 
-
 - job-template:
-    name: 'builder-verify-image-protection'
+    name: builder-copy-sandbox-logs
+    node: centos7-builder-2c-1g
+
     project-type: freestyle
-    node: centos7-builder-2c-8g
 
     properties:
       - opendaylight-infra-properties:
-          build-days-to-keep: 7
+          build-days-to-keep: 1
 
     parameters:
       - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-
-    scm:
-      - git-scm:
-          branch: '{branch}'
+          os-cloud: ''
+          project: ''
+          branch: ''
+          refspec: ''
+          artifacts: ''
 
     wrappers:
       - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-      # Listed after to override openstack-infra-wrappers clouds.yaml definition
-      - config-file-provider:
-          files:
-            - file-id: clouds-yaml
-              target: '$HOME/.config/openstack/clouds.yaml'
+          build-timeout: 10
 
     triggers:
-      - timed: '@daily'
+      - gerrit:
+          server-name: '{gerrit-server-name}'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'copy-logs:'
+          projects:
+            - project-compare-type: ANT
+              project-pattern: '**'
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: '**'
 
     builders:
-      - shell: !include-raw-escape:
-          - opendaylight-infra-check-image-protection.sh
+      - shell: !include-raw-escape: copy-sandbox-logs.sh
 
     publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[releng]'
       - lf-infra-publish
 
 
 - job-template:
-    name: 'builder-cleanup-old-images'
+    name: builder-openstack-cron
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: '{build-node}'
 
     properties:
-      - opendaylight-infra-properties:
+      - lf-infra-properties:
           build-days-to-keep: 7
 
     parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
+      - lf-infra-parameters:
           project: '{project}'
+          stream: '{stream}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          lftools-version: '{lftools-version}'
+      - string:
+          name: OS_CLOUD
+          default: '{os-cloud}'
+          description: Artifacts to archive to the logs server.
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
+      - string:
+          name: JENKINS_URLS
+          default: '{jenkins-urls}'
+          description: 'Space separated list of Jenkins URLs to check for active builds'
 
     scm:
       - git-scm:
           branch: '{branch}'
 
     wrappers:
-      - opendaylight-infra-wrappers:
+      - lf-infra-wrappers:
           build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
       # Listed after to override openstack-infra-wrappers clouds.yaml definition
       - config-file-provider:
           files:
               target: '$HOME/.config/openstack/clouds.yaml'
 
     triggers:
-      # Cleanup images on a weekly schedule
-      - timed: '@weekly'
-
-    builders:
-      - shell: !include-raw-escape:
-          - global-jjb/shell/lftools-install.sh
-          - opendaylight-infra-cleanup-old-images.sh
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[releng]'
-      - lf-infra-publish
-
-
-- job-template:
-    name: builder-delete-orphaned-nodes
-    project-type: freestyle
-    node: centos7-builder-2c-8g
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: 7
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - string:
-          name: JENKINS_URLS
-          default: 'https://jenkins.opendaylight.org/releng https://jenkins.opendaylight.org/sandbox'
-          description: 'Space separated list of Jenkins URLs to check for active builds'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      # Attempt to clear up servers every 30 mins in case we have orphaned servers
       - timed: '0,30 * * * *'
 
     builders:
-      - shell: !include-raw-escape: opendaylight-infra-cleanup-orphaned-nodes.sh
+      - odl-openstack-install
+      - shell: !include-raw-escape: global-jjb/shell/lftools-install.sh
+      # Servers
+      - odl-openstack-cleanup-stale-stacks
+      - odl-openstack-cleanup-stale-nodes
+      - odl-openstack-cleanup-orphaned-nodes
+      # Images
+      - odl-openstack-check-image-protection
+      - odl-openstack-cleanup-old-images
 
     publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[releng]'
       - lf-infra-publish
 
-
-- job-template:
-    name: 'builder-delete-stale-nodes'
-    project-type: freestyle
-    node: centos7-builder-2c-8g
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: 7
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      # Attempt to clear up stacks every 30 mins in case we have orphaned stacks
-      - timed: '0,30 * * * *'
-
-    builders:
-      - shell: !include-raw-escape:
-          - global-jjb/shell/lftools-install.sh
-          - opendaylight-infra-cleanup-stale-nodes.sh
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[releng]'
-      - lf-infra-publish
-
-
-- job-template:
-    name: 'builder-delete-stale-stacks'
-    project-type: freestyle
-    node: centos7-builder-2c-8g
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: 7
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - string:
-          name: JENKINS_URLS
-          default: 'https://jenkins.opendaylight.org/releng https://jenkins.opendaylight.org/sandbox'
-          description: 'Space separated list of Jenkins URLs to check for active builds'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      # Attempt to clear up stacks every 30 mins in case we have orphaned stacks
-      - timed: '0,30 * * * *'
-
-    builders:
-      - shell: !include-raw-escape: opendaylight-infra-cleanup-stale-stacks.sh
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[releng]'
-      - lf-infra-publish
-
-
 - job-template:
     name: 'builder-update-image-list'
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-1g
 
     properties:
       - opendaylight-infra-properties:
index bc9ebb8f96b7a7c302bc0f5f876853c3b2163411..016c65afb5a0ce9934e3f9cdbe42ec197ae80f35 100644 (file)
@@ -82,7 +82,8 @@
           name: PATCHES_TO_BUILD
           default: ''
           description: |
-            Patches to add to distro in CSV project:changeset format (genius:32/53632/9,netvirt:59/50259/47)
+              Ordered list of patches to build in the format of project=changeset (checkout) or
+              project:changeset (cherry-pick) for example: genius=32/53632/9,netvirt:59/50259/47
 
 - parameter:
     name: run-test-parameter
           send-to:
             - recipients
 
+
+- builder:
+    # Installs the openstack cli into a virtualenv at /tmp/v/openstack
+    name: odl-openstack-install
+    builders:
+      - shell: !include-raw: odl-openstack-install.sh
+
+- builder:
+    name: odl-openstack-check-image-protection
+    builders:
+      - shell: !include-raw: odl-openstack-check-image-protection.sh
+
+- builder:
+    name: odl-openstack-cleanup-old-images
+    builders:
+      - shell: !include-raw: odl-openstack-cleanup-old-images.sh
+
+- builder:
+    name: odl-openstack-cleanup-orphaned-nodes
+    builders:
+      - shell: !include-raw: odl-openstack-cleanup-orphaned-nodes.sh
+
+- builder:
+    name: odl-openstack-cleanup-stale-nodes
+    builders:
+      - shell: !include-raw: odl-openstack-cleanup-stale-nodes.sh
+
+- builder:
+    name: odl-openstack-cleanup-stale-stacks
+    builders:
+      - shell: !include-raw: odl-openstack-cleanup-stale-stacks.sh
+
 - builder:
     # Deploys a maven site to Nexus using lftools nexus-zip command
     name: opendaylight-infra-deploy-maven-site
index f2d7f0f83e001260a50db64b9e8c90e5354b26b0..72007f085080da54d8457d20350b0dd3078203ab 100644 (file)
@@ -9,10 +9,10 @@
     branch: master
     archive-artifacts: '**/*.log'
 
-    build-node: centos7-builder-2c-8g
-    build-timeout: 75
+    build-node: centos7-builder-2c-1g
+    build-timeout: 90
 
-    platforms: centos
+    platforms: centos-7
     templates: builder
 
 - project:
     branch: master
     archive-artifacts: '**/*.log'
 
-    build-node: centos7-builder-2c-8g
+    build-node: centos7-builder-2c-1g
     build-timeout: 60
 
-    platforms: centos
+    platforms: centos-7
     templates: docker
 
+- project:
+    name: packer-mininet-jobs
+    jobs:
+      - gerrit-packer-merge
+
+    project: releng/builder
+    project-name: builder
+    branch: master
+    archive-artifacts: '**/*.log'
+
+    build-node: centos7-builder-2c-1g
+    build-timeout: 90
+
+    platforms: ubuntu-16.04
+    templates: mininet-ovs-2.8
+
 - project:
     name: packer-robot-jobs
     jobs:
@@ -41,7 +57,7 @@
     branch: master
     archive-artifacts: '**/*.log'
 
-    build-node: centos7-builder-2c-8g
+    build-node: centos7-builder-2c-1g
 
-    platforms: centos
+    platforms: centos-7
     templates: robot
index f64aa99f3329622874585309262f15ca8336cb03..ed88f5101aafd1b5b8a7209e74fb44fe8f66d865 100644 (file)
@@ -1,10 +1,48 @@
 ---
+- job-group:
+    name: odl-maven-jobs
+
+    jobs:
+      - gerrit-maven-clm
+
+      # TODO: Figure out what's wrong with the gerrit-maven-merge job.
+      # - gerrit-maven-merge:
+      #     post_build_trigger:
+      #       - project:
+      #           - 'distribution-merge-{stream}'
+      #         condition: SUCCESS
+      #         trigger-with-no-params: true
+      - '{project-name}-merge-{stream}':
+          build-timeout: 180
+          mvn-goals: clean install -V -Dmaven.compile.fork=true -Dintegrationtests -Dvtn.build.jobs=2
+
+      - gerrit-maven-release
+      - gerrit-maven-verify
+      - gerrit-maven-verify-dependencies:
+          build-timeout: 180
+
 - job-template:
     name: '{project-name}-integration-{stream}'
 
+    ######################
+    # Default parameters #
+    ######################
+
+    archive-artifacts: >
+      **/*.log
+      **/hs_err_*.log
+      **/target/**/feature.xml
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/target/surefire-reports/*-output.txt
+    mvn-goals: clean install
+
+    #####################
+    # Job Configuration #
+    #####################
+
     project-type: freestyle
     node: '{build-node}'
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
 - job-template:
     name: '{project-name}-merge-{stream}'
 
+    ######################
+    # Default parameters #
+    ######################
+
+    archive-artifacts: >
+      **/*.log
+      **/hs_err_*.log
+      **/target/**/feature.xml
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/target/surefire-reports/*-output.txt
+    mvn-version: mvn33
+    java-version: openjdk8
+
+    #####################
+    # Job Configuration #
+    #####################
+
     # Need to keep jobs that deploy to Nexus at end of build as Maven
     # projects. Maybe reconsider this once upstream moves deploy to a
     # separate lifecycle:
     #     https://issues.apache.org/jira/browse/MNG-5666
     project-type: maven
     node: '{build-node}'
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
+      - lf-maven-install:
+          mvn-version: '{mvn-version}'
 
     # TODO: Do we want to apply sophisticated checks as in *-distribution-check-*?
     maven:
-      maven-name: 'mvn33'
+      maven-name: '{mvn-version}'
       goals: >
           {mvn-goals}
           -Dmerge
       global-settings-type: cfp
       post-step-run-condition: UNSTABLE
 
-    postbuilders:
-      - conditional-step:
-          condition-kind: file-exists
-          condition-filename: deploy-site.xml
-          condition-basedir: workspace
-
-          # The strategy here is intentional to run Maven site:deploy twice
-          # once using regular pom.xml to produce a staged-site which is
-          # then used by deploy-site.xml to push to Nexus. This is a
-          # workaround to Maven Site's default linking code which creates
-          # incorrect URLs for sites due to auto-detection assuming your
-          # project is configured in a certain way which ODL is not.
-          steps:
-            - maven-target:
-                maven-version: 'mvn33'
-                pom: pom.xml
-                goals: 'site:deploy -V -B -Dstream={stream}'
-                java-opts:
-                  - '-Xmx2g'
-                settings: '{mvn-settings}'
-                settings-type: cfp
-                global-settings: 'global-settings'
-                global-settings-type: cfp
-            - opendaylight-infra-deploy-maven-site:
-                settings-file: '{mvn-settings}'
-
     reporters:
       - findbugs
 
index 9bdbd51d26f36d2910b080c886952f32999dd3fa..4a5eef8b18b0526a452a73e63e7c7b1bdea22090 100644 (file)
@@ -7,7 +7,7 @@
 
     project-type: freestyle
     node: '{build-node}'
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
@@ -75,7 +75,7 @@
 
     project-type: freestyle
     node: '{build-node}'
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     parameters:
       - opendaylight-infra-parameters:
index 2269a92f0254a3e6b9f8ead615f9333baae7d5b2..47b06b04e7d5066710557a7e74eabe31eee94072 100644 (file)
@@ -1,26 +1,34 @@
 ---
+- project:
+    name: reservation-fluorine
+    jobs:
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'reservation'
+    project-name: 'reservation'
+    branch: 'master'
+    mvn-settings: 'reservation-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[reservation]'
+
+    # Used by the release job
+    staging-profile-id: a68d9bc504037
+
 - project:
     name: reservation-oxygen
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'reservation'
     project-name: 'reservation'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'reservation-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[reservation]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68d9bc504037
 - project:
     name: reservation-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'reservation'
     project-name: 'reservation'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'reservation-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[reservation]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68d9bc504037
 - project:
     name: reservation-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'reservation'
     project-name: 'reservation'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'reservation-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[reservation]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68d9bc504037
@@ -86,5 +76,4 @@
     project-name: 'reservation'
     branch: 'master'
     mvn-settings: 'reservation-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 93cdee812a503403776415e530d60f4b9704b783..da2df481e3589885e6df5b9a8e1a7e4d672c194a 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: sdninterfaceapp-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'sdninterfaceapp'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 72cada2990e99474615f19f41e12f02eb51fc5f8..d14de626599d1740443b8149ac1b788265d21730 100644 (file)
@@ -1,27 +1,38 @@
 ---
+- project:
+    name: sdninterfaceapp-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'sdninterfaceapp'
+    project-name: 'sdninterfaceapp'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    mvn-settings: 'sdninterfaceapp-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'bgpcep-merge-{stream}'
+    email-upstream: '[sdninterfaceapp] [bgpcep]'
+
+    # Used by the release job
+    staging-profile-id: a68e3d1ff55e3
+
 - project:
     name: sdninterfaceapp-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'sdninterfaceapp-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'bgpcep-merge-{stream}'
     email-upstream: '[sdninterfaceapp] [bgpcep]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68e3d1ff55e3
     name: sdninterfaceapp-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'sdninterfaceapp-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'bgpcep-merge-{stream}'
     email-upstream: '[sdninterfaceapp] [bgpcep]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68e3d1ff55e3
     name: sdninterfaceapp-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
     branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'sdninterfaceapp-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'bgpcep-merge-{stream}'
     email-upstream: '[sdninterfaceapp] [bgpcep]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68e3d1ff55e3
@@ -88,6 +83,6 @@
     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'sdninterfaceapp-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index d9841368ef34b8b85b4109430015195330b333cf..c050efa8c3cbe1334966e7c662d03595a620f496 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: sfc-csit-full-deploy
     jobs:
-      - '{project}-csit-3node-docker-{functionality}-{install}-{stream}'
+      - inttest-csit-3node-docker
 
     # The project name
     project: 'sfc'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 0798c705a9c15c544d903c725ef03585f08164ee..a0dc38318246cf4a53ed5a5cd53ca066932886f9 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: sfc-csit-rest-basic
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
 
     # The project name
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index df1ae61b57e7fa808f577cb88f03499ed4e0e253..d3da132334eea099e309939671688afb2257d8db 100644 (file)
@@ -2,15 +2,17 @@
 - project:
     name: sfc-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'sfc'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 9b226d93bcde0a76b2641169ca615942a324cfff..331afd100d16fac746af45b9ab22613bf0a6cf42 100644 (file)
@@ -2,65 +2,18 @@
 - project:
     name: sfc-python
     jobs:
-      - 'sfc-verify-python-{stream}'
+      - 'gerrit-tox-verify'
 
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
           branch: 'stable/carbon'
 
     project: 'sfc'
-
-- job-template:
-    name: 'sfc-verify-python-{stream}'
-
-    project-type: freestyle
-    node: centos7-builder-2c-8g
-    concurrent: true
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          gerrit-server-name: '{gerrit-server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: 'sfc-py/**'
-
-    builders:
-      - shell: |
-          virtualenv $WORKSPACE/venv-tox
-          source $WORKSPACE/venv-tox/bin/activate
-          PYTHON="$WORKSPACE/venv-tox/bin/python"
-          $PYTHON -m pip install tox argparse
-          tox --version
-          cd $WORKSPACE/sfc-py
-          tox
-          ./jenkins_build_package.sh
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[sfc]'
+    project-name: 'sfc'
+    tox-dir: sfc-py
index b3d954bb5a8bbd7a3fda679ed86be6c21962fb4b..ab58e449b15e736227e610c6102eea5ed924ed16 100644 (file)
@@ -1,29 +1,40 @@
 ---
+- project:
+    name: sfc-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'sfc'
+    project-name: 'sfc'
+    branch: 'master'
+    mvn-settings: 'sfc-settings'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    build-timeout: 120
+    dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
+    email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
+    build-node: centos7-builder-8c-8g
+
+    # Used by the release job
+    staging-profile-id: a68eb361ca48a
+
 - project:
     name: sfc-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'sfc'
     project-name: 'sfc'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'sfc-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     build-timeout: 120
     dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
     email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
-    archive-artifacts: ''
-    build-node: centos7-builder-4c-16g
+    build-node: centos7-builder-8c-8g
 
     # Used by the release job
     staging-profile-id: a68eb361ca48a
     name: sfc-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'sfc'
     project-name: 'sfc'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'sfc-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
     email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
-    archive-artifacts: ''
-    build-node: centos7-builder-4c-16g
+    build-node: centos7-builder-8c-8g
 
     # Used by the release job
     staging-profile-id: a68eb361ca48a
     name: sfc-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'sfc'
     project-name: 'sfc'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'sfc-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
     email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
-    archive-artifacts: ''
-    build-node: centos7-builder-4c-16g
+    build-node: centos7-builder-8c-8g
 
     # Used by the release job
     staging-profile-id: a68eb361ca48a
@@ -93,5 +86,4 @@
     project-name: 'sfc'
     branch: 'master'
     mvn-settings: 'sfc-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
index 2096cfc70b85cbe08bf767eb225e260865e49cd3..f9ecd01f649f73a69225107c4cd71346fcb1171e 100644 (file)
@@ -1,27 +1,36 @@
 ---
+- project:
+    name: snbi-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'snbi'
+    project-name: 'snbi'
+    branch: 'master'
+    mvn-settings: 'snbi-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[snbi]'
+
+    # Used by the release job
+    staging-profile-id: a68f328cefed6
+
 - project:
     name: snbi-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'snbi'
     project-name: 'snbi'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'snbi-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[snbi]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68f328cefed6
     name: snbi-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'snbi'
     project-name: 'snbi'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'snbi-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[snbi]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68f328cefed6
     name: snbi-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'snbi'
     project-name: 'snbi'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'snbi-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[snbi]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68f328cefed6
@@ -89,5 +80,4 @@
     project-name: 'snbi'
     branch: 'master'
     mvn-settings: 'snbi-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index a9830adeae3857119a87fec7a480f164a76329a9..4a5c47d15e91d55e2b194ad9f9ea6ff6f89d9d48 100644 (file)
@@ -1,27 +1,36 @@
 ---
+- project:
+    name: snmp-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'snmp'
+    project-name: 'snmp'
+    branch: 'master'
+    mvn-settings: 'snmp-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream}'
+    email-upstream: '[snmp] [odlparent]'
+
+    # Used by the release job
+    staging-profile-id: a68fb236b93a6
+
 - project:
     name: snmp-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'snmp'
     project-name: 'snmp'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'snmp-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[snmp] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68fb236b93a6
     name: snmp-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'snmp'
     project-name: 'snmp'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'snmp-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[snmp] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68fb236b93a6
     name: snmp-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'snmp'
     project-name: 'snmp'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'snmp-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[snmp] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68fb236b93a6
@@ -89,5 +80,4 @@
     project-name: 'snmp'
     branch: 'master'
     mvn-settings: 'snmp-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index aa880ef3fa89d42336c559caadd5d41744c29123..1ad2b6a864bd6f71ff1cebb2a1798402a1fbae23 100644 (file)
@@ -1,27 +1,36 @@
 ---
+- project:
+    name: snmp4sdn-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'snmp4sdn'
+    project-name: 'snmp4sdn'
+    branch: 'master'
+    mvn-settings: 'snmp4sdn-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
+
+    # Used by the release job
+    staging-profile-id: a69034a4b6ef5
+
 - project:
     name: snmp4sdn-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'snmp4sdn-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69034a4b6ef5
     name: snmp4sdn-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'snmp4sdn-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69034a4b6ef5
     name: snmp4sdn-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'snmp4sdn-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69034a4b6ef5
@@ -89,5 +80,4 @@
     project-name: 'snmp4sdn'
     branch: 'master'
     mvn-settings: 'snmp4sdn-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 48fefa83528437050ed949a6a7a539ac7a6dfd5d..144a8f4e5d35cdfefcd41a8c7df268a319f7ca93 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: sxp-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'sxp'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 94490090882879afc5450584e9da9b6899e896b0..8f6aec788956909b5cfdde2caa4ee2bca6bb02ab 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: sxp-csit-routing
     jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-3node-periodic
 
     # The project name
     project: 'sxp'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 9357903a145cdf19fceec993e04ed226fd675674..b724bd0d19a6094998a15fe4a3e7ad1e9bfa30f0 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: sxp-csit-clustering
     jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-3node-periodic
 
     # The project name
     project: 'sxp'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 930c1073fbd07c74194494b05508783de1144f51..be42360bcb88ce280e569ca6dc75c6f828ee346d 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: sxp-csit-filtering
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'sxp'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 50fc054c590eedfbe7d45d5ac656235bcbd561c4..b78f1f4a7b88f893bf02a7cd35a9c21db3afe25f 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: sxp-csit-performance
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-1node-periodic
 
     # The project name
     project: 'sxp'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index cd76ffac8efd5152c1006aeacf1879f222c2fbdc..00950eff3b11843f27b61c5a051d986d2737c097 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: sxp-csit-topology
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'sxp'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 15da7544c9ccdf245fa728fdc4ce07b45b54ca7c..08b5b7556db68a1ae56d50399cb0de0d33ca65c4 100644 (file)
@@ -1,27 +1,36 @@
 ---
+- project:
+    name: sxp-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'sxp'
+    project-name: 'sxp'
+    branch: 'master'
+    mvn-settings: 'sxp-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
+
+    # Used by the release job
+    staging-profile-id: a6909c75719b7
+
 - project:
     name: sxp-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'sxp'
     project-name: 'sxp'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'sxp-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a6909c75719b7
     name: sxp-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'sxp'
     project-name: 'sxp'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'sxp-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a6909c75719b7
     name: sxp-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'sxp'
     project-name: 'sxp'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'sxp-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a6909c75719b7
@@ -89,5 +80,4 @@
     project-name: 'sxp'
     branch: 'master'
     mvn-settings: 'sxp-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 1605e66b180f760306d0fa7661db2fae4a4c94ae..f6b280bb9eacc3ae813370238164cc06b8578452 100644 (file)
@@ -1,26 +1,34 @@
 ---
+- project:
+    name: systemmetrics-fluorine
+    jobs:
+      - odl-maven-jobs
+
+    project: 'systemmetrics'
+    project-name: 'systemmetrics'
+    stream: fluorine
+    branch: 'master'
+    mvn-settings: 'systemmetrics-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]'
+
+    # Used by the release job
+    staging-profile-id: a69113575458e
+
 - project:
     name: systemmetrics-oxygen
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'systemmetrics'
     project-name: 'systemmetrics'
     stream: oxygen
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'systemmetrics-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69113575458e
 - project:
     name: systemmetrics-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'systemmetrics'
     project-name: 'systemmetrics'
     stream: nitrogen
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'systemmetrics-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69113575458e
 - project:
     name: systemmetrics-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'systemmetrics'
     project-name: 'systemmetrics'
     stream: carbon
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'systemmetrics-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69113575458e
@@ -87,5 +77,4 @@
     project-name: 'systemmetrics'
     branch: 'master'
     mvn-settings: 'systemmetrics-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index d80673510af9ffdb7b4678299e7e57cc09dda353..a9def51b867ef5ef18f89ef890cbe896cc4fb679 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: topoprocessing-csit-topology-operations
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'topoprocessing'
@@ -13,8 +13,6 @@
 
     # Project branches
     stream:
-      - oxygen:
-          branch: 'master'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 5657e668abe2f3cf7005be4f2f72a17877160a88..8aacb504110802c81b455ff521d4aa3eae1d480f 100644 (file)
@@ -1,27 +1,36 @@
 ---
+- project:
+    name: topoprocessing-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'topoprocessing'
+    project-name: 'topoprocessing'
+    branch: 'master'
+    mvn-settings: 'topoprocessing-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
+
+    # Used by the release job
+    staging-profile-id: a691bbe2328cb
+
 - project:
     name: topoprocessing-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'topoprocessing'
     project-name: 'topoprocessing'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'topoprocessing-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a691bbe2328cb
     name: topoprocessing-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'topoprocessing'
     project-name: 'topoprocessing'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'topoprocessing-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a691bbe2328cb
     name: topoprocessing-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'topoprocessing'
     project-name: 'topoprocessing'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'topoprocessing-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a691bbe2328cb
@@ -88,9 +79,5 @@
     project: 'topoprocessing'
     project-name: 'topoprocessing'
     branch: 'master'
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'topoprocessing-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index e45a8640653810be66134d7ddc3d06d3ed0ad0a2..30ab98e93c08fe4a30316aa1c6dc9caf9ac6fb39 100644 (file)
@@ -1,26 +1,34 @@
 ---
+- project:
+    name: transportpce-fluorine
+    jobs:
+      - odl-maven-jobs
+
+    project: 'transportpce'
+    project-name: 'transportpce'
+    stream: fluorine
+    branch: 'master'
+    mvn-settings: 'transportpce-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[transportpce] [odlparent] [yangtools] [controller]'
+
+    # Used by the release job
+    staging-profile-id: a6927323fa3d4
+
 - project:
     name: transportpce-oxygen
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'transportpce'
     project-name: 'transportpce'
     stream: oxygen
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'transportpce-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[transportpce] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a6927323fa3d4
 - project:
     name: transportpce-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'transportpce'
     project-name: 'transportpce'
     stream: nitrogen
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'transportpce-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[transportpce] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a6927323fa3d4
 - project:
     name: transportpce-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'transportpce'
     project-name: 'transportpce'
     stream: carbon
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'transportpce-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[transportpce] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a6927323fa3d4
@@ -87,5 +77,4 @@
     project-name: 'transportpce'
     branch: 'master'
     mvn-settings: 'transportpce-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 75e222127667fc109ace53e26315b9d3f9b009d0..0abf934ed223dc04d3f8c33bef3fbd2cfc7105d3 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: tsdr-csit-cassandra
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'tsdr'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 4041decbb13072fce7ac424aca097af261943c58..02e9df3cd6e5c086540387a9c6a1a5cd779a786f 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: tsdr-csit-elasticsearch
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'tsdr'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index d7fb207fbabfe1b33a80d6b3b430316bc9945121..c574684aeee5be9b03943402d072bf477e974816 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: tsdr-csit-hbase
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'tsdr'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index c997550d6392aa8378b18d77a1503df727315c01..8c251df84db80e82624852ccaac0c84a21fb6048 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: tsdr-csit-hsqldb
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'tsdr'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 24b551014c1911f76252c3b2e248940d66dffcca..04bd66db352550e77110f8d02aa185b36a1961f7 100644 (file)
@@ -1,27 +1,36 @@
 ---
+- project:
+    name: tsdr-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'tsdr'
+    project-name: 'tsdr'
+    branch: 'master'
+    mvn-settings: 'tsdr-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[tsdr]'
+
+    # Used by the release job
+    staging-profile-id: a69373036303c
+
 - project:
     name: tsdr-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'tsdr'
     project-name: 'tsdr'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'tsdr-settings'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[tsdr]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69373036303c
     name: tsdr-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'tsdr'
     project-name: 'tsdr'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'tsdr-settings'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[tsdr]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69373036303c
     name: tsdr-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'tsdr'
     project-name: 'tsdr'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'tsdr-settings'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[tsdr]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69373036303c
@@ -89,5 +80,4 @@
     project-name: 'tsdr'
     branch: 'master'
     mvn-settings: 'tsdr-settings'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index c555ea814b7aa5e89a3d61a098cf04fe3caa9ea1..323a75b8aaf19e1f4f490b7711e32bbb6b68f137 100644 (file)
@@ -1,27 +1,36 @@
 ---
+- project:
+    name: ttp-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'ttp'
+    project-name: 'ttp'
+    branch: 'master'
+    mvn-settings: 'ttp-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream}'
+    email-upstream: '[ttp] [odlparent]'
+
+    # Used by the release job
+    staging-profile-id: a693f948563d5
+
 - project:
     name: ttp-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'ttp'
     project-name: 'ttp'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'ttp-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[ttp] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a693f948563d5
     name: ttp-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'ttp'
     project-name: 'ttp'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'ttp-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[ttp] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a693f948563d5
     name: ttp-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'ttp'
     project-name: 'ttp'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'ttp-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[ttp] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a693f948563d5
@@ -89,5 +80,4 @@
     project-name: 'ttp'
     branch: 'master'
     mvn-settings: 'ttp-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 4f43a183c69c81641f3f9ad13c13c9e6b1b1fef2..f8e2542a5fa2de930cb2d82c99a9fc6913755e43 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: unimgr-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'unimgr'
@@ -13,8 +13,6 @@
 
     # Project branches
     stream:
-      - oxygen:
-          branch: 'master'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 98d214277489f02c796026815f2703e45d01cdf2..4e74f04215b84034c2db334c1fa9b18c2c41742c 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: unimgr-csit-legato
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'unimgr'
@@ -13,8 +13,6 @@
 
     # Project branches
     stream:
-      - oxygen:
-          branch: 'master'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 2e0441ed01197da63c01d700bb26aa384d907a6c..e53712d932f9d646d844ffff372823711a9b7aee 100644 (file)
@@ -1,27 +1,37 @@
 ---
+- project:
+    name: unimgr-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'unimgr'
+    project-name: 'unimgr'
+    branch: 'master'
+    mvn-settings: 'unimgr-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'ovsdb-merge-{stream}'
+    email-upstream: '[unimgr] [ovsdb]'
+    build-node: centos7-builder-4c-16g
+
+    # Used by the release job
+    staging-profile-id: a695d0a0b8d51
+
 - project:
     name: unimgr-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'unimgr'
     project-name: 'unimgr'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'unimgr-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'ovsdb-merge-{stream}'
     email-upstream: '[unimgr] [ovsdb]'
-    archive-artifacts: ''
     build-node: centos7-builder-4c-16g
 
     # Used by the release job
     name: unimgr-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'unimgr'
     project-name: 'unimgr'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'unimgr-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'ovsdb-merge-{stream}'
     email-upstream: '[unimgr] [ovsdb]'
-    archive-artifacts: ''
     build-node: centos7-builder-4c-16g
 
     # Used by the release job
     name: unimgr-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'unimgr'
     project-name: 'unimgr'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'unimgr-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'ovsdb-merge-{stream}'
     email-upstream: '[unimgr] [ovsdb]'
-    archive-artifacts: ''
     build-node: centos7-builder-4c-16g
 
     # Used by the release job
@@ -92,5 +84,4 @@
     project-name: 'unimgr'
     branch: 'master'
     mvn-settings: 'unimgr-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index b1a4980273e1f8048d1f13af29346bb91e5196f0..9176ec0c24100a146189b15b62e423c5a232ccef 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: usc-csit-channel
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'usc'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 44a3c092c5bde0832a9efae835b74d792ca0251d..46781e36cd802e089f67054a426ccca268e12ae3 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: usc-csit-tcp
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'usc'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 1a66df1d78ca4215e55027e94927bd6957157c93..772a8d932797bc59816592abedd581a0be2fd931 100644 (file)
@@ -1,28 +1,38 @@
 ---
+- project:
+    name: usc-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'usc'
+    project-name: 'usc'
+    branch: 'master'
+    mvn-settings: 'usc-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
+    email-upstream: '[usc] [controller] [yangtools] [odlparent]'
+
+    # Used by the release job
+    staging-profile-id: a697b633b3ffe
+
 - project:
     name: usc-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'usc'
     project-name: 'usc'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'usc-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
     email-upstream: '[usc] [controller] [yangtools] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a697b633b3ffe
     name: usc-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'usc'
     project-name: 'usc'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'usc-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
     email-upstream: '[usc] [controller] [yangtools] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a697b633b3ffe
     name: usc-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'usc'
     project-name: 'usc'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'usc-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
     email-upstream: '[usc] [controller] [yangtools] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a697b633b3ffe
@@ -92,5 +84,4 @@
     project-name: 'usc'
     branch: 'master'
     mvn-settings: 'usc-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 95dc05321efa36f41a6ab20c6d9f004d3509c5b0..ff278048d5b953193576dc6f9b565af4c368b3d9 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: usecplugin-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'usecplugin'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index b93930ad3680bca2f15e68d0e62e8cf2c4cbc83f..459dccd32c83b02055ace6717e379e6483441240 100644 (file)
@@ -1,27 +1,36 @@
 ---
+- project:
+    name: usecplugin-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'usecplugin'
+    project-name: 'usecplugin'
+    branch: 'master'
+    mvn-settings: 'usecplugin-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'openflowplugin-merge-{stream}'
+    email-upstream: '[usecplugin] [openflowplugin]'
+
+    # Used by the release job
+    staging-profile-id: a69902281e037
+
 - project:
     name: usecplugin-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'usecplugin'
     project-name: 'usecplugin'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'usecplugin-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream}'
     email-upstream: '[usecplugin] [openflowplugin]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69902281e037
     name: usecplugin-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'usecplugin'
     project-name: 'usecplugin'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'usecplugin-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream}'
     email-upstream: '[usecplugin] [openflowplugin]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69902281e037
     name: usecplugin-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'usecplugin'
     project-name: 'usecplugin'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'usecplugin-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream}'
     email-upstream: '[usecplugin] [openflowplugin]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69902281e037
@@ -89,5 +80,4 @@
     project: 'usecplugin'
     project-name: 'usecplugin'
     mvn-settings: 'usecplugin-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 637243f86ca93ca297575b881699032033062e93..21ec6ea7983b4a1ea1af7101a22f7f9448467584 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: vtn-csit-3node-manager
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-3node-{functionality}'
+      - inttest-csit-3node
+      - inttest-csit-verify-3node
 
     # The project name
     project: 'vtn'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index 30769a3dcc265cc741fde316a4a507a6ed111861..e1acbb2de4b73b8f9a89b72eeb5dbaee8180d9dd 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: vtn-csit-vtn-coordinator
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'vtn'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index a19adf3dde7848a9563d49ff0342c2a8a1e87193..fd04de777fe0916e23cf9b620ad5e696a2e828a0 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: vtn-csit-manager
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'vtn'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
index adf0e0af09d558f24d62ebaf2e9a5e7d4b9cb482..6fd69d8202b8c116b300a46c2ab4f1bab1dc8a6f 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: vtn-manager-csit-openstack-integration
     jobs:
-      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - inttest-csit-openstack
 
     # The project name
     project: 'vtn'
     functionality: 'neutron'
 
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
           karaf-version: karaf3
 
     openstack:
-      - newton:
-          openstack-branch: 'stable/newton'
-          odl-ml2-branch: 'stable/newton'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20171014-2147'
+      - pike:
+          openstack-branch: 'stable/pike'
+          odl-ml2-branch: 'stable/pike'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
+          enable-openstack-services: 'n-cpu,placement-api,placement-client,tempest'
+          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
+          odl-ml2-port-binding: 'legacy-port-binding'
 
     odl-enable-l3: 'no'
-
     public-bridge: 'br-ex'
-
-    enable-openstack-services: 'n-cpu,q-agt,q-svc,q-dhcp,q-meta,n-cauth,tempest'
-
     disable-openstack-services: 'n-net,q-l3'
-
     tenant-network-type: 'local'
+    odl_system_flavor: v2-standard-8
+    openstack_system_flavor: v2-standard-8
+    odl-ml2-driver-version: 'v2'
index 6e378e4a5eab445b43f146cf1dc2f310e515aa06..eceaf80aa94efb5acb23e71dc436285d98eae236 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: vtn-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'vtn'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
           csit-list: >
              vtn-csit-1node-manager-all-{stream},
              vtn-csit-3node-manager-all-{stream}
+      - oxygen:
+          branch: 'stable/oxygen'
+          csit-list: >
+             vtn-csit-1node-manager-all-{stream},
+             vtn-csit-3node-manager-all-{stream}
       - nitrogen:
           branch: 'stable/nitrogen'
           csit-list: >
index 3544b58d264ebcd266f447dbd0bb710a59f36f45..9d47eaf4cd03f63aa67264410098c7601f4fc7a4 100644 (file)
@@ -1,24 +1,42 @@
 ---
+- project:
+    name: vtn-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'vtn'
+    project-name: 'vtn'
+    branch: 'master'
+    mvn-settings: 'vtn-settings'
+    mvn-goals: 'clean deploy -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'neutron-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream}'
+    email-upstream: '[vtn] [neutron] [openflowplugin] [ovsdb]'
+
+    # Please do not archive maven sites!!!
+    # Maven sites are published to Nexus at:
+    # https://nexus.opendaylight.org/content/sites/site/
+    archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2'
+
+    # Used by the release job
+    staging-profile-id: a699799dd6fc9
+
 - project:
     name: vtn-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'vtn'
     project-name: 'vtn'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'vtn-settings'
-    mvn-goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
+    mvn-goals: 'clean deploy -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'neutron-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream}'
     email-upstream: '[vtn] [neutron] [openflowplugin] [ovsdb]'
     name: vtn-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'vtn'
     project-name: 'vtn'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'vtn-settings'
-    mvn-goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
+    mvn-goals: 'clean deploy -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'neutron-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream}'
     email-upstream: '[vtn] [neutron] [openflowplugin] [ovsdb]'
     name: vtn-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'vtn'
     project-name: 'vtn'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'vtn-settings'
-    mvn-goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
+    mvn-goals: 'clean deploy -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'neutron-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream}'
     email-upstream: '[vtn] [neutron] [openflowplugin] [ovsdb]'
     project-name: 'vtn'
     branch: 'master'
     mvn-settings: 'vtn-settings'
-    mvn-goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
+    mvn-goals: 'clean deploy -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 0c54b14c46701b2af9957f7318936b7ea56c3273..da08c4bdd5dbbad411c0c0d265bc64ebd8ec86a7 100644 (file)
@@ -1,27 +1,36 @@
 ---
+- project:
+    name: yang-push-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'yang-push'
+    project-name: 'yang-push'
+    branch: 'master'
+    mvn-settings: 'yang-push-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[yang-push]'
+
+    # Used by the release job
+    staging-profile-id: a69aae2832869
+
 - project:
     name: yang-push-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'yang-push'
     project-name: 'yang-push'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'yang-push-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[yang-push]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69aae2832869
     name: yang-push-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'yang-push'
     project-name: 'yang-push'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'yang-push-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[yang-push]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69aae2832869
     name: yang-push-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'yang-push'
     project-name: 'yang-push'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'yang-push-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[yang-push]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69aae2832869
@@ -89,5 +80,4 @@
     project-name: 'yang-push'
     branch: 'master'
     mvn-settings: 'yang-push-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index cdcdb8427de535e3343c95b081844169b2fd48d7..2e8ec0ae28d08bedc3db1ecd6a6fd08886fe69c4 100644 (file)
@@ -1,26 +1,34 @@
 ---
+- project:
+    name: yangide-fluorine
+    jobs:
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'yangide'
+    project-name: 'yangide'
+    branch: 'master'
+    mvn-settings: 'yangide-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[yangide] [odlparent] [yangtools]'
+
+    # Used by the release job
+    staging-profile-id: fba306956f98
+
 - project:
     name: yangide-oxygen
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'yangide'
     project-name: 'yangide'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'yangide-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[yangide] [odlparent] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: fba306956f98
 - project:
     name: yangide-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'yangide'
     project-name: 'yangide'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'yangide-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[yangide] [odlparent] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: fba306956f98
 - project:
     name: yangide-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'yangide'
     project-name: 'yangide'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'yangide-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[yangide] [odlparent] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: fba306956f98
@@ -87,5 +77,4 @@
     project-name: 'yangide'
     branch: 'master'
     mvn-settings: 'yangide-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 333bae4a1afc2fa1780497371f2595bfcc64e80a..f27bc5f50ddab57e60023648e13f6d8e5060da16 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: yangtools-csit-system
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-1node-periodic
 
     # The project name
     project: 'yangtools'
     # Project branches.
     stream:
       # The tested component was only introduced in Carbon.
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
@@ -35,5 +37,4 @@
     robot-options: ''
 
     # Additional patterns to archive
-    archive-artifacts: ''
     # FIXME: Delete if no patterns.
index 9173f14e69f03fe5b4ff90378634038c7acdda96..2812b50aafd289c43a1023287d2b8dd08aa3e0f9 100644 (file)
@@ -2,24 +2,16 @@
 - project:
     name: yangtools-master
     jobs:
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: yangtools
     project-name: yangtools
     branch: master
     stream: master
 
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'yangtools-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: mvn33
 
     dependencies: ''
     email-upstream: '[yangtools]'
     name: yangtools-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'yangtools'
     project-name: 'yangtools'
     branch: 'v1.2.x'
     distribution_branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'yangtools-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: mvn33
 
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[yangtools] [odlparent]'
     name: yangtools-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'yangtools'
     project-name: 'yangtools'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'yangtools-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: mvn33
 
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[yangtools] [odlparent]'
     project-name: 'yangtools'
     branch: 'master'
     mvn-settings: 'yangtools-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index ba9ed1ef49f7ac3859d5c1b2505116a7610ccfc0..45fe40b674c0f2d2cfed080848ddeb2775b7d402 160000 (submodule)
@@ -1 +1 @@
-Subproject commit ba9ed1ef49f7ac3859d5c1b2505116a7610ccfc0
+Subproject commit 45fe40b674c0f2d2cfed080848ddeb2775b7d402
index 81b102cb7100d69f242864eb601a3d2359578561..f4cbb5cddf416214c37a02a1405aaae91a0b238b 100644 (file)
@@ -33,6 +33,12 @@ parameters:
         description: VM Image to spin up
 
 resources:
+    port:
+        type: "OS::Neutron::Port"
+        properties:
+            allowed_address_pairs:
+                - ip_address: 10.250.0.0/24
+            network: odlci
     volume:
         type: "OS::Cinder::Volume"
         properties:
@@ -58,7 +64,7 @@ resources:
                         "GROUP": {get_param: group}
                         "INDEX": {get_param: index}
             networks:
-                - network: odlci
+                - port: {get_resource: port}
             key_name: {get_param: ssh_key}
             user_data: |
                 #!/bin/bash
index ee1810e763425480edd032f9dd2aae0c2b289b8c..4332818a2ae9fc366bace64f459f4e44d1f8a86e 160000 (submodule)
@@ -1 +1 @@
-Subproject commit ee1810e763425480edd032f9dd2aae0c2b289b8c
+Subproject commit 4332818a2ae9fc366bace64f459f4e44d1f8a86e
diff --git a/packer/provision/builder.yaml b/packer/provision/builder.yaml
deleted file mode 100644 (file)
index 03776b5..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
----
-- import_playbook: ../common-packer/provision/baseline.yaml
-
-- hosts: all
-  become_user: root
-  become_method: sudo
-  vars:
-    cassandra_checksum: sha256:a95ba4e2c9345b31310d14507e8889797cc626bc793fd341fff8ff8cba3131cd
-    cassandra_version: 2.1.16
-    elastic_search_checksum: sha256:0aa58947d66b487488e86059352deb7c6cab5da4accdff043cce9fed7c3d2fa7
-    elastic_search_version: 1.7.5
-    hbase_checksum: sha256:9cd990939403fd43dfb665b14603e3772ca3ed813a6e21a81de1778583b35eb8
-    hbase_version: 0.94.27
-
-  pre_tasks:
-    - include_role: name=system-update
-
-  roles:
-    - mono-install
-
-  tasks:
-    - name: 'Fetch Cassandra Server to /tmp/apache-cassandra-{{cassandra_version}}-bin.tar.gz'
-      get_url:
-        url: 'https://archive.apache.org/dist/cassandra/{{cassandra_version}}/apache-cassandra-{{cassandra_version}}-bin.tar.gz'
-        dest: '/tmp/apache-cassandra-{{cassandra_version}}-bin.tar.gz'
-        checksum: '{{cassandra_checksum}}'
-    - name: 'Fetch Elastic Search to /tmp/elasticsearch-{{elastic_search_version}}.tar.gz'
-      get_url:
-        url: 'https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-{{elastic_search_version}}.tar.gz'
-        dest: '/tmp/elasticsearch-{{elastic_search_version}}.tar.gz'
-        checksum: '{{elastic_search_checksum}}'
-    - name: 'Fetch HBase to /tmp/hbase-{{hbase_version}}.tar.gz'
-      get_url:
-        url: 'https://archive.apache.org/dist/hbase/hbase-{{hbase_version}}/hbase-{{hbase_version}}.tar.gz'
-        dest: '/tmp/hbase-{{hbase_version}}.tar.gz'
-        checksum: '{{hbase_checksum}}'
-    - name: Install Quagga
-      block:
-        - name: Fetch Quagga git repo
-          git:
-            repo: https://github.com/6WIND/zrpcd.git
-            dest: /tmp/build_quagga/zrpcd
-            version: 20170731
-        - name: Set compile script executable
-          file:
-            path: /tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh
-            mode: 0755
-        - name: Compile Quagga
-          shell: /tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh -d -b -t
-          args:
-            chdir: /tmp/build_quagga/zrpcd
-          become: true
-
-  post_tasks:
-    - name: System Reseal
-      script: ../common-packer/provision/system-reseal.sh
-      become: true
diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml
new file mode 100644 (file)
index 0000000..7881b13
--- /dev/null
@@ -0,0 +1,94 @@
+---
+- import_playbook: ../common-packer/provision/baseline.yaml
+
+- hosts: all
+  become_user: root
+  become_method: sudo
+  vars:
+    cassandra_checksum: sha256:a95ba4e2c9345b31310d14507e8889797cc626bc793fd341fff8ff8cba3131cd
+    cassandra_version: 2.1.16
+    elastic_search_checksum: sha256:0aa58947d66b487488e86059352deb7c6cab5da4accdff043cce9fed7c3d2fa7
+    elastic_search_version: 1.7.5
+    hbase_checksum: sha256:9cd990939403fd43dfb665b14603e3772ca3ed813a6e21a81de1778583b35eb8
+    hbase_version: 0.94.27
+
+  pre_tasks:
+    - include_role: name=system-update
+
+  roles:
+    - mono-install
+
+  tasks:
+    - name: Install Cassandra Server
+      block:
+        - name: 'Fetch Cassandra Server to /tmp/apache-cassandra-{{cassandra_version}}-bin.tar.gz'
+          get_url:
+            url: 'https://archive.apache.org/dist/cassandra/{{cassandra_version}}/apache-cassandra-{{cassandra_version}}-bin.tar.gz'
+            dest: '/tmp/apache-cassandra-{{cassandra_version}}-bin.tar.gz'
+            checksum: '{{cassandra_checksum}}'
+        - name: Make /tmp/cassandra directory
+          file:
+            path: /tmp/cassandra
+            state: directory
+            mode: 0755
+        - name: Untar Cassandra server to /tmp/cassandra
+          unarchive:
+            src: '/tmp/apache-cassandra-{{cassandra_version}}-bin.tar.gz'
+            dest: /tmp/cassandra
+            remote_src: true
+    - name: Install Elastic Search
+      block:
+        - name: 'Fetch Elastic Search to /tmp/elasticsearch-{{elastic_search_version}}.tar.gz'
+          get_url:
+            url: 'https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-{{elastic_search_version}}.tar.gz'
+            dest: '/tmp/elasticsearch-{{elastic_search_version}}.tar.gz'
+            checksum: '{{elastic_search_checksum}}'
+        - name: Make /tmp/elasticsearch directory
+          file:
+            path: /tmp/elasticsearch
+            state: directory
+            mode: 0755
+        - name: Untar Elastic Search to /tmp/elasticsearch
+          unarchive:
+            src: '/tmp/elasticsearch-{{elastic_search_version}}.tar.gz'
+            dest: /tmp/elasticsearch
+            remote_src: true
+    - name: Install HBase Server
+      block:
+        - name: 'Fetch HBase to /tmp/hbase-{{hbase_version}}.tar.gz'
+          get_url:
+            url: 'https://archive.apache.org/dist/hbase/hbase-{{hbase_version}}/hbase-{{hbase_version}}.tar.gz'
+            dest: '/tmp/hbase-{{hbase_version}}.tar.gz'
+            checksum: '{{hbase_checksum}}'
+        - name: Make /tmp/Hbase directory
+          file:
+            path: /tmp/Hbase
+            state: directory
+            mode: 0755
+        - name: Untar Hbase to /tmp/Hbase
+          unarchive:
+            src: '/tmp/hbase-{{hbase_version}}.tar.gz'
+            dest: /tmp/Hbase
+            remote_src: true
+    - name: Install Quagga
+      block:
+        - name: Fetch Quagga git repo
+          git:
+            repo: https://github.com/6WIND/zrpcd.git
+            dest: /tmp/build_quagga/zrpcd
+            version: 20170731
+        - name: Set compile script executable
+          file:
+            path: /tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh
+            mode: 0755
+        - name: Compile Quagga
+          shell: /tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh -d -b -t
+          args:
+            chdir: /tmp/build_quagga/zrpcd
+            executable: /bin/bash
+          become: true
+
+  post_tasks:
+    - name: System Reseal
+      script: ../common-packer/provision/system-reseal.sh
+      become: true
diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml
new file mode 100644 (file)
index 0000000..919ba27
--- /dev/null
@@ -0,0 +1,14 @@
+---
+- import_playbook: ../common-packer/provision/docker.yaml
+
+- hosts: all
+  become_user: root
+  become_method: sudo
+
+  pre_tasks:
+    - include_role: name=system-update
+
+  post_tasks:
+    - name: System Reseal
+      script: ../common-packer/provision/system-reseal.sh
+      become: true
diff --git a/packer/provision/mininet-ovs-2.8.yaml b/packer/provision/mininet-ovs-2.8.yaml
new file mode 100644 (file)
index 0000000..e85baf2
--- /dev/null
@@ -0,0 +1,156 @@
+---
+- import_playbook: ../common-packer/provision/baseline.yaml
+
+- hosts: all
+  become_user: root
+  become_method: sudo
+  vars:
+    ovs_checksum: sha256:8d1c439e26d7044f0ec823c7fef1b00b7c6465da0b83a7d0cf3191ed1dc43893
+    ovs_version: 2.8.1
+
+  pre_tasks:
+    - include_role: name=system-update
+
+  tasks:
+    - name: 'Install OpenVSwitch {{ovs_version}}'
+      block:
+        - name: Install OpenVSwitch dependencies
+          apt: 'name={{item}} state=present'
+          with_items:
+            - autoconf
+            - automake
+            - bzip2
+            - debhelper
+            - dh-autoreconf
+            - libssl-dev
+            - openssl
+            - pkg-config
+            - procps
+            - python-all
+            - python-qt4
+            - python-twisted-conch
+            - python-zopeinterface
+          become: true
+        - name: 'Fetch OpenVSwitch {{ovs_version}}'
+          get_url:
+            url: 'http://openvswitch.org/releases/openvswitch-{{ovs_version}}.tar.gz'
+            dest: '/tmp/openvswitch-{{ovs_version}}.tar.gz'
+            checksum: '{{ovs_checksum}}'
+        - name: Create /tmp/ovs directory
+          file:
+            path: /tmp/ovs
+            state: directory
+            mode: 0755
+        - name: 'Unarchive OpenVSwitch {{ovs_version}}'
+          unarchive:
+            src: '/tmp/openvswitch-{{ovs_version}}.tar.gz'
+            dest: /tmp/ovs
+            remote_src: true
+        - name: 'Build OpenVSwitch {{ovs_version}}'
+          shell: DEB_BUILD_OPTIONS='parallel=8 nocheck' fakeroot debian/rules binary
+          args:
+            chdir: '/tmp/ovs/openvswitch-{{ovs_version}}'
+        - name: 'Install OpenVSwitch {{ovs_version}}'
+          apt: 'deb={{item}}'
+          with_items:
+            - /tmp/ovs/libopenvswitch_2.8.1-1_amd64.deb
+            - /tmp/ovs/openvswitch-common_2.8.1-1_amd64.deb
+            - /tmp/ovs/openvswitch-switch_2.8.1-1_amd64.deb
+            - /tmp/ovs/python-openvswitch_2.8.1-1_all.deb
+            - /tmp/ovs/openvswitch-vtep_2.8.1-1_amd64.deb
+          become: true
+        - name: Enable openvswitch-switch service
+          systemd:
+            name: openvswitch-switch
+            enabled: true
+            masked: false
+          become: true
+        - name: Enable openvswitch-vtep service
+          systemd:
+            name: openvswitch-vtep
+            enabled: true
+            masked: false
+          become: true
+
+    - name: Install Mininet
+      apt: name=mininet state=present
+      become: true
+
+    - name: Install mtcbench
+      block:
+        - name: Install mtcbench dependencies
+          apt: 'name={{item}} state=present'
+          with_items:
+            - autoconf
+            - automake
+            - build-essential
+            - libconfig-dev
+            - libffi-dev
+            - libpcap-dev
+            - libsnmp-dev
+            - libtool
+            - libssl-doc
+            - make
+            - pkg-config
+            - snmp
+            - snmpd
+          become: true
+        - name: Fetch mtcbench git repo
+          git:
+            repo: https://github.com/intracom-telecom-sdn/mtcbench.git
+            dest: /tmp/mtcbench
+        - name: Run mtcbench/deploy/docker/provision.sh
+          command: /tmp/mtcbench/deploy/docker/provision.sh
+          become: true
+        - name: Build mtcbench
+          # TODO: remove workaround for build issue with mtcbench
+          # when mtcbench dependency build correctly
+          # https://github.com/intracom-telecom-sdn/mtcbench/issues/10
+          shell: /tmp/mtcbench/build_mtcbench.sh || true
+        - name: Run make for cbench
+          command: make
+          args:
+            chdir: /tmp/mtcbench/oflops/cbench
+        - name: Install cbench to /usr/local/bin/cbench
+          copy:
+            src: /tmp/mtcbench/oflops/cbench/cbench
+            dest: /usr/local/bin/cbench
+            mode: 0755
+            owner: root
+            remote_src: yes
+          become: true
+
+    - name: Install exabgp
+      apt: name=exabgp state=present
+      become: true
+
+    - name: Install python-netaddr for custom mininet topologies
+      apt: name=python-netaddr state=present
+      become: true
+
+    - name: Install vlan for vlan based tests in VTN suites
+      apt: name=vlan state=present
+      become: true
+
+    - name: Install Quagga
+      block:
+        - name: Fetch Quagga git repo
+          git:
+            repo: https://github.com/6WIND/zrpcd.git
+            dest: /tmp/build_quagga/zrpcd
+            version: 20170731
+        - name: Set compile script executable
+          file:
+            path: /tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh
+            mode: 0755
+        - name: Compile Quagga
+          shell: /tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh -d -b -t
+          args:
+            chdir: /tmp/build_quagga/zrpcd
+            executable: /bin/bash
+          become: true
+
+  post_tasks:
+    - name: System Reseal
+      script: ../common-packer/provision/system-reseal.sh
+      become: true
deleted file mode 100644 (file)
index 54b5aa75c10620dd70e9a1c52ad2bfd707f1f786..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "variables": {
-    "base_image": null,
-    "distro": null,
-    "cloud_auth_url": null,
-    "cloud_user": null,
-    "cloud_pass": null,
-    "cloud_network": null,
-    "cloud_tenant": null,
-    "cloud_user_data": null,
-    "ssh_user": null,
-    "ssh_proxy_host": ""
-  },
-  "builders": [
-    {
-      "name": "vexxhost",
-      "image_name": "ZZCI - {{user `distro`}} - builder - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `base_image`}}",
-      "type": "openstack",
-      "identity_endpoint": "{{user `cloud_auth_url`}}",
-      "username": "{{user `cloud_user`}}",
-      "password": "{{user `cloud_pass`}}",
-      "tenant_name": "{{user `cloud_tenant`}}",
-      "domain_name": "Default",
-      "region": "ca-ymq-1",
-      "availability_zone": "ca-ymq-2",
-      "networks": [
-        "{{user `cloud_network`}}"
-      ],
-      "user_data_file": "{{user `cloud_user_data`}}",
-      "ssh_username": "{{user `ssh_user`}}",
-      "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
-      "flavor": "v1-standard-1",
-      "metadata": {
-        "ci_managed": "yes"
-      }
-    }
-  ],
-  "provisioners": [
-    {
-      "type": "shell",
-      "scripts": [
-        "common-packer/provision/install-python.sh"
-      ],
-      "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
-    },
-    {
-      "type": "ansible",
-      "playbook_file": "provision/builder.yaml",
-      "ansible_env_vars": [
-        "ANSIBLE_NOCOWS=1",
-        "ANSIBLE_PIPELINING=True",
-        "ANSIBLE_ROLES_PATH=../lf-ansible/roles",
-        "ANSIBLE_CALLBACK_WHITELIST=profile_tasks",
-        "ANSIBLE_STDOUT_CALLBACK=debug"
-      ]
-    }
-  ]
-}
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..bd227be506197b62f37dcd7037a31763d97606f7
--- /dev/null
@@ -0,0 +1 @@
+../common-packer/templates/builder.json
\ No newline at end of file
index 68c64314a8bed435d6e220d5725de302a96e8996..3fb4a0b9d01f21193507edd7c2b6ff6d12824fcd 100644 (file)
@@ -1,33 +1,33 @@
 {
   "variables": {
-    "public_base_image": null,
-    "public_network": null,
-    "public_cloud_user": null,
-    "public_auth_url": null,
-    "public_tenant": null,
-    "public_user": null,
-    "public_pass": null,
+    "base_image": null,
     "distro": null,
+    "cloud_auth_url": null,
+    "cloud_user": null,
+    "cloud_pass": null,
+    "cloud_network": null,
+    "cloud_tenant": null,
     "cloud_user_data": null,
+    "ssh_user": null,
     "ssh_proxy_host": ""
   },
   "builders": [
     {
       "type": "openstack",
-      "identity_endpoint": "{{user `public_auth_url`}}",
+      "identity_endpoint": "{{user `cloud_auth_url`}}",
       "domain_name": "Default",
-      "tenant_name": "{{user `public_tenant`}}",
-      "username": "{{user `public_user`}}",
-      "password": "{{user `public_pass`}}",
+      "tenant_name": "{{user `cloud_tenant`}}",
+      "username": "{{user `cloud_user`}}",
+      "password": "{{user `cloud_pass`}}",
       "region": "ca-ymq-1",
       "availability_zone": "ca-ymq-2",
-      "ssh_username": "{{user `public_cloud_user`}}",
+      "ssh_username": "{{user `ssh_user`}}",
       "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
       "image_name": "ZZCI - {{user `distro`}} - devstack-ocata - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `public_base_image`}}",
+      "source_image_name": "{{user `base_image`}}",
       "flavor": "v1-standard-1",
       "networks": [
-        "{{user `public_network`}}"
+        "{{user `cloud_network`}}"
       ],
       "user_data_file": "{{user `cloud_user_data`}}",
       "metadata": {
index 2c42e2a50f8b877d7cc178d60304f214ed18d2ad..c33f502fca08aba64f1e5bf9a4234d5f73fa0a51 100644 (file)
@@ -1,33 +1,33 @@
 {
   "variables": {
-    "public_base_image": null,
-    "public_network": null,
-    "public_cloud_user": null,
-    "public_auth_url": null,
-    "public_tenant": null,
-    "public_user": null,
-    "public_pass": null,
+    "base_image": null,
     "distro": null,
+    "cloud_auth_url": null,
+    "cloud_user": null,
+    "cloud_pass": null,
+    "cloud_network": null,
+    "cloud_tenant": null,
     "cloud_user_data": null,
+    "ssh_user": null,
     "ssh_proxy_host": ""
   },
   "builders": [
     {
       "type": "openstack",
-      "identity_endpoint": "{{user `public_auth_url`}}",
+      "identity_endpoint": "{{user `cloud_auth_url`}}",
       "domain_name": "Default",
-      "tenant_name": "{{user `public_tenant`}}",
-      "username": "{{user `public_user`}}",
-      "password": "{{user `public_pass`}}",
+      "tenant_name": "{{user `cloud_tenant`}}",
+      "username": "{{user `cloud_user`}}",
+      "password": "{{user `cloud_pass`}}",
       "region": "ca-ymq-1",
       "availability_zone": "ca-ymq-2",
-      "ssh_username": "{{user `public_cloud_user`}}",
+      "ssh_username": "{{user `ssh_user`}}",
       "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
       "image_name": "ZZCI - {{user `distro`}} - devstack-pike - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `public_base_image`}}",
+      "source_image_name": "{{user `base_image`}}",
       "flavor": "v1-standard-1",
       "networks": [
-        "{{user `public_network`}}"
+        "{{user `cloud_network`}}"
       ],
       "user_data_file": "{{user `cloud_user_data`}}",
       "metadata": {
similarity index 59%
rename from packer/templates/devstack-pre-pip-newton.json
rename to packer/templates/devstack-pre-pip-queens.json
index fc6a6662ef56980f267df1c4349e11d205fef6c5..022e93c7ec4753d331fd9f7c7ae397404ca0ee0a 100644 (file)
@@ -1,33 +1,33 @@
 {
   "variables": {
-    "public_base_image": null,
-    "public_network": null,
-    "public_cloud_user": null,
-    "public_auth_url": null,
-    "public_tenant": null,
-    "public_user": null,
-    "public_pass": null,
+    "base_image": null,
     "distro": null,
+    "cloud_auth_url": null,
+    "cloud_user": null,
+    "cloud_pass": null,
+    "cloud_network": null,
+    "cloud_tenant": null,
     "cloud_user_data": null,
+    "ssh_user": null,
     "ssh_proxy_host": ""
   },
   "builders": [
     {
       "type": "openstack",
-      "identity_endpoint": "{{user `public_auth_url`}}",
+      "identity_endpoint": "{{user `cloud_auth_url`}}",
       "domain_name": "Default",
-      "tenant_name": "{{user `public_tenant`}}",
-      "username": "{{user `public_user`}}",
-      "password": "{{user `public_pass`}}",
+      "tenant_name": "{{user `cloud_tenant`}}",
+      "username": "{{user `cloud_user`}}",
+      "password": "{{user `cloud_pass`}}",
       "region": "ca-ymq-1",
       "availability_zone": "ca-ymq-2",
-      "ssh_username": "{{user `public_cloud_user`}}",
+      "ssh_username": "{{user `ssh_user`}}",
       "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
-      "image_name": "ZZCI - {{user `distro`}} - devstack-newton - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `public_base_image`}}",
+      "image_name": "ZZCI - {{user `distro`}} - devstack-queens - {{isotime \"20060102-1504\"}}",
+      "source_image_name": "{{user `base_image`}}",
       "flavor": "v1-standard-1",
       "networks": [
-        "{{user `public_network`}}"
+        "{{user `cloud_network`}}"
       ],
       "user_data_file": "{{user `cloud_user_data`}}",
       "metadata": {
@@ -39,7 +39,8 @@
     {
       "type": "shell",
       "environment_vars": [
-        "os_branch=stable/newton"
+        "os_branch=stable/queens",
+        "rdo_branch=queens"
       ],
       "scripts": [
         "provision/baseline.sh",
index b912e87d515b8fd27c3134c6ba4a78f52eae9626..fd4634c15735abaeeec682920608cc8f28922b52 100644 (file)
@@ -1,33 +1,33 @@
 {
   "variables": {
-    "public_base_image": null,
-    "public_network": null,
-    "public_cloud_user": null,
-    "public_auth_url": null,
-    "public_tenant": null,
-    "public_user": null,
-    "public_pass": null,
+    "base_image": null,
     "distro": null,
+    "cloud_auth_url": null,
+    "cloud_user": null,
+    "cloud_pass": null,
+    "cloud_network": null,
+    "cloud_tenant": null,
     "cloud_user_data": null,
+    "ssh_user": null,
     "ssh_proxy_host": ""
   },
   "builders": [
     {
       "type": "openstack",
-      "identity_endpoint": "{{user `public_auth_url`}}",
+      "identity_endpoint": "{{user `cloud_auth_url`}}",
       "domain_name": "Default",
-      "tenant_name": "{{user `public_tenant`}}",
-      "username": "{{user `public_user`}}",
-      "password": "{{user `public_pass`}}",
+      "tenant_name": "{{user `cloud_tenant`}}",
+      "username": "{{user `cloud_user`}}",
+      "password": "{{user `cloud_pass`}}",
       "region": "ca-ymq-1",
       "availability_zone": "ca-ymq-2",
-      "ssh_username": "{{user `public_cloud_user`}}",
+      "ssh_username": "{{user `ssh_user`}}",
       "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
       "image_name": "ZZCI - {{user `distro`}} - devstack - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `public_base_image`}}",
+      "source_image_name": "{{user `base_image`}}",
       "flavor": "v1-standard-1",
       "networks": [
-        "{{user `public_network`}}"
+        "{{user `cloud_network`}}"
       ],
       "user_data_file": "{{user `cloud_user_data`}}",
       "metadata": {
index 4f33327fb1cdf37e1d0cf5c7fda14923be58489d..edea6d28521d3bd753054f0a7c636efb53f7aa0e 120000 (symlink)
@@ -1 +1 @@
-../common-packer/templates/docker.json.example
\ No newline at end of file
+../common-packer/templates/docker.json
\ No newline at end of file
index 0e3eb0f2b25bcf707157383658cb5e61020cbad2..026c2eba8c5036b156528748200d644f65d8d310 100644 (file)
@@ -1,33 +1,33 @@
 {
   "variables": {
-    "public_base_image": null,
-    "public_network": null,
-    "public_cloud_user": null,
-    "public_auth_url": null,
-    "public_tenant": null,
-    "public_user": null,
-    "public_pass": null,
+    "base_image": null,
     "distro": null,
+    "cloud_auth_url": null,
+    "cloud_user": null,
+    "cloud_pass": null,
+    "cloud_network": null,
+    "cloud_tenant": null,
     "cloud_user_data": null,
+    "ssh_user": null,
     "ssh_proxy_host": ""
   },
   "builders": [
     {
       "type": "openstack",
-      "identity_endpoint": "{{user `public_auth_url`}}",
+      "identity_endpoint": "{{user `cloud_auth_url`}}",
       "domain_name": "Default",
-      "tenant_name": "{{user `public_tenant`}}",
-      "username": "{{user `public_user`}}",
-      "password": "{{user `public_pass`}}",
+      "tenant_name": "{{user `cloud_tenant`}}",
+      "username": "{{user `cloud_user`}}",
+      "password": "{{user `cloud_pass`}}",
       "region": "ca-ymq-1",
       "availability_zone": "ca-ymq-2",
-      "ssh_username": "{{user `public_cloud_user`}}",
+      "ssh_username": "{{user `ssh_user`}}",
       "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
       "image_name": "ZZCI - {{user `distro`}} - gbp - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `public_base_image`}}",
+      "source_image_name": "{{user `base_image`}}",
       "flavor": "v1-standard-1",
       "networks": [
-        "{{user `public_network`}}"
+        "{{user `cloud_network`}}"
       ],
       "user_data_file": "{{user `cloud_user_data`}}",
       "metadata": {
index a3d02156923831aa726ab50b679512cba2a9264b..3433c09a5dc970fc706d4421594fe0a65cf890d3 100644 (file)
@@ -1,33 +1,33 @@
 {
   "variables": {
-    "public_base_image": null,
-    "public_network": null,
-    "public_cloud_user": null,
-    "public_auth_url": null,
-    "public_tenant": null,
-    "public_user": null,
-    "public_pass": null,
+    "base_image": null,
     "distro": null,
+    "cloud_auth_url": null,
+    "cloud_user": null,
+    "cloud_pass": null,
+    "cloud_network": null,
+    "cloud_tenant": null,
     "cloud_user_data": null,
+    "ssh_user": null,
     "ssh_proxy_host": ""
   },
   "builders": [
     {
       "type": "openstack",
-      "identity_endpoint": "{{user `public_auth_url`}}",
+      "identity_endpoint": "{{user `cloud_auth_url`}}",
       "domain_name": "Default",
-      "tenant_name": "{{user `public_tenant`}}",
-      "username": "{{user `public_user`}}",
-      "password": "{{user `public_pass`}}",
+      "tenant_name": "{{user `cloud_tenant`}}",
+      "username": "{{user `cloud_user`}}",
+      "password": "{{user `cloud_pass`}}",
       "region": "ca-ymq-1",
       "availability_zone": "ca-ymq-2",
-      "ssh_username": "{{user `public_cloud_user`}}",
+      "ssh_username": "{{user `ssh_user`}}",
       "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
       "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-25 - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `public_base_image`}}",
+      "source_image_name": "{{user `base_image`}}",
       "flavor": "v1-standard-1",
       "networks": [
-        "{{user `public_network`}}"
+        "{{user `cloud_network`}}"
       ],
       "user_data_file": "{{user `cloud_user_data`}}",
       "metadata": {
index dc2eed198ce52bbe4d98e741c2f2a54e852aca6f..b6ec6998b0a92a426aa91458a0f2378019baef79 100644 (file)
@@ -1,33 +1,33 @@
 {
   "variables": {
-    "public_base_image": null,
-    "public_network": null,
-    "public_cloud_user": null,
-    "public_auth_url": null,
-    "public_tenant": null,
-    "public_user": null,
-    "public_pass": null,
+    "base_image": null,
     "distro": null,
+    "cloud_auth_url": null,
+    "cloud_user": null,
+    "cloud_pass": null,
+    "cloud_network": null,
+    "cloud_tenant": null,
     "cloud_user_data": null,
+    "ssh_user": null,
     "ssh_proxy_host": ""
   },
   "builders": [
     {
       "type": "openstack",
-      "identity_endpoint": "{{user `public_auth_url`}}",
+      "identity_endpoint": "{{user `cloud_auth_url`}}",
       "domain_name": "Default",
-      "tenant_name": "{{user `public_tenant`}}",
-      "username": "{{user `public_user`}}",
-      "password": "{{user `public_pass`}}",
+      "tenant_name": "{{user `cloud_tenant`}}",
+      "username": "{{user `cloud_user`}}",
+      "password": "{{user `cloud_pass`}}",
       "region": "ca-ymq-1",
       "availability_zone": "ca-ymq-2",
-      "ssh_username": "{{user `public_cloud_user`}}",
+      "ssh_username": "{{user `ssh_user`}}",
       "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
       "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-26 - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `public_base_image`}}",
+      "source_image_name": "{{user `base_image`}}",
       "flavor": "v1-standard-1",
       "networks": [
-        "{{user `public_network`}}"
+        "{{user `cloud_network`}}"
       ],
       "user_data_file": "{{user `cloud_user_data`}}",
       "metadata": {
diff --git a/packer/templates/mininet-ovs-2.8.json b/packer/templates/mininet-ovs-2.8.json
new file mode 100644 (file)
index 0000000..142d492
--- /dev/null
@@ -0,0 +1,59 @@
+{
+  "variables": {
+    "base_image": null,
+    "distro": null,
+    "cloud_auth_url": null,
+    "cloud_user": null,
+    "cloud_pass": null,
+    "cloud_network": null,
+    "cloud_tenant": null,
+    "cloud_user_data": null,
+    "ssh_user": null,
+    "ssh_proxy_host": ""
+  },
+  "builders": [
+    {
+      "name": "vexxhost",
+      "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-28 - {{isotime \"20060102-1504\"}}",
+      "source_image_name": "{{user `base_image`}}",
+      "type": "openstack",
+      "identity_endpoint": "{{user `cloud_auth_url`}}",
+      "username": "{{user `cloud_user`}}",
+      "password": "{{user `cloud_pass`}}",
+      "tenant_name": "{{user `cloud_tenant`}}",
+      "domain_name": "Default",
+      "region": "ca-ymq-1",
+      "availability_zone": "ca-ymq-2",
+      "networks": [
+        "{{user `cloud_network`}}"
+      ],
+      "user_data_file": "{{user `cloud_user_data`}}",
+      "ssh_username": "{{user `ssh_user`}}",
+      "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+      "flavor": "v1-standard-1",
+      "metadata": {
+        "ci_managed": "yes"
+      }
+    }
+  ],
+  "provisioners": [
+    {
+      "type": "shell",
+      "scripts": [
+        "common-packer/provision/install-python.sh"
+      ],
+      "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
+    },
+    {
+      "type": "ansible",
+      "playbook_file": "provision/mininet-ovs-2.8.yaml",
+      "ansible_env_vars": [
+        "ANSIBLE_NOCOWS=1",
+        "ANSIBLE_PIPELINING=True",
+        "ANSIBLE_ROLES_PATH=../lf-ansible/roles",
+        "ANSIBLE_CALLBACK_WHITELIST=profile_tasks",
+        "ANSIBLE_STDOUT_CALLBACK=debug"
+      ]
+    }
+  ]
+}
index 412aac90e16fcd55091426a99d4505ec860a508f..678a903031c32cec3760c96eead90a94ae5e4a7b 100644 (file)
@@ -1,6 +1,4 @@
 {
-  "public_base_image": "CentOS 7.1711 (2017-11-05) - LF upload",
-  "public_cloud_user": "centos",
   "base_image": "LF - CentOS 7.1711 (2017-11-05)",
   "distro": "CentOS 7",
   "ssh_user": "centos",
index 742825fc2ef418812f9d39aa736167d7898a34d5..882d9598d785a4274e089448c7bed35dfedb4c5d 100644 (file)
@@ -1,6 +1,4 @@
 {
-  "public_base_image": "Ubuntu 14.04.5 LTS (2017-12-05) - LF upload",
-  "public_cloud_user": "ubuntu",
   "base_image": "LF - Ubuntu 14.04 LTS (2017-12-01)",
   "distro": "Ubuntu 14.04",
   "ssh_user": "ubuntu",
index b8dc1762b727383c9239f20145df600d9dfe0229..b55f96b4b722b49609f837005c355a1bce5bc38d 100644 (file)
@@ -1,6 +1,4 @@
 {
-  "public_base_image": "Ubuntu 16.04 LTS (2017-12-01) - LF upload",
-  "public_cloud_user": "ubuntu",
   "base_image": "LF - Ubuntu 16.04 LTS (2017-12-01)",
   "distro": "Ubuntu 16.04",
   "ssh_user": "ubuntu",
index b93b84bad0911c34a7f260d56d1dc87815053821..e4553a9ac8a91e7a9dee4746a78c3b15d490cb3c 100755 (executable)
@@ -43,6 +43,7 @@ BEGIN {
     #br_master_yaml_tag         = "    branch: 'master'";
     jdk_yaml_tag                = "    jdk: 'openjdk8'";
     intg_test_yaml_tag          = "    integration-test: " new_release;
+    extra_mvn_opts_tag          = "    extra-mvn-opts: -Dsft.heap.max=4g"
     #curr_rel_yaml_tag          = "- " curr_release ":";
     next_rel_tag_curr_yaml_tag  = "    next-release-tag: '{stream}'";
     #br_stable_curr_yaml_tag    = "    branch: 'stable/" curr_release "'";
@@ -165,12 +166,6 @@ function process_blk(bs, be, bn,   i, l) {
                 if (stream_found && release_found && !nrt_found) {
                     newblk[++nex3] = indent new_rel_yaml_tag;
                     newblk[++nex3] = indent br_master_yaml_tag;
-                    # set 'jdk' macro for patch-test jobs
-                    if (!func_found) {
-                        newblk[++nex3] = indent jdk_yaml_tag;
-                    } else {
-                        newblk[++nex3] = indent jre_yaml_tag;
-                    }
                     newblk[++nex3] = indent curr_rel_yaml_tag;
                     newblk[++nex3] = indent br_stable_curr_yaml_tag;
                     stream_found = 0;
@@ -182,8 +177,8 @@ function process_blk(bs, be, bn,   i, l) {
                     newblk[++nex3] = indent new_rel_yaml_tag;
                     newblk[++nex3] = indent next_rel_tag_new_yaml_tag;
                     newblk[++nex3] = indent br_master_yaml_tag;
-                    newblk[++nex3] = indent jdk_yaml_tag;
                     newblk[++nex3] = indent intg_test_yaml_tag;
+                    newblk[++nex3] = indent extra_mvn_opts_tag;
                     newblk[++nex3] = indent curr_rel_yaml_tag;
                     newblk[++nex3] = indent next_rel_tag_curr_yaml_tag;
                     newblk[++nex3] = indent br_stable_curr_yaml_tag;
diff --git a/tox.ini b/tox.ini
index dc8e734f47bfac3651b4dfc69ace74a25bde7dc1..1f08557af6439aa72a091dd8f1435cf641dc5b2e 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -18,13 +18,16 @@ commands =
     coala --non-interactive
 
 [testenv:docs]
-deps = sphinx
+deps = -rdocs/requirements.txt
 commands = sphinx-build -b html -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html
 
 [testenv:pep8]
 deps = flake8
 commands = flake8 scripts/
 
+[testenv:prefix]
+commands = ./check_prefix.sh
+
 [testenv:robot]
 commands = ./check_robot.sh