Merge "Move sxp Sonar scan to Sonarcloud"
authorThanh Ha (zxiiro) <zxiiro@gmail.com>
Thu, 7 May 2020 13:57:59 +0000 (13:57 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Thu, 7 May 2020 13:57:59 +0000 (13:57 +0000)
211 files changed:
docs/cloud-images.rst
docs/jenkins.rst
global-jjb
jenkins-config/clouds/openstack/odlvex/centos7-apex-2c-2g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-32g.cfg [deleted file]
jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-8g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg
jenkins-config/clouds/openstack/odlvex/cloud.cfg
jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-2c-2g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-25-1c-4g.cfg [new file with mode: 0644]
jjb/aaa/aaa-csit-authn.yaml
jjb/aaa/aaa-patch-test.yaml
jjb/aaa/aaa.yaml
jjb/alt-datastores/alt-datastores.yaml
jjb/alto/alto-csit-setup.yaml
jjb/alto/alto.yaml
jjb/ansible/ansible.yaml
jjb/archetypes/archetypes.yaml
jjb/autorelease/autorelease-projects.yaml
jjb/autorelease/autorelease-templates.yaml
jjb/autorelease/autorelease-version-management.yaml
jjb/autorelease/validate-autorelease-neon.yaml [deleted file]
jjb/autorelease/view-autorelease-neon.yaml [deleted file]
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-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/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-dsbenchmark-cluster.yaml
jjb/controller/controller-csit-dsbenchmark.yaml
jjb/controller/controller-csit-rest-cars-perf.yaml
jjb/controller/controller-csit-rest-clust-cars-perf.yaml
jjb/controller/controller-patch-test.yaml
jjb/controller/controller.yaml
jjb/daexim/daexim-csit-basic.yaml
jjb/daexim/daexim-csit-clustering-basic.yaml
jjb/daexim/daexim.yaml
jjb/defaults.yaml
jjb/detnet/detnet.yaml
jjb/dlux/dlux.yaml
jjb/dluxapps/dluxapps-csit-yangman.yaml
jjb/dluxapps/dluxapps.yaml
jjb/docs/docs-macros.yaml [new file with mode: 0644]
jjb/docs/docs-projects.yaml [new file with mode: 0644]
jjb/docs/docs-rtd.yaml
jjb/docs/docs-template.yaml [new file with mode: 0644]
jjb/docs/docs_version_bump.sh [new file with mode: 0644]
jjb/docs/docs_version_bump_projects.sh [new file with mode: 0644]
jjb/genius/genius-csit-genius.yaml
jjb/genius/genius-patch-test.yaml
jjb/genius/genius.yaml
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
jjb/integration/csit-jobs-aluminium.lst [new file with mode: 0644]
jjb/integration/csit-jobs-magnesium.lst
jjb/integration/csit-jobs-neon.lst [deleted file]
jjb/integration/csit-jobs-sodium.lst
jjb/integration/distribution/distribution-check-bootup.sh
jjb/integration/distribution/distribution-csit-userfeatures.yaml
jjb/integration/distribution/distribution-jobs.yaml
jjb/integration/distribution/distribution-templates.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-macros.yaml
jjb/integration/integration-templates.yaml
jjb/integration/integration-test-jobs.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/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-patch-test.yaml
jjb/mdsal/mdsal.yaml
jjb/nemo/nemo-csit-engine.yaml
jjb/nemo/nemo.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/netvirt/netvirt-csit-hwvtep-openstack.yaml
jjb/netvirt/netvirt-csit-multi-apex.yaml
jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
jjb/netvirt/netvirt-csit-multi-openstack.yaml
jjb/netvirt/netvirt-job-reports.yaml
jjb/netvirt/netvirt-patch-test.yaml
jjb/netvirt/netvirt.yaml
jjb/neutron/neutron-patch-test.yaml
jjb/neutron/neutron.yaml
jjb/odlguice/odlguice.yaml [new file with mode: 0644]
jjb/odlmicro/odlmicro.yaml [new file with mode: 0644]
jjb/odlparent/odlparent-patch-test.yaml
jjb/odlparent/odlparent.yaml
jjb/odltools/odltools-csit.yaml
jjb/odltools/odltools-patch-test.yaml
jjb/odltools/odltools.yaml
jjb/of-config/of-config.yaml
jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.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-thirdparty-dependencies.yaml
jjb/opflex/opflex.yaml
jjb/opflex/scripts/openvswitch-build.sh
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.yaml
jjb/p4plugin/p4plugin.yaml
jjb/packaging/build-rpm-snap.sh
jjb/packaging/packaging.yaml
jjb/packaging/test-rpm-docker.sh
jjb/packetcable/packetcable-csit-pcmm.yaml
jjb/packetcable/packetcable.yaml
jjb/plastic/plastic.yaml
jjb/releng-macros.yaml
jjb/releng-packer-jobs.yaml
jjb/serviceutils/serviceutils-patch-test.yaml
jjb/serviceutils/serviceutils.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/snmp/snmp.yaml
jjb/snmp4sdn/snmp4sdn.yaml
jjb/sxp/sxp-csit-basic.yaml
jjb/sxp/sxp-csit-binding-origin.yaml
jjb/sxp/sxp-csit-cluster-binding.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/telemetry/telemetry-csit-basic.yaml
jjb/telemetry/telemetry.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/unimgr/unimgr.yaml
jjb/usc/usc-csit-tcp.yaml
jjb/usc/usc.yaml
jjb/yangtools/yangtools-csit-system.yaml
jjb/yangtools/yangtools-patch-test.yaml
jjb/yangtools/yangtools.yaml
packer/common-packer
packer/provision/examples/apache-e-w.yaml [deleted file]
packer/provision/examples/apache-n-s.yaml [deleted file]
packer/provision/examples/apache-pod.yaml [deleted file]
packer/provision/examples/busybox.yaml [deleted file]
packer/provision/examples/nginx-pod.yaml [deleted file]
packer/provision/kubernetes.yaml [deleted file]
packer/provision/roles/coe/requirements.yaml [deleted file]
packer/provision/templates/odlovs-cni.conf.j2 [deleted file]
packer/templates/kubernetes.json [deleted file]
scripts/branch_cut/branch_cut.awk

index 4fcea4a390c4b4cc27c7232b645e4fe92c02f6d1..a2ecf7bf832ccf4a9af8a38db7f69f8a6f99aa07 100644 (file)
@@ -1,63 +1,2 @@
 Following are the list of published images available to be used with Jenkins jobs.
 
-* ZZCI - CentOS 7 - autorelease - 20180125-2240
-* ZZCI - CentOS 7 - builder - 20180201-2139
-* ZZCI - CentOS 7 - builder - 20180611-1830
-* ZZCI - CentOS 7 - builder - 20180723-235310.638
-* ZZCI - CentOS 7 - builder - 20180802-220823.782
-* ZZCI - CentOS 7 - builder - x86_64 - 20180823-152917.621
-* ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956
-* ZZCI - CentOS 7 - builder - x86_64 - 20190403-205252.587
-* ZZCI - CentOS 7 - builder - x86_64 - 20190723-062027.340
-* ZZCI - CentOS 7 - builder - x86_64 - 20190822-081553.740
-* ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381
-* ZZCI - CentOS 7 - devstack - 20171208-1648
-* ZZCI - CentOS 7 - devstack - 20180723-235345.727
-* ZZCI - CentOS 7 - devstack - 20180911-204116.460
-* ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485
-* ZZCI - CentOS 7 - devstack-ocata - 20171208-1649
-* ZZCI - CentOS 7 - devstack-pike - 20171208-1649
-* ZZCI - CentOS 7 - devstack-queens - 20181101-190143.891
-* ZZCI - CentOS 7 - devstack-queens - x86_64 - 20191004-045555.756
-* ZZCI - CentOS 7 - devstack-rocky - 20190601-000116.015
-* ZZCI - CentOS 7 - devstack-rocky - 20190628-065204.973
-* ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20191002-183226.559
-* ZZCI - CentOS 7 - docker - 20171209-0317
-* ZZCI - CentOS 7 - docker - 20180109-0346
-* ZZCI - CentOS 7 - docker - 20180110-1659
-* ZZCI - CentOS 7 - docker - 20180417-0311
-* ZZCI - CentOS 7 - docker - 20180723-235456.035
-* ZZCI - CentOS 7 - docker - x86_64 - 20190924-232930.807
-* ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840
-* ZZCI - CentOS 7 - java-builder - 20171206-1842
-* ZZCI - CentOS 7 - java-builder - 20171209-0032
-* ZZCI - CentOS 7 - robot - 20180601-2050
-* ZZCI - CentOS 7 - robot - 20190430-080312.962
-* ZZCI - CentOS 7 - robot - x86_64 - 20191002-145719.577
-* ZZCI - OPNFV - apex - compute - 0
-* ZZCI - OPNFV - apex - compute - 1
-* ZZCI - OPNFV - apex - controller - 0
-* ZZCI - Ubuntu 14.04 - gbp - 20171208-2336
-* ZZCI - Ubuntu 14.04 - gbp - 20180723-235516.505
-* ZZCI - Ubuntu 16.04 - docker - 20180601-2047
-* ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190614-042302.610
-* ZZCI - Ubuntu 16.04 - gbp - 20171213-2018
-* ZZCI - Ubuntu 16.04 - gbp - 20180723-235534.431
-* ZZCI - Ubuntu 16.04 - gbp - 20190521-223526.319
-* ZZCI - Ubuntu 16.04 - kubernetes - 20180527-1344
-* ZZCI - Ubuntu 16.04 - kubernetes - 20180723-235526.580
-* ZZCI - Ubuntu 16.04 - kubernetes - 20190206-080347.936
-* ZZCI - Ubuntu 16.04 - kubernetes - 20190211-225526.126
-* ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
-* ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20180723-235543.682
-* ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514
-* ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366
-* ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240
-* ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
-* ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20180723-235543.774
-* ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20181029-223513.438
-* ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20190521-223726.040
-* ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20180301-1041
-* ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20180723-235605.507
-* ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20181001-220228.326
-* ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881
index 812f29b3412c85a1af62b30881f810b4d072824c..6229602791f3096aa849c65c299d276bb02594b3 100644 (file)
@@ -841,166 +841,14 @@ wish to run in your project.
 Jenkins Sandbox
 ---------------
 
-The `jenkins-sandbox`_ instance's purpose is to allow projects to test their JJB
-setups before merging their code over to the RelEng master silo. It is
-configured similarly to the master instance, although it cannot publish
-artifacts or vote in Gerrit.
-
-If your project requires access to the sandbox please open an OpenDaylight
-Helpdesk ticket (<helpdesk@opendaylight.org>) and provide your ODL ID.
-
-Notes Regarding the Sandbox
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* Jobs are automatically deleted every Saturday at 08:00 UTC
-* Committers can login and configure Jenkins jobs in the sandbox directly
-  (unlike with the master silo)
-* Sandbox configuration mirrors the master silo when possible
-* Sandbox jobs can NOT upload artifacts to Nexus
-* Sandbox jobs can NOT vote on Gerrit
-
-Configuration
-^^^^^^^^^^^^^
-
-Make sure you have Jenkins Job Builder [properly installed](#jjb_install).
-
-If you do not already have access, open an OpenDaylight Helpdesk ticket
-(<helpdesk@opendaylight.org>) to request access to ODL's sandbox instance.
-Integration/Test (`integration-test-wiki`_) committers have access by default.
-
-JJB reads user-specific configuration from a `jenkins.ini`_. An
-example is provided by releng/builder at `example-jenkins.ini`_.
-
-.. code-block:: bash
-
-    # If you don't have RelEng/Builder's repo, clone it
-    $ git clone --recursive https://git.opendaylight.org/gerrit/p/releng/builder.git
-    # Make a copy of the example JJB config file (in the builder/ directory)
-    $ cp jenkins.ini.example jenkins.ini
-    # Edit jenkins.ini with your username, API token and ODL's sandbox URL
-    $ cat jenkins.ini
-    <snip>
-    [job_builder]
-    retain_anchors=True
-
-    [jenkins]
-    user=<your ODL username>
-    password=<your ODL Jenkins sandbox API token>
-    url=https://jenkins.opendaylight.org/sandbox
-    <snip>
-
-To get your API token, `login to the Jenkins **sandbox** instance
-<jenkins-sandbox-login_>`_ (*not
-the main master Jenkins instance, different tokens*), go to your user page (by
-clicking on your username, for example), click "Configure" and then "Show API
-Token".
-
-Manual Method
-^^^^^^^^^^^^^
-
-If you `installed JJB locally into a virtual environment
-<Installing Jenkins Job Builder_>`_,
-you should now activate that virtual environment to access the `jenkins-jobs`
-executable.
-
-.. code-block:: bash
-
-    $ workon jjb
-    (jjb)$
-
-You'll want to work from the root of the RelEng/Builder repo, and you should
-have your `jenkins.ini` file [properly configured](#sandbox_config).
-
-Testing Jobs
-^^^^^^^^^^^^
-
-It's good practice to use the `test` command to validate your JJB files before
-pushing them.
-
-.. code-block:: bash
-
-    jenkins-jobs --conf jenkins.ini test jjb/ <job-name>
-
-If the job you'd like to test is a template with variables in its name, it
-must be manually expanded before use. For example, the commonly used template
-`{project}-csit-verify-1node-{functionality}` might expand to
-`ovsdb-csit-verify-1node-netvirt`.
-
-.. code-block:: bash
-
-    jenkins-jobs --conf jenkins.ini test jjb/ ovsdb-csit-verify-1node-netvirt
-
-Successful tests output the XML description of the Jenkins job described by
-the specified JJB job name.
-
-Pushing Jobs
-^^^^^^^^^^^^
-
-Once you've `configured your \`jenkins.ini\` <Configuration_>`_ and `verified your
-JJB jobs <Testing Jobs_>`_ produce valid XML descriptions of Jenkins jobs you
-can push them to the Jenkins sandbox.
-
-Add the --jobs-only (-j) option to push only jobs to Jenkins sandbox. Pushing
-views to Jenkins sandbox requires admin access.
-
-.. important::
-
-    When pushing with `jenkins-jobs`, a log message with the number
-    of jobs you're pushing will be issued, typically to stdout.
-    **If the number is greater than 1** (or the number of jobs you
-    passed to the command to push) then you are pushing too many
-    jobs and should **`ctrl+c` to cancel the upload**. Else you will
-    flood the system with jobs.
-
-    .. code-block:: bash
-
-        INFO:jenkins_jobs.builder:Number of jobs generated:  1
-
-    **Failing to provide the final `<job-name>` param will push all
-    jobs!**
-
-    .. code-block:: bash
-
-        # Don't push all jobs by omitting the final param! (ctrl+c to abort)
-        jenkins-jobs --conf jenkins.ini update -j jjb/ <job-name>
-
-Alternatively, you can push a job to the Jenkins sandbox with a special comment in a
-releng/builder gerrit patch. The job will be based off of the code your patch is
-based upon. Meaning, if your patch is changing something related to the job you are
-pushing, those changes will exist in the sandbox job. The format of the comment is::
-
-        jjb-deploy <job name>
-
-.. note::
-
-    Also note that wildcards can be used in <job name> which
-    will expand all jobs that exist for the pattern.
-
-Running Jobs
-^^^^^^^^^^^^
-
-Once you have your Jenkins job configuration `pushed to the
-Sandbox <Pushing Jobs_>`_ you can trigger it to run.
-
-Find your newly-pushed job on the `Sandbox's web UI <jenkins-sandbox_>`_. Click
-on its name to see the job's details.
-
-Make sure you're `logged in <jenkins-sandbox-login_>`_ to the Sandbox.
-
-Click "Build with Parameters" and then "Build".
-
-Wait for your job to be scheduled and run. Click on the job number to see
-details, including console output.
-
-Make changes to your JJB configuration, re-test, re-push and re-run until
-your job is ready.
+URL: https://jenkins.opendaylight.org/sandbox
 
+Jenkins Sandbox documentation can be found in the
+:doc:`LF Jenkins Sandbox Guide <lfdocs:jenkins-sandbox>`.
 
 .. _example-jenkins.ini: https://git.opendaylight.org/gerrit/gitweb?p=releng/builder.git;a=blob;f=jenkins.ini.example
 .. _integration-test-wiki: https://wiki.opendaylight.org/view/Integration/Test
 .. _jenkins-master: https://jenkins.opendaylight.org/releng
-.. _jenkins-sandbox: https://jenkins.opendaylight.org/sandbox
-.. _jenkins-sandbox-login: https://jenkins.opendaylight.org/sandbox/login
 .. _jenkins.ini: http://docs.openstack.org/infra/jenkins-job-builder/execution.html#configuration-file
 .. _jjb-autoupdate-project.py: https://git.opendaylight.org/gerrit/gitweb?p=releng/builder.git;a=blob;f=scripts/jjb-autoupdate-project.py
 .. _jjb-docs: http://ci.openstack.org/jenkins-job-builder/
index eededd9e9094b6a19e2611d40c29dca30559c42b..5dc3432cae2f13d9e5151a00a76a78ce73d92d70 160000 (submodule)
@@ -1 +1 @@
-Subproject commit eededd9e9094b6a19e2611d40c29dca30559c42b
+Subproject commit 5dc3432cae2f13d9e5151a00a76a78ce73d92d70
index 91bf577e99d257f454c264ee04b69727970e56a3..74f75f97a4a8aece2185e022f182a8659b4a5473 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246
 VOLUME_SIZE=100
 HARDWARE_ID=odl-highcpu-2
index d1e850b40ecf46ac1c027974dc3b37431511bab3..e7cc9da4eb612568a984660cc6c3a114ea04f6aa 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246
 VOLUME_SIZE=150
 HARDWARE_ID=odl-standard-4
diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-32g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-32g.cfg
deleted file mode 100644 (file)
index d2caa5f..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381
-VOLUME_SIZE=150
-HARDWARE_ID=odl-standard-8
index b728075367988221c434b1b9b8ee2ee5d922d80b..179dad51d1e03b56d974d26a781154e07dee495b 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246
 VOLUME_SIZE=150
 HARDWARE_ID=odl-highcpu-8
index cfeca9e3200eefe9081da657b9f1c93e8c7f7ecb..29e1f9de0611f513f22b599a9585eed4cc78fb9e 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246
 HARDWARE_ID=v1-standard-1
index 852c006329f5a8743ec7a6b09123bcc7cd6015ee..ae9459213b7b6217b9904aa2363737776e6ce26e 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246
 HARDWARE_ID=odl-highcpu-2
index 59305614ab1d728ea266b51c0fa833560bf162cc..0ce20babce23f0cd206a410a155df0219a69318a 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246
 HARDWARE_ID=odl-standard-2
index 56884e44d2ac31cdffe4e12ef0abb42540359c85..485f9af524ff3c952a2f4af632d689c4d618cf45 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246
 HARDWARE_ID=odl-standard-4
index 542a68ef5988c342e192689ff56d0596ebec1623..f5cc893f3e8daddaf438d7e88b57e5ee7be2ccff 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246
 HARDWARE_ID=odl-highcpu-4
index 389dc2e85364d50162ab6f61fb71b90fecac0d38..7c70aba49d009b5cfe7d5e756090e388a2cd6148 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246
 HARDWARE_ID=odl-highcpu-8
index 925456dde277e914b28d418d1d224ae3bdc212d6..cc3fc6521cbeed7f7921e01e15e709bf0be43643 100644 (file)
@@ -1,11 +1,11 @@
 # Cloud Configuration
 CLOUD_CREDENTIAL_ID=os-cloud
-CLOUD_URL=https://auth.vexxhost.net/v3/
+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 - x86_64 - 20190924-232354.381
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246
 HARDWARE_ID=v1-standard-1
 NETWORK_ID=b5fcd86e-efac-4997-b8bc-dbe0d35bc229
 USER_DATA_ID=jenkins-init-script
diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-2c-2g.cfg
new file mode 100644 (file)
index 0000000..36227d2
--- /dev/null
@@ -0,0 +1,2 @@
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200313-183318.557
+HARDWARE_ID=odl-highcpu-2
diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-25-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-25-1c-4g.cfg
new file mode 100644 (file)
index 0000000..1eff3f1
--- /dev/null
@@ -0,0 +1,2 @@
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - mininet-ovs-25 - x86_64 - 20200121-232651.765
+HARDWARE_ID=odl-standard-1
index 867b909cf6c4cdd4ce3358d95281ba12ff9a15de..f4a417c623d60238f2de555082d94cd492bf7661 100644 (file)
 
     # Project branches
     stream:
-      - neon:
-          branch: 'stable/neon'
+      - aluminium:
+          branch: 'master'
+          jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
+      - sodium:
+          branch: 'stable/sodium'
 
     install:
       - all:
index 83024fb9facc1a51ab98b0f2d9f90363ad5d42ed..ccb19764241335f2f6451f05341611dfd4d4b6e1 100644 (file)
@@ -7,16 +7,16 @@
     project: 'aaa'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          os-branch: 'queens'
+          java-version: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
           java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-          os-branch: 'queens'
-      - neon:
-          branch: 'stable/neon'
-          os-branch: 'queens'
+
+    os-branch: 'queens'
 
     feature:
       - authn:
index 379aeb37e9790b65080f347f2841fbc46fb80e5f..ad1b3edc61cfe8255b666d2ce30f8d94134889d0 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: aaa-magnesium
+    name: aaa-aluminium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
@@ -11,7 +11,7 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'aaa'
     project-name: 'aaa'
     branch: 'master'
@@ -25,7 +25,7 @@
     staging-profile-id: 9318cf3c82c33
 
 - project:
-    name: aaa-sodium
+    name: aaa-magnesium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
           project-pattern: aaa
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-aaa/47615/
           rtd-token: 621132230e1307d38f4aaf27e669d7dfdf98532f
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'aaa'
     project-name: 'aaa'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
+    java-version: 'openjdk11'
     mvn-settings: 'aaa-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -49,7 +50,7 @@
     staging-profile-id: 9318cf3c82c33
 
 - project:
-    name: aaa-neon
+    name: aaa-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'aaa'
     project-name: 'aaa'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     mvn-settings: 'aaa-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
index 5f3a8790236af7a4d9b844b197d8c7c5d5a0528b..cf2e9954af01dcd866a67bcd1777e1dcb734373c 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: alt-datastores-magnesium
+    name: alt-datastores-aluminium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -11,7 +11,7 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'alt-datastores'
     project-name: 'alt-datastores'
     branch: 'master'
@@ -25,7 +25,7 @@
     staging-profile-id: daa2b00117ed6
 
 - project:
-    name: alt-datastores-sodium
+    name: alt-datastores-magnesium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'alt-datastores'
     project-name: 'alt-datastores'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
     mvn-settings: 'alt-datastores-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -49,7 +49,7 @@
     staging-profile-id: daa2b00117ed6
 
 - project:
-    name: alt-datastores-neon
+    name: alt-datastores-sodium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'alt-datastores'
     project-name: 'alt-datastores'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     mvn-settings: 'alt-datastores-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
index 5814a47b915afc9e85677814eb3d7d7768158a35..265dd0bb7d1c858b006c1cce344e9ebbaae240c2 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 509485f5d6cead8c5d32de6a99f9f89071af2adf..dd766f10ceacc690633a4a32649926987a66394f 100644 (file)
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: alto-magnesium
+    name: alto-aluminium
     jobs:
       - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'alto'
     project-name: 'alto'
     branch: 'master'
     staging-profile-id: 931eabae9693c
 
 - project:
-    name: alto-sodium
+    name: alto-magnesium
     jobs:
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'alto'
     project-name: 'alto'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'alto-settings'
     mvn-opts: '-Xmx1024m'
     staging-profile-id: 931eabae9693c
 
 - project:
-    name: alto-neon
+    name: alto-sodium
     jobs:
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'alto'
     project-name: 'alto'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'alto-settings'
     mvn-opts: '-Xmx1024m'
index 5f832011771957c573f60c48f947662d8b81978b..780d2064ef392e31df5b92638fa1011fbc1608b6 100644 (file)
@@ -9,12 +9,12 @@
       - odl-maven-verify-jobs
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
+      - magnesium:
+          branch: 'stable/magnesium'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     project: ansible
     project-name: ansible
index 8c1614b4eea344f3cb8bdaddc5605a0e19cb7bf1..508ff6f75bbb00ba13ba424c22fc7e3b61fb6d60 100644 (file)
@@ -1,18 +1,11 @@
 ---
 - project:
-    name: archetypes-magnesium
+    name: archetypes-aluminium
     jobs:
-      - gerrit-release-merge
-      - gerrit-maven-clm
-      - '{project-name}-merge-{stream}':
-          build-timeout: 180
-          cron: '@daily'
-          mvn-goals: clean install -V -Dmaven.compile.fork=true
-      - gerrit-maven-stage:
-          sign-artifacts: true
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'archetypes'
     project-name: 'archetypes'
     branch: 'master'
     staging-profile-id: d88dcfe6ce48d
 
 - project:
-    name: archetypes-sodium
+    name: archetypes-magnesium
     jobs:
-      - gerrit-maven-clm
-      - '{project-name}-merge-{stream}':
-          build-timeout: 180
-          cron: '@daily'
-          mvn-goals: clean install -V -Dmaven.compile.fork=true
-      - gerrit-maven-stage:
-          sign-artifacts: true
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'archetypes'
     project-name: 'archetypes'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
+    java-version: 'openjdk11'
     mvn-settings: 'archetypes-settings'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
     email-upstream: '[archetypes] [odlparent] [yangtools] [controller] [mdsal]'
     staging-profile-id: d88dcfe6ce48d
 
 - project:
-    name: archetypes-neon
+    name: archetypes-sodium
     jobs:
-      - gerrit-maven-clm
-      - '{project-name}-merge-{stream}':
-          build-timeout: 180
-          cron: '@daily'
-          mvn-goals: clean install -V -Dmaven.compile.fork=true
-      - gerrit-maven-stage:
-          sign-artifacts: true
+      - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'archetypes'
     project-name: 'archetypes'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     mvn-settings: 'archetypes-settings'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
     email-upstream: '[archetypes] [odlparent] [yangtools] [controller] [mdsal]'
index 3e4f0688af5e109c8799f4afd9eff776b051537d..f15d67080271c65d2c404a1690a10d7f05a230e7 100644 (file)
@@ -8,7 +8,7 @@
           build-node: centos7-autorelease-4c-16g
       - 'autorelease-update-submodules-{stream}'
       - 'autorelease-update-validate-jobs-{stream}'
-      - 'autorelease-version-bump-{stream}':
+      - 'autorelease-version-bump-{stream}-{mvn-version}-{java-version}':
           build-node: centos7-autorelease-4c-16g
       - '{project-name}-validate-autorelease-{stream}'
       - gerrit-tox-verify
@@ -17,9 +17,6 @@
       - sodium:
           branch: 'stable/sodium'
           integration-test: sodium
-      - neon:
-          branch: 'stable/neon'
-          integration-test: neon
 
     project: releng/autorelease
     project-name: autorelease
     jobs:
       - 'autorelease-release-{stream}-{mvn-version}-{java-version}':
           build-node: centos7-autorelease-4c-16g
+      - 'autorelease-version-bump-{stream}-{mvn-version}-{java-version}':
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
+          integration-test: aluminium
+      - magnesium:
+          branch: 'stable/magnesium'
           integration-test: magnesium
       - sodium:
           branch: 'stable/sodium'
index cb434a3b0760128cfafb9a0396a2995f271f6227..5d46c1a8bdc3f926f52e198250796bd72684c202 100644 (file)
       - lf-infra-publish
 
 - job-template:
-    name: autorelease-version-bump-{stream}
+    name: autorelease-version-bump-{stream}-{mvn-version}-{java-version}
 
     #####################
     # Default variables #
     builders:
       - lf-infra-pre-build
       # force jenkins install of maven version before any shell scripts use it
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
       - lf-maven-install:
           mvn-version: '{mvn-version}'
       - lf-provide-maven-settings:
           name: RELEASE
           description: |
               Release to generate release notes for.
-              Eg. Neon-SR1, Fluorine-SR2...
+              Eg. Sodium-SR1, Magnesium-SR2...
     scm:
       - lf-infra-gerrit-scm:
           git-url: '$GIT_URL/$GERRIT_PROJECT'
index d31b686c57cc45a26536ab8c93b418fcd7fb6957..88efcc96acc46c783ef8df39d9e32aee188c1677 100644 (file)
@@ -11,9 +11,9 @@
     build-node: centos7-builder-2c-8g
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
+      - magnesium:
+          branch: 'stable/magnesium'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
diff --git a/jjb/autorelease/validate-autorelease-neon.yaml b/jjb/autorelease/validate-autorelease-neon.yaml
deleted file mode 100644 (file)
index 3085dec..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
----
-# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job
-- project:
-    name: autorelease-validate-neon
-    jobs:
-      - '{project-name}-validate-autorelease-{stream}'
-    stream: neon
-    branch: stable/neon
-    project-name:
-      - aaa:
-          project: aaa
-      - bgpcep:
-          project: bgpcep
-      - controller:
-          project: controller
-      - coe:
-          project: coe
-      - daexim:
-          project: daexim
-      - genius:
-          project: genius
-      - infrautils:
-          project: infrautils
-      - integration-distribution:
-          project: integration/distribution
-      - lispflowmapping:
-          project: lispflowmapping
-      - netconf:
-          project: netconf
-      - netvirt:
-          project: netvirt
-      - neutron:
-          project: neutron
-      - openflowplugin:
-          project: openflowplugin
-      - ovsdb:
-          project: ovsdb
-      - serviceutils:
-          project: serviceutils
-      - sfc:
-          project: sfc
diff --git a/jjb/autorelease/view-autorelease-neon.yaml b/jjb/autorelease/view-autorelease-neon.yaml
deleted file mode 100644 (file)
index 207aef1..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
----
-# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job
-- releng_view: &releng_autorelease_view_common_neon
-    name: releng-view-autorelease-neon
-    view-type: list
-    filter-executors: false
-    filter-queue: false
-    columns:
-      - status
-      - weather
-      - job
-      - last-success
-      - last-failure
-      - last-duration
-      - build-button
-      - jacoco
-      - find-bugs
-      - robot-list
-    recurse: false
-
-- view:
-    name: Merge-Neon
-    description: 'List of Neon Merge jobs for Autorelease'
-    job-name:
-      - 'aaa-merge-neon'
-      - 'bgpcep-merge-neon'
-      - 'controller-merge-neon'
-      - 'coe-merge-neon'
-      - 'daexim-merge-neon'
-      - 'genius-merge-neon'
-      - 'infrautils-merge-neon'
-      - 'integration/distribution-merge-neon'
-      - 'lispflowmapping-merge-neon'
-      - 'netconf-merge-neon'
-      - 'netvirt-merge-neon'
-      - 'neutron-merge-neon'
-      - 'openflowplugin-merge-neon'
-      - 'ovsdb-merge-neon'
-      - 'serviceutils-merge-neon'
-      - 'sfc-merge-neon'
-    <<: *releng_autorelease_view_common_neon
index 023597fe1bf75a3e507b99a9d9d87a3a1b642bd9..244f96fcb45e13b69cd6d73c4296dfa170ea5a6b 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 37bcaa2404f89b6344601a0943ddc97974f5672c..ced3840dffc48d65d47c7cfdc39fd60d6184d93f 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 3c287c3baf7808681689d81f09ce1fde81c22a9a..15d27ff9099aad19bb274bd84437bda3c9133127 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index 40c415b604d9488734323909b2f71c6e4288e368..2a9cad380a28568b0ebb7d23b79a542aa6ab3d85 100644 (file)
     # The functionality under test
     functionality: 'bgpclustering-longevity'
 
+    # Set elasticsearch attribute to value 'long' for longevity jobs
+    #elasticsearch-attribute: 'long'
+
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index c2426f069d36be7c9391c51cded8d0d7a27fa673..dd2cfa62c6a18d70b355f3d79e013bfdd9c798ef 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 56cfa04d70685467f51c5382a432787e6432b3df..6576c79a95473c28b52dfc3953f1e800be3307f7 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 3e3f54d91ff13ddfb372a68d84ea8e9ba497cf72..f452b88f97f09e74325324132b7b87354f2a8aa2 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 15d1e0cc263d49d564639c6f098ff3837307f961..fd8753ba357b7b37a4720d7a8b0ccb14c10befd2 100644 (file)
@@ -9,13 +9,14 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           java-version: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     feature:
       - bgp:
index a13b03118e9e33e7f6051c7bd101049b5e3746dc..aaead5681486a2babe6156ba2e74c2b7a1c0f86b 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: bgpcep-magnesium
+    name: bgpcep-aluminium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -12,7 +12,7 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'bgpcep'
     project-name: 'bgpcep'
     build-node: centos7-builder-8c-8g
@@ -32,7 +32,7 @@
     staging-profile-id: 9427a05049030
 
 - project:
-    name: bgpcep-sodium
+    name: bgpcep-magnesium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
           project-pattern: bgpcep
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-bgpcep/47576/
           rtd-token: dbe9d1aabbe8812a26b428908f6613c28e3191fc
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'bgpcep'
     project-name: 'bgpcep'
     build-node: centos7-builder-8c-8g
     build-timeout: 120
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
+    java-version: 'openjdk11'
     mvn-settings: 'bgpcep-settings'
     mvn-opts: '-Xmx2048m'
     dependencies: >
@@ -63,7 +64,7 @@
     staging-profile-id: 9427a05049030
 
 - project:
-    name: bgpcep-neon
+    name: bgpcep-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'bgpcep'
     project-name: 'bgpcep'
     build-node: centos7-builder-8c-8g
     build-timeout: 120
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     mvn-settings: 'bgpcep-settings'
     mvn-opts: '-Xmx2048m'
     dependencies: >
index 00d53d026d0f3e29e772d15eddb5c937ef569de8..6ed2d87b41e8f307550416eaaca7349242165df1 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
-    verify-stream: 'neon'
-    verify-branch: 'stable/neon'
+    verify-stream: 'sodium'
+    verify-branch: 'stable/sodium'
     verify-karaf-version: 'karaf4'
 
     install:
index b9bbc1d08b93878413ea91cd68f02a9c4de01979..e8d9f2ae7ced4bb50b8efe3cf9ee6ee5aa743a0b 100644 (file)
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: bier-magnesium
+    name: bier-aluminium
     jobs:
       - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'bier'
     project-name: 'bier'
     branch: 'master'
     staging-profile-id: 942a8075b1f2a
 
 - project:
-    name: bier-sodium
+    name: bier-magnesium
     jobs:
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'bier'
     project-name: 'bier'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
     build-node: centos7-builder-2c-8g
     build-timeout: 90
     mvn-settings: 'bier-settings'
     staging-profile-id: 942a8075b1f2a
 
 - project:
-    name: bier-neon
+    name: bier-sodium
     jobs:
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'bier'
     project-name: 'bier'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     build-node: centos7-builder-2c-8g
     build-timeout: 90
     mvn-settings: 'bier-settings'
index 33d6a5ce11285153f6bc20fe7bd6538830c46dca..ff1208e9a0076aeaa3bbdf31ae6ab4f995c037a3 100644 (file)
@@ -1,8 +1,7 @@
 ---
 - project:
-    name: coe-magnesium
+    name: coe-aluminium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: coe
@@ -13,7 +12,7 @@
 
     project: 'coe'
     project-name: 'coe'
-    stream: magnesium
+    stream: aluminium
     branch: 'master'
     java-version: 'openjdk11'
     mvn-settings: 'coe-settings'
     staging-profile-id: 96c0be46aac33
 
 - project:
-    name: coe-sodium
+    name: coe-magnesium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: coe
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-coe/34924/
           rtd-token: 95a5a8fed43b75c6be8432a2643f20a344ba5155
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     project: 'coe'
     project-name: 'coe'
-    stream: sodium
-    branch: 'stable/sodium'
+    stream: magnesium
+    branch: 'stable/magnesium'
+    java-version: 'openjdk11'
     mvn-settings: 'coe-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -51,7 +50,7 @@
     staging-profile-id: 96c0be46aac33
 
 - project:
-    name: coe-neon
+    name: coe-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
@@ -64,8 +63,8 @@
 
     project: 'coe'
     project-name: 'coe'
-    stream: neon
-    branch: 'stable/neon'
+    stream: sodium
+    branch: 'stable/sodium'
     mvn-settings: 'coe-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
index c1744ecf1b90052b8ac73dc7c8078ed04268153f..c95eb3a53ee118a55cbc07cc6bbf885f780d408f 100644 (file)
     functionality: 'akka1'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 42381f72ccba667edde1ba5bbd297db09c2b3af6..957775a9ef248b220451b98f82de1091f7e29ab9 100644 (file)
@@ -9,14 +9,17 @@
       - 'clustering-ask'
       - 'clustering-tell'
 
+    elasticsearch-attribute: 'disabled'
+
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 0d3e99feb7cd63d899bb2823051d7c9e2a7db561..4d2aba33e2592e1789f4afdc934e5b6151a0146b 100644 (file)
     # The functionality under test
     functionality: 'cs-chasing-leader-longevity'
 
+    # Set elasticsearch attribute to value 'long' for longevity jobs
+    #elasticsearch-attribute: 'long'
+
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index 8a9eadeeb1e142f1fdaf062a6c037cf1b3de2b39..726bc999533c0b20149bbbe8b34d980a0faa3dea 100644 (file)
     # The functionality under test
     functionality: 'cs-partnheal-longevity'
 
+    # Set elasticsearch attribute to value 'long' for longevity jobs
+    #elasticsearch-attribute: 'long'
+
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index 6945d229525ac78408488b46a1fb4d797a2aa4a6..e3470f6d4992a358be1d5b673d87f41001faacfb 100644 (file)
     # The functionality under test
     functionality: 'ddb-expl-lead-movement-longevity'
 
+    # Set elasticsearch attribute to value 'long' for longevity jobs
+    #elasticsearch-attribute: 'long'
+
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index 6d10daff1f3af1ce4a01d099773c9e0ec7c49aad..8478e19fa6c827b8124637b629b0a00cb62a8e9b 100644 (file)
     # The functionality under test
     functionality: 'notifications-longevity'
 
+    # Set elasticsearch attribute to value 'long' for longevity jobs
+    #elasticsearch-attribute: 'long'
+
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index 14b16a89ed5b5d6e8ae4c20a7663731c46d9ce90..233f2b711479c349f6fc5189dc5c6d37695f85f2 100644 (file)
     # The functionality under test
     functionality: 'drb-partnheal-longevity'
 
+    # Set elasticsearch attribute to value 'long' for longevity jobs
+    #elasticsearch-attribute: 'long'
+
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index ed057052f973eafa0dbdd4e53f9ca897e25a3aa9..45d12958a2d7073ae3994013c4a327a61ec0ebe1 100644 (file)
     # The functionality under test
     functionality: 'drb-precedence-longevity'
 
+    # Set elasticsearch attribute to value 'long' for longevity jobs
+    #elasticsearch-attribute: 'long'
+
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index 90968375479283666559a49b64c7ad22ccaf6512..ddf01235fa317bf937c97d3e13c45fd56fb32fe3 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 2437f3aff6c7b0b8c250c1543c109b934632d956..0fe0026ff47e361123b26c1fcfaf431d1e910ccd 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 660f6d599d053ee2d240d3c4b3a04774e689ff6e..ed408a31985d214ce86e0b8d04994c22fc89d6d2 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 995f6f9f40a75ca21f68123a4127fb24c3ad9cd3..6078eed663788d6b81d715e7faa9d7ebf4517655 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index 898143288a09ec1e11bf297f5c3331787dc52868..8e44441bed1e2c9b85a8f5ff25d5b2ced135b172 100644 (file)
@@ -7,17 +7,16 @@
     project: 'controller'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          os-branch: 'queens'
+          java-version: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
           java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-          os-branch: 'queens'
-      - neon:
-          branch: 'stable/neon'
-          os-branch: 'queens'
 
+    os-branch: 'queens'
     jdk: 'openjdk8'
 
     feature:
index 543f84bcfc9f4bffee495b341c7a5a434b255ccf..4d2b6cfdbe1605ca7e9077dcf8843048c94d5b74 100644 (file)
@@ -1,8 +1,9 @@
 ---
 - project:
-    name: controller-magnesium
+    name: controller-master
     jobs:
-      - '{project-name}-distribution-check-{stream}':
+      - 'gerrit-release-merge':
+          build-node: centos7-builder-2c-2g
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: controller
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: master
     project: 'controller'
     project-name: 'controller'
     branch: 'master'
     java-version: 'openjdk11'
     mvn-settings: 'controller-settings'
-    mvn-goals: 'clean deploy -Pintegrationtests,docs'
-    mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true'
-    build-node: centos7-builder-8c-8g
+    mvn-version: mvn36
+    mvn-goals: 'clean deploy -Pdocs'
+    mvn-opts: '-Xmx3072m -Dmaven.compile.fork=true'
     build-timeout: 90
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
     staging-profile-id: 96c1c9177efdd
 
 - project:
-    name: controller-sodium
+    name: controller-magnesium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution-check-{stream}':
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: controller
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-controller/48288/
           rtd-token: b8440116c823a80c0fb0479eb7448a9196e6932f
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'controller'
     project-name: 'controller'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
+    java-version: 'openjdk11'
     mvn-settings: 'controller-settings'
     mvn-goals: 'clean deploy -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true'
     staging-profile-id: 96c1c9177efdd
 
 - project:
-    name: controller-neon
+    name: controller-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: controller
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'controller'
     project-name: 'controller'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     mvn-settings: 'controller-settings'
     mvn-goals: 'clean deploy -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true'
     mvn-settings: 'controller-settings'
     mvn-goals: 'clean deploy -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
     name: controller-view
index e7c7948fe619c0bf0e680fabd30037fa52136d10..1bab2dc6151228a85883a1f5b2471ccdd7033ced 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index 9ca289f08f20b50fff20a2569c09a5b4287692eb..81e3800d708aa24ee12cc8c01e2e9d5d4bf35bde 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index f63e557dd8280cd7cdab26ae46264a90a52fe1b3..4a7bafd256f8be3723bef97e06d687819025d57d 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: daexim-magnesium
+    name: daexim-aluminium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
@@ -13,7 +13,7 @@
 
     project: 'daexim'
     project-name: 'daexim'
-    stream: magnesium
+    stream: aluminium
     branch: 'master'
     java-version: 'openjdk11'
     mvn-settings: 'daexim-settings'
@@ -25,7 +25,7 @@
     staging-profile-id: 96e4dade34bd7
 
 - project:
-    name: daexim-sodium
+    name: daexim-magnesium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
           project-pattern: daexim
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
           rtd-token: 76284f12638574f131cdccdf257d852d07c195fc
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     project: 'daexim'
     project-name: 'daexim'
-    stream: sodium
-    branch: 'stable/sodium'
+    stream: magnesium
+    branch: 'stable/magnesium'
+    java-version: 'openjdk11'
     mvn-settings: 'daexim-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -49,7 +50,7 @@
     staging-profile-id: 96e4dade34bd7
 
 - project:
-    name: daexim-neon
+    name: daexim-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
@@ -62,8 +63,8 @@
 
     project: 'daexim'
     project-name: 'daexim'
-    stream: neon
-    branch: 'stable/neon'
+    stream: sodium
+    branch: 'stable/sodium'
     mvn-settings: 'daexim-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
index d01dad25773111d9ad61403a44ff4e5b8d810a87..2edafdf1bd99f4ae9cb456e6b9dd88de2d1a2d74 100644 (file)
     sm-repos: ''
     sm-features: ''
 
+    # Elasticsearch attribute
+    elasticsearch-attribute: 'disabled'
+
     # CSIT images configuration
+    openstack_stein_system_image: ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200112-040429.851
     openstack_rocky_system_image: ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20191002-183226.559
     openstack_queens_system_image: ZZCI - CentOS 7 - devstack-queens - x86_64 - 20191004-045555.756
 
@@ -95,9 +99,9 @@
 
     # Data for csit-verify jobs
     # Branch for "last" version detection
-    verify-branch: stable/neon
+    verify-branch: stable/sodium
     # Value for ODL_STREAM
-    verify-stream: neon
+    verify-stream: sodium
     verify-karaf-version: karaf4
     verify-jdkversion: openjdk8
 
     10-exclude-value: ''
 
     # Manual CSIT job lists used by sanity or periodic in nature.
+    csit-mri-list-aluminium: >
+        yangtools-csit-1node-system-only-aluminium
+    csit-mri-list-magnesium: >
+        yangtools-csit-1node-system-only-magnesium
+    csit-mri-list-sodium: >
+        yangtools-csit-1node-system-only-sodium
+    csit-sanity-list-aluminium: >
+        openflowplugin-csit-1node-sanity-only-aluminium,
+        distribution-sanity-aluminium
     csit-sanity-list-magnesium: >
         openflowplugin-csit-1node-sanity-only-magnesium,
         distribution-sanity-magnesium
     csit-sanity-list-sodium: >
         openflowplugin-csit-1node-sanity-only-sodium,
         distribution-sanity-sodium
-    csit-sanity-list-neon: >
-        openflowplugin-csit-1node-sanity-only-neon,
-        distribution-sanity-neon
+    csit-weekly-list-aluminium: >
+        controller-csit-1node-notifications-longevity-only-aluminium,
+        controller-csit-3node-drb-partnheal-longevity-only-aluminium,
+        controller-csit-3node-drb-precedence-longevity-only-aluminium,
+        controller-csit-3node-ddb-expl-lead-movement-longevity-only-aluminium,
+        bgpcep-csit-3node-bgpclustering-longevity-only-aluminium,
+        distribution-deploy-aluminium,
+        distribution-offline-aluminium,
+        openflowplugin-csit-1node-longevity-only-aluminium
     csit-weekly-list-magnesium: >
         controller-csit-1node-notifications-longevity-only-magnesium,
         controller-csit-3node-drb-partnheal-longevity-only-magnesium,
         distribution-deploy-sodium,
         distribution-offline-sodium,
         openflowplugin-csit-1node-longevity-only-sodium
-    csit-weekly-list-neon: >
-        controller-csit-1node-notifications-longevity-only-neon,
-        controller-csit-3node-drb-partnheal-longevity-only-neon,
-        controller-csit-3node-drb-precedence-longevity-only-neon,
-        controller-csit-3node-ddb-expl-lead-movement-longevity-only-neon,
-        bgpcep-csit-3node-bgpclustering-longevity-only-neon,
-        distribution-deploy-neon,
-        distribution-offline-neon,
-        openflowplugin-csit-1node-longevity-only-neon
index d4723919bcc595b8aa16077a3fb8f982c3bbce86..2cade96987dff6751797dc3f957e6d5c074d0bde 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: detnet-magnesium
+    name: detnet-aluminium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -8,13 +8,39 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-detnet/86479/
           rtd-token: 5195d77d11453a03e4b4ad3688b7026ab02cfcce
       - gerrit-release-merge
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'detnet'
     project-name: 'detnet'
     branch: 'master'
+    java-version: 'openjdk11'
+    mvn-settings: 'detnet-settings'
+    mvn-opts: '-Xmx1024m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[detnet] [odlparent] [yangtools] [controller]'
+    build-node: centos7-docker-2c-8g
+
+    # Used by the release job
+    staging-profile-id: 8981976d0fea7
+
+- project:
+    name: detnet-magnesium
+    jobs:
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: detnet
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-detnet/86479/
+          rtd-token: 5195d77d11453a03e4b4ad3688b7026ab02cfcce
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: magnesium
+    project: 'detnet'
+    project-name: 'detnet'
+    branch: 'stable/magnesium'
+    java-version: 'openjdk11'
     mvn-settings: 'detnet-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
index ac8d117c1b8db51404e8aa3ed70fb1173079a657..cbe8003708b735c75b6f156c7e89cd4fd5f67b14 100644 (file)
@@ -1,17 +1,34 @@
 ---
 - project:
-    name: dlux-neon
+    name: dlux-magnesium
     jobs:
       - gerrit-release-merge
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: magnesium
     project: 'dlux'
     project-name: 'dlux'
     branch: 'master'
+    java-version: 'openjdk11'
+    mvn-settings: 'dlux-settings'
+    dependencies: 'odlparent-merge-{stream}'
+    email-upstream: '[dlux] [odlparent]'
+
+    # Used by the release job
+    staging-profile-id: 96e6a0327484f
+
+- project:
+    name: dlux-sodium
+    jobs:
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: sodium
+    project: 'dlux'
+    project-name: 'dlux'
+    branch: 'stable/sodium'
     mvn-settings: 'dlux-settings'
-    mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[dlux] [odlparent]'
 
index 162d6d93fb1f5252732f71b07667c1286e5a1d45..e4e898f7e31057c92f1bcde9d27915a0ca864ab2 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 485570b5cdd4f5e68eef1269df8369fbd4407834..f284cbb1fa3db72d5171520c6fb958bde47e731c 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: dluxapps-magnesium
+    name: dluxapps-aluminium
     jobs:
       - gerrit-release-merge
       - odl-maven-jobs
@@ -8,7 +8,7 @@
 
     project: 'dluxapps'
     project-name: 'dluxapps'
-    stream: magnesium
+    stream: aluminium
     branch: 'master'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'dluxapps-settings'
     staging-profile-id: 96e6fb1e65bf9
 
 - project:
-    name: dluxapps-sodium
+    name: dluxapps-magnesium
     jobs:
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
     project: 'dluxapps'
     project-name: 'dluxapps'
-    stream: sodium
-    branch: 'stable/sodium'
+    stream: magnesium
+    branch: 'stable/magnesium'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'dluxapps-settings'
     mvn-opts: '-Xmx1024m'
     staging-profile-id: 96e6fb1e65bf9
 
 - project:
-    name: dluxapps-neon
+    name: dluxapps-sodium
     jobs:
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
     project: 'dluxapps'
     project-name: 'dluxapps'
-    stream: neon
-    branch: 'stable/neon'
+    stream: sodium
+    branch: 'stable/sodium'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'dluxapps-settings'
     mvn-opts: '-Xmx1024m'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'dluxapps-settings'
     mvn-opts: '-Xmx1024m'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
     name: dluxapps-view
diff --git a/jjb/docs/docs-macros.yaml b/jjb/docs/docs-macros.yaml
new file mode 100644 (file)
index 0000000..0dd07a6
--- /dev/null
@@ -0,0 +1,8 @@
+---
+# Macros for the Docs project
+- builder:
+    name: docs-update
+    builders:
+      - shell: !include-raw:
+          - docs_version_bump.sh
+          - docs_version_bump_projects.sh
diff --git a/jjb/docs/docs-projects.yaml b/jjb/docs/docs-projects.yaml
new file mode 100644 (file)
index 0000000..09838c7
--- /dev/null
@@ -0,0 +1,13 @@
+---
+- project:
+    name: docs-update-{stream}
+    jobs:
+      - 'docs-update-{stream}'
+    stream:
+      - master:
+          branch: 'master'
+      - magnesium:
+          branch: 'stable/magnesium'
+      - sodium:
+          branch: 'stable/sodium'
+    build-node: centos7-builder-2c-2g
index b61f6b06fec39ab55df61a8ff943d98c81ab8882..857850373d2e274542b6ca30a4f3b8ab2021d77a 100644 (file)
@@ -6,18 +6,19 @@
       - gerrit-tox-verify
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
+      - magnesium:
+          branch: 'stable/magnesium'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     project: docs
     project-name: docs
     project-pattern: docs
     build-node: centos7-builder-4c-4g
     build-timeout: 60
+    submodule-disable: true
     rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight/32322/
     rtd-token: 86e54dd38c651e2164ea63c183ae601d19cd1f3c
 
diff --git a/jjb/docs/docs-template.yaml b/jjb/docs/docs-template.yaml
new file mode 100644 (file)
index 0000000..5c8a35b
--- /dev/null
@@ -0,0 +1,89 @@
+---
+# Autorelease build jobs
+- job-template:
+    name: 'docs-update-{stream}'
+
+    ######################
+    # Default parameters #
+    ######################
+    disable-job: 'false'
+
+    #####################
+    # Job Configuration #
+    #####################
+
+    project-type: freestyle
+    node: centos7-builder-2c-2g
+    disabled: '{disable-job}'
+
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: 7
+
+    parameters:
+      - lf-infra-parameters:
+          project: 'releng/autorelease'
+          project-name: 'autorelease'
+          branch: '{branch}'
+          stream: '{stream}'
+          lftools-version: '{lftools-version}'
+      - string:
+          name: RELEASE_NAME
+          description: 'The next release name eg Magnesium'
+      - bool:
+          name: PUBLISH
+          default: false
+          description: 'The flag to publish or not'
+
+    scm:
+      - lf-gerrit-clone:
+          git-url: '$GIT_URL/$GERRIT_PROJECT'
+          branch: '$GERRIT_BRANCH'
+          refspec: '$GERRIT_REFSPEC'
+          jenkins-ssh-credential: opendaylight-jenkins-ssh
+          submodule-disable: false
+          submodule-recursive: true
+          submodule-timeout: 10
+          basedir: 'autorelease'
+          choosing-strategy: default
+          wipe-workspace: true
+      - lf-gerrit-clone:
+          git-url: '$GIT_URL/docs'
+          branch: '$GERRIT_BRANCH'
+          refspec: '$GERRIT_REFSPEC'
+          jenkins-ssh-credential: opendaylight-jenkins-ssh
+          submodule-disable: true
+          basedir: 'docs'
+          submodule-recursive: false
+          submodule-timeout: 10
+          choosing-strategy: default
+          wipe-workspace: false
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: 10
+          jenkins-ssh-credential: opendaylight-jenkins-ssh
+
+    builders:
+      - docs-update
+
+    publishers:
+      - lf-infra-publish
+
+- scm:
+    name: lf-gerrit-clone
+    scm:
+      - git:
+          credentials-id: "{jenkins-ssh-credential}"
+          url: "{git-url}"
+          basedir: "{basedir}"
+          refspec: "{refspec}"
+          branches:
+            - "refs/heads/{branch}"
+          skip-tag: true
+          wipe-workspace: "{wipe-workspace}"
+          submodule:
+            disable: "{submodule-disable}"
+            recursive: "{submodule-recursive}"
+            timeout: "{submodule-timeout}"
+          choosing-strategy: "{choosing-strategy}"
diff --git a/jjb/docs/docs_version_bump.sh b/jjb/docs/docs_version_bump.sh
new file mode 100644 (file)
index 0000000..bf18ee1
--- /dev/null
@@ -0,0 +1,106 @@
+#!/bin/bash -l
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2019 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
+##############################################################################
+
+update_file_usage () {
+    echo "Usage: $0 <RELEASE_NAME> <PUBLISH>"
+    echo ""
+    echo "    RELEASE_NAME:  The RELEASE_NAME e.g Magnesium ."
+    echo "    PUBLISH:  Set to true to PUBLISH"
+    echo ""
+}
+while getopts :h: opts; do
+  case "$opts" in
+    h)
+        update_file_usage
+        exit 0
+        ;;
+    [?])
+        update_file_usage
+        exit 1
+        ;;
+  esac
+done
+set +u  # Allow unbound variables for virtualenv
+virtualenv --quiet "/tmp/v/git-review"
+# shellcheck source=/tmp/v/git-review/bin/activate disable=SC1091
+source "/tmp/v/git-review/bin/activate"
+pip install --quiet --upgrade "pip==9.0.3" setuptools
+pip install --quiet --upgrade git-review
+git config --global --add gitreview.username "jenkins-$SILO"
+cd "$WORKSPACE"/docs || exit
+RELEASE_NAME=$RELEASE_NAME
+Next_release="$(tr '[:lower:]' '[:upper:]' <<< "${RELEASE_NAME:0:1}")${RELEASE_NAME:1}" # Captilize Version Name
+release_name=$STREAM
+Release_version="$(tr '[:lower:]' '[:upper:]' <<< "${release_name:0:1}")${release_name:1}" # Captilize Version Name
+PUBLISH=$PUBLISH
+stable_release_str=stable-$release_name
+echo "Start Version Updating in docs project"
+echo "RELEASE_NAME : $Next_release"
+if [ "$GERRIT_BRANCH" == "master" ]
+then
+    # ####################################
+    # # Changes in the master branch #
+    # ####################################
+    git checkout master
+    odl_release_str=odl-$release_name
+    next_odl_release_str=odl-$RELEASE_NAME
+    #change the odl-<release> linking to stable-<release> to odl-<next_release> linking to latest
+    sed -i "s/$odl_release_str/$next_odl_release_str/g;" docs/conf.py
+    sed -i "s/$stable_release_str/latest/g;" docs/conf.py
+
+    # Get the value of line with odl-<release> linking to stable-<release>
+    # for appending it to the line next to odl-<next_release> linking to latest
+    line_number_nr=$(sed -n "/$next_odl_release_str/=" docs/conf.py)
+    pattern=$line_number_nr"p"
+    odl_latest="sed -n $pattern docs/conf.py"
+    odl_latest_line_value=$($odl_latest)
+    append_odl_latest=$(echo "$odl_latest_line_value" | sed "s/latest/$stable_release_str/g; s/$RELEASE_NAME/$release_name/g" )
+    echo "Making changes in Master Branch"
+    # Update docs/conf.py
+    # sed -i "$line_number_nr'i'\
+    # $append_odl_latest" docs/conf.py
+    sed -i "$line_number_nr a $append_odl_latest" docs/conf.py
+    # Updating version in docs/conf.yaml
+    sed -i "s/$Release_version/$Next_release/g" docs/conf.yaml
+    # Updating version in docs/javadoc.rst
+    sed -i "s/$release_name/$RELEASE_NAME/g" docs/javadoc.rst
+    if [ "$PUBLISH" == "true" ]
+    then
+            git add docs/conf.py docs/conf.yaml docs/javadoc.rst
+            echo "Update configuratiom files in master branch"
+            git commit -s -m "Update configuratiom files in master branch
+
+            In docs/conf.py , add odl-$RELEASE_NAME pointing to latest
+            and change odl-$release_name to point to stable-$release_name.
+            In docs/conf.yaml
+            Change version from $Release_version to $Next_release.
+            In docs/javadoc.rst
+            Change links from $release_name to $RELEASE_NAME"
+            git review
+    fi
+else
+    ####################################
+    # Changes in the new stable branch #
+    ####################################
+    echo "Making changes in $GERRIT_BRANCH"
+
+    # #Updating links in docs/conf.py
+    sed -i "s/latest/$stable_release_str/g" docs/conf.py
+    if [ "$PUBLISH" == "true" ]
+    then
+            git add docs/conf.py
+            echo "Update docs/conf.py links from latest to $stable_release_str"
+            git commit -s -m "Update docs/conf.py links from latest to $stable_release_str
+
+            Should be $stable_release_str on ${GERRIT_BRANCH}."
+            git review
+    fi
+fi
\ No newline at end of file
diff --git a/jjb/docs/docs_version_bump_projects.sh b/jjb/docs/docs_version_bump_projects.sh
new file mode 100644 (file)
index 0000000..ce7cd3b
--- /dev/null
@@ -0,0 +1,66 @@
+#!/bin/bash
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2019 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
+##############################################################################
+
+update_file_usage () {
+    echo "Usage: $0 <release_name> <PUBLISH>"
+    echo ""
+    echo "    release_name:  The release_name e.g Magnesium ."
+    echo "    PUBLISH:  Set to true to PUBLISH"
+    echo ""
+}
+while getopts :h: opts; do
+  case "$opts" in
+    h)
+        update_file_usage
+        exit 0
+        ;;
+    [?])
+        update_file_usage
+        exit 1
+        ;;
+  esac
+done
+set +u  # Allow unbound variables for virtualenv
+virtualenv --quiet "/tmp/v/git-review"
+# shellcheck source=/tmp/v/git-review/bin/activate disable=SC1091
+source "/tmp/v/git-review/bin/activate"
+pip install --quiet --upgrade "pip==9.0.3" setuptools
+pip install --quiet --upgrade git-review
+git config --global --add gitreview.username "jenkins-$SILO"
+cd "$WORKSPACE"/autorelease || exit
+GERRIT_PROJECT="releng/autorelease"
+if [ "$GERRIT_PROJECT" == "releng/autorelease" ]; then
+    # User input
+    RELEASE_NAME=$RELEASE_NAME
+    # Captilize Version Name
+    release_name="$(tr '[:lower:]' '[:upper:]' <<< "${RELEASE_NAME:0:1}")${RELEASE_NAME:1}"
+    echo "Start Version Updating in odl-projects"
+    echo "RELEASE_NAME : $release_name"
+    ################
+    # Start script #
+    ###############
+    git submodule update
+    #'|| true' for repo like serviceutils where docs/conf.yaml doesn't exist
+    command='sed -i ''"s/.*version.*/version: '"$release_name"'/"'' docs/conf.yaml || true'
+    git submodule foreach "git checkout $GERRIT_BRANCH"
+    echo "git checkout $GERRIT_BRANCH"
+    git submodule foreach "git branch"
+    git submodule foreach "$command"
+    if [ "$PUBLISH" == "true" ]
+      then
+        echo "Update docs header to $release_name in $STREAM"
+        git submodule foreach "git add . || true"
+        git submodule foreach "git commit -s -m 'Update docs header to $release_name in $STREAM
+
+    Should be $release_name on $STREAM.' || true"
+        git submodule foreach "git review || true"
+    fi
+fi
index ac90a6e0c7257f665cbe66c3549752fe00c22bdc..43ff1abc3c2091bf456b261965b9e6c69aa7ff7d 100644 (file)
     testplan: '{project}-{functionality}.txt'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index b1b96a8fbee71a16a39a3d10885d5fb6a94f86b1..22019011bc9b410bbc18a276a28ab966f0e6bbfb 100644 (file)
@@ -7,16 +7,16 @@
     project: 'genius'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          os-branch: 'queens'
+          java-version: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
           java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-          os-branch: 'queens'
-      - neon:
-          branch: 'stable/neon'
-          os-branch: 'queens'
+
+    os-branch: 'queens'
 
     feature:
       - netvirt:
index e0c98e504e9aa1baa65ff155777c0ab72a96e3c2..55cb3062485386cab632b7cb71fe83a5b3adcfa3 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: genius-magnesium
+    name: genius-aluminium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -15,7 +15,7 @@
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
 
-    stream: magnesium
+    stream: aluminium
     project: 'genius'
     project-name: 'genius'
     branch: 'master'
@@ -36,7 +36,7 @@
     staging-profile-id: 96fb4b6d9d1ee
 
 - project:
-    name: genius-sodium
+    name: genius-magnesium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
           project-pattern: genius
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/
           rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
 
-    stream: sodium
+    stream: magnesium
     project: 'genius'
     project-name: 'genius'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
     build-node: centos7-builder-2c-8g
+    java-version: 'openjdk11'
     mvn-settings: 'genius-settings'
     mvn-opts: '-Xmx1024m'
     build-timeout: 90
@@ -71,7 +72,7 @@
     staging-profile-id: 96fb4b6d9d1ee
 
 - project:
-    name: genius-neon
+    name: genius-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
 
-    stream: neon
+    stream: sodium
     project: 'genius'
     project-name: 'genius'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'genius-settings'
     mvn-opts: '-Xmx1024m'
index b232113d634e46add318d7c1e48639bb88f20b26..5145980d964e4866db772ba86b8c93a7bb9f5ef1 100644 (file)
     functionality: 'openstack'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
-          install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
 
     openstack:
       - queens:
index fbd23e6ada465e053ac4902a4b9a05952e3a790c..65bf712809e7bb1c4a9940f37d3a5b32f8eb7cb1 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index e32e60d69199e2c0f230fdfcabe5930e372cb462..eb92ba31ce804e8058b5043b5b5cdee4bf73e8ab 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 78462910d7431321f9254f70769e5392eacd2e5b..3371ae968ccd10593b99638e5406712118df4f1f 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index af0df03a35d8ba88cd66281c0e99d54d4db07ca2..c0fcd16314c58d93205abdad239898b86b23154d 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index dcec8895c6499a32dfc2c0f6c2b97c9c4b241e3e..e3b6e55cb9bd4dbce1ee1d7e140c42bd89d27dc9 100644 (file)
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: groupbasedpolicy-magnesium
+    name: groupbasedpolicy-aluminium
     jobs:
       - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'master'
     staging-profile-id: 96fbb93f95a76
 
 - project:
-    name: groupbasedpolicy-sodium
+    name: groupbasedpolicy-magnesium
     jobs:
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean deploy findbugs:findbugs'
     staging-profile-id: 96fbb93f95a76
 
 - project:
-    name: groupbasedpolicy-neon
+    name: groupbasedpolicy-sodium
     jobs:
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean deploy findbugs:findbugs'
     mvn-goals: '-U clean deploy findbugs:findbugs'
     mvn-opts: '-Xmx1024m'
     disable-job: true
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
     name: groupbasedpolicy-view
index b6956c8215dba7662565386191a96e600e0030fa..28d3a59128f2a7b9004f506aec4c4c82866f8fac 100644 (file)
@@ -1,53 +1,16 @@
 ---
 - project:
-    name: vbd-magnesium
+    name: vbd-master
     jobs:
       - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: master
     project: 'honeycomb/vbd'
     project-name: 'vbd'
     branch: 'master'
     mvn-settings: 'honeycomb-vbd-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[vbd]'
-
-    # Used by the release job
-    staging-profile-id: 96fc362c36862
-
-- project:
-    name: vbd-sodium
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: sodium
-    project: 'honeycomb/vbd'
-    project-name: 'vbd'
-    branch: 'stable/sodium'
-    mvn-settings: 'honeycomb-vbd-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[vbd]'
-
-    # Used by the release job
-    staging-profile-id: 96fc362c36862
-
-- project:
-    name: vbd-neon
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: neon
-    project: 'honeycomb/vbd'
-    project-name: 'vbd'
-    branch: 'stable/neon'
-    mvn-settings: 'honeycomb-vbd-settings'
-    mvn-opts: '-Xmx1024m'
     dependencies: ''
     email-upstream: '[vbd]'
 
index d39b795f27d6bcd28c50040964bc82c3af6d8099..c185bf1267979e7de466dd7551aba3f6d4ca8b5d 100644 (file)
@@ -7,16 +7,16 @@
     project: 'infrautils'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          os-branch: 'queens'
+          jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-          os-branch: 'queens'
-      - neon:
-          branch: 'stable/neon'
-          os-branch: 'queens'
 
+    os-branch: 'queens'
     jdk: 'openjdk8'
 
     feature:
index 18ec7c823f4ab413c6aa6082880c27313bccc30a..6c1079c3972160be57ffb869f9b1748f8d41f496 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: infrautils-magnesium
+    name: infrautils-aluminium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -13,7 +13,7 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'master'
@@ -27,7 +27,7 @@
     staging-profile-id: 96fca0367756c
 
 - project:
-    name: infrautils-sodium
+    name: infrautils-magnesium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
           project-pattern: infrautils
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-infrautils/38993/
           rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'infrautils'
     project-name: 'infrautils'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
+    java-version: 'openjdk11'
     mvn-settings: 'infrautils-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream}'
@@ -53,7 +54,7 @@
     staging-profile-id: 96fca0367756c
 
 - project:
-    name: infrautils-neon
+    name: infrautils-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'infrautils'
     project-name: 'infrautils'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     mvn-settings: 'infrautils-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream}'
index ccea7fcf1e34397ef7008b84673111e78105873d..01409f2c5246cb8421fe196b25755395e02ebad5 100644 (file)
@@ -10,7 +10,7 @@ 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"
+export CONTROLLERMEM=${CONTROLLERMAXMEM}
 
 # Cluster specific configuration settings
 export AKKACONF=/tmp/${BUNDLEFOLDER}/configuration/initial/akka.conf
@@ -83,10 +83,8 @@ function configure_karaf_log() {
     echo "Configuring the karaf log... karaf_version: ${karaf_version}, logapi: ${logapi}"
     if [ "${logapi}" == "log4j2" ]; then
         # FIXME: Make log size limit configurable from build parameter.
-        # From Neon the default karaf file size is 64 MB
+        # Increase default log file size to 1GB
         sed -ie 's/log4j2.appender.rolling.policies.size.size = 64MB/log4j2.appender.rolling.policies.size.size = 1GB/g' "${LOGCONF}"
-        # Flourine still uses 16 MB
-        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}"
@@ -223,6 +221,11 @@ function get_test_suites() {
         testplan_filepath="${WORKSPACE}/test/csit/testplans/${TESTPLAN}"
     fi
 
+    if [ "${ELASTICSEARCHATTRIBUTE}" != "disabled" ]; then
+        add_test="integration/test/csit/suites/integration/Create_JVM_Plots.robot"
+        echo "${add_test}" >> "$testplan_filepath"
+    fi
+
     echo "Changing the testplan path..."
     sed "s:integration:${WORKSPACE}:" "${testplan_filepath}" > testplan.txt
     cat testplan.txt
@@ -282,6 +285,125 @@ function run_plan() {
     printf "Finished running %s plans\\n" "${type}"
 } # function run_plan()
 
+# Run scripts to support JVM monitoring.
+function add_jvm_support()
+{
+    if [ "${ELASTICSEARCHATTRIBUTE}" != "disabled" ]; then
+        set_elasticsearch_attribute "${ELASTICSEARCHATTRIBUTE}"
+        set_jvm_common_attribute
+    fi
+} # function add_jvm_support()
+
+#Expected input parameter: long/short/a number
+function set_elasticsearch_attribute()
+{
+short=5000
+long=120000
+default=$short
+
+case $1 in
+short)
+  period=$short
+  ;;
+long)
+  period=$long
+  ;;
+*)
+  # shellcheck disable=SC2166
+  if [[ "$1" =~ ^[0-9]+$ ]] && [ "$1" -ge $short -a "$1" -le $long ]; then
+      period=$1
+  else
+      period=$default
+  fi
+  ;;
+esac
+
+cat > "${WORKSPACE}"/org.apache.karaf.decanter.scheduler.simple.cfg <<EOF
+period=$period
+
+EOF
+
+echo "Copying config files to ODL Controller folder"
+
+# shellcheck disable=SC2086
+for i in $(seq 1 ${NUM_ODL_SYSTEM})
+do
+        CONTROLLERIP=ODL_SYSTEM_${i}_IP
+        echo "Set Decanter Polling Period to ${!CONTROLLERIP}"
+        # shellcheck disable=SC2029
+        ssh "${!CONTROLLERIP}" "mkdir -p \"/tmp/${BUNDLEFOLDER}/etc/opendaylight/karaf/\""
+        scp "${WORKSPACE}"/org.apache.karaf.decanter.scheduler.simple.cfg "${!CONTROLLERIP}":/tmp/"${BUNDLEFOLDER}"/etc/
+done
+} #function set_elasticsearch_attribute
+
+function set_jvm_common_attribute()
+{
+cat > "${WORKSPACE}"/org.apache.karaf.decanter.collector.jmx-local.cfg <<EOF
+type=jmx-local
+url=local
+object.name=java.lang:type=*,name=*
+
+EOF
+
+cat > "${WORKSPACE}"/org.apache.karaf.decanter.collector.jmx-others.cfg <<EOF
+type=jmx-local
+url=local
+object.name=java.lang:type=*
+
+EOF
+
+# shellcheck disable=SC2086
+for i in $(seq 1 ${NUM_ODL_SYSTEM})
+do
+    CONTROLLERIP=ODL_SYSTEM_${i}_IP
+
+    cat > "${WORKSPACE}"/elasticsearch.yml <<EOF
+    discovery.zen.ping.multicast.enabled: false
+
+EOF
+
+    cat > "${WORKSPACE}"/elasticsearch_startup.sh <<EOF
+    cd /tmp/elasticsearch/elasticsearch-1.7.5
+    ls -al
+
+    if [ -d "data" ]; then
+        echo "data directory exists, deleting...."
+        rm -r data
+    else
+        echo "data directory does not exist"
+    fi
+
+    cd /tmp/elasticsearch
+    ls -al
+
+    echo "Starting Elasticsearch node"
+    sudo /tmp/elasticsearch/elasticsearch-1.7.5/bin/elasticsearch > /dev/null 2>&1 &
+    ls -al /tmp/elasticsearch/elasticsearch-1.7.5/bin/elasticsearch
+
+EOF
+    echo "Setup ODL_SYSTEM_IP specific config files for ${!CONTROLLERIP} "
+    cat "${WORKSPACE}"/org.apache.karaf.decanter.collector.jmx-local.cfg
+    cat "${WORKSPACE}"/org.apache.karaf.decanter.collector.jmx-others.cfg
+    cat "${WORKSPACE}"/elasticsearch.yml
+
+
+    echo "Copying config files to ${!CONTROLLERIP}"
+    scp "${WORKSPACE}"/org.apache.karaf.decanter.collector.jmx-local.cfg "${!CONTROLLERIP}":/tmp/"${BUNDLEFOLDER}"/etc/
+    scp "${WORKSPACE}"/org.apache.karaf.decanter.collector.jmx-others.cfg "${!CONTROLLERIP}":/tmp/"${BUNDLEFOLDER}"/etc/
+    scp "${WORKSPACE}"/elasticsearch.yml "${!CONTROLLERIP}":/tmp/
+
+    ssh "${!CONTROLLERIP}" "sudo ls -al /tmp/elasticsearch/"
+    ssh "${!CONTROLLERIP}" "sudo mv /tmp/elasticsearch.yml /tmp/elasticsearch/elasticsearch-1.7.5/config/"
+    ssh "${!CONTROLLERIP}" "cat /tmp/elasticsearch/elasticsearch-1.7.5/config/elasticsearch.yml"
+
+    echo "Copying the elasticsearch_startup script to ${!CONTROLLERIP}"
+    cat "${WORKSPACE}"/elasticsearch_startup.sh
+    scp "${WORKSPACE}"/elasticsearch_startup.sh "${!CONTROLLERIP}":/tmp
+    ssh "${!CONTROLLERIP}" 'bash /tmp/elasticsearch_startup.sh'
+    ssh "${!CONTROLLERIP}" 'ps aux | grep elasticsearch'
+done
+} #function set_jvm_common_attribute
+
 # Return elapsed time. Usage:
 # - Call first time with no arguments and a new timer is returned.
 # - Next call with the first argument as the timer and the elapsed time is returned.
@@ -340,6 +462,7 @@ DISTROSTREAM: ${DISTROSTREAM}
 BUNDLE_URL: ${BUNDLE_URL}
 CONTROLLERFEATURES: ${CONTROLLERFEATURES}
 CONTROLLERDEBUGMAP: ${CONTROLLERDEBUGMAP}
+CONTROLLERMAXMEM: ${CONTROLLERMAXMEM}
 SCRIPTPLAN: ${SCRIPTPLAN}
 CONFIGPLAN: ${CONFIGPLAN}
 STREAMTESTPLAN: ${STREAMTESTPLAN}
@@ -733,11 +856,21 @@ function get_nodes_list() {
 function get_features() {
     if [ "${CONTROLLERSCOPE}" == 'all' ]; then
         ACTUALFEATURES="odl-integration-compatible-with-all,${CONTROLLERFEATURES}"
-        export CONTROLLERMEM="3072m"
+        # if CONTROLLERMEM still is the default 2G and was not overridden by a
+        # custom job, then we need to make sure to increase it because "all"
+        # features can be heavy
+        if [ "${CONTROLLERMEM}" == "2048m" ]; then
+            export CONTROLLERMEM="3072m"
+        fi
     else
         ACTUALFEATURES="odl-infrautils-ready,${CONTROLLERFEATURES}"
     fi
 
+    if [ "${ELASTICSEARCHATTRIBUTE}" != "disabled" ]; then
+        # Add decanter features to allow JVM monitoring
+        ACTUALFEATURES="${ACTUALFEATURES},decanter-collector-jmx,decanter-appender-elasticsearch-rest"
+    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')
@@ -782,7 +915,7 @@ if [[ "$KARAF_VERSION" == "karaf4" ]]; then
     FEATURE_TEST_STRING="features-test"
 fi
 
-sed -ie "s%\\(featuresRepositories=\\|featuresRepositories =\\)%featuresRepositories = mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/${BUNDLE_VERSION}/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}/${BUNDLE_VERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.2.0/xml/features,%g" ${FEATURESCONF}
 if [[ ! -z "${REPO_URL}" ]]; then
    sed -ie "s%featuresRepositories =%featuresRepositories = ${REPO_URL},%g" ${FEATURESCONF}
 fi
@@ -835,7 +968,7 @@ function create_post_startup_script() {
 # 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;
+    netstat -na | grep ":::8101" && break;
     loop_count=\$[\$loop_count+1];
     sleep 5;
 done
@@ -847,7 +980,7 @@ sshpass -p karaf ssh -o StrictHostKeyChecking=no \
                      -o UserKnownHostsFile=/dev/null \
                      -o LogLevel=error \
                      -p 8101 karaf@localhost \
-                     "bundle:refresh org.apache.karaf.decanter.collector.jmx && bundle:refresh org.apache.karaf.decanter.appender.elasticsearch"
+                     "bundle:refresh org.apache.karaf.decanter.collector.jmx && bundle:refresh org.apache.karaf.decanter.api"
 
 if [[ "$USEFEATURESBOOT" != "True" ]]; then
 
@@ -880,7 +1013,7 @@ done;
 
 # if we ended up not finding ready status in the above loop, we can output some debugs
 grep 'org.opendaylight.infrautils.*System ready' /tmp/${BUNDLEFOLDER}/data/log/karaf.log
-if [ $? -ne 0 ]; then
+if [ \$? -ne 0 ]; then
     echo "Timeout Controller DOWN"
     echo "Dumping first 500K bytes of karaf log..."
     head --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
diff --git a/jjb/integration/csit-jobs-aluminium.lst b/jjb/integration/csit-jobs-aluminium.lst
new file mode 100644 (file)
index 0000000..6c70d5d
--- /dev/null
@@ -0,0 +1,75 @@
+aaa-csit-1node-authn-all-aluminium,
+bgpcep-csit-1node-bgp-ingest-all-aluminium,
+bgpcep-csit-1node-bgp-ingest-mixed-all-aluminium,
+bgpcep-csit-1node-throughpcep-all-aluminium,
+bgpcep-csit-1node-userfeatures-all-aluminium,
+bgpcep-csit-3node-bgpclustering-all-aluminium,
+bgpcep-csit-3node-bgpclustering-ha-only-aluminium,
+controller-csit-1node-akka1-all-aluminium,
+controller-csit-1node-benchmark-all-aluminium,
+controller-csit-1node-rest-cars-perf-all-aluminium,
+controller-csit-3node-benchmark-all-aluminium,
+controller-csit-3node-clustering-ask-all-aluminium,
+controller-csit-3node-clustering-tell-all-aluminium,
+controller-csit-3node-rest-clust-cars-perf-ask-only-aluminium,
+controller-csit-3node-rest-clust-cars-perf-tell-only-aluminium,
+daexim-csit-1node-basic-only-aluminium,
+daexim-csit-3node-clustering-basic-only-aluminium,
+distribution-csit-1node-userfeatures-all-aluminium,
+distribution-csit-managed-aluminium,
+genius-csit-1node-upstream-only-aluminium,
+genius-csit-3node-upstream-only-aluminium,
+jsonrpc-csit-1node-basic-only-aluminium,
+lispflowmapping-csit-1node-msmr-all-aluminium,
+lispflowmapping-csit-1node-performance-only-aluminium,
+lispflowmapping-csit-3node-msmr-all-aluminium,
+netconf-csit-1node-callhome-only-aluminium,
+netconf-csit-1node-scale-max-devices-only-aluminium,
+netconf-csit-1node-scale-only-aluminium,
+netconf-csit-1node-userfeatures-all-aluminium,
+netconf-csit-1node-userfeatures-rfc8040-all-aluminium,
+netconf-csit-3node-clustering-only-aluminium,
+netconf-csit-3node-clustering-scale-only-aluminium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-upstream-snat-conntrack-aluminium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-dcgw-aluminium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-aluminium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-snat-conntrack-aluminium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-aluminium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-aluminium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-aluminium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-aluminium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-aluminium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-aluminium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-aluminium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-aluminium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-snat-conntrack-aluminium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-aluminium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-aluminium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-snat-conntrack-aluminium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-aluminium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-aluminium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-snat-conntrack-aluminium,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-dcgw-aluminium,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-aluminium,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-aluminium,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-aluminium,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-aluminium,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-aluminium,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-aluminium,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-aluminium,
+netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-aluminium,
+netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-aluminium,
+odltools-csit-1node-upstream-all-aluminium,
+openflowplugin-csit-1node-bundle-based-reconciliation-all-aluminium,
+openflowplugin-csit-1node-cbench-only-aluminium,
+openflowplugin-csit-1node-flow-services-all-aluminium,
+openflowplugin-csit-1node-perf-bulkomatic-only-aluminium,
+openflowplugin-csit-1node-perf-stats-collection-only-aluminium,
+openflowplugin-csit-1node-scale-link-only-aluminium,
+openflowplugin-csit-1node-scale-only-aluminium,
+openflowplugin-csit-1node-scale-switch-only-aluminium,
+openflowplugin-csit-3node-clustering-bulkomatic-only-aluminium,
+openflowplugin-csit-3node-clustering-only-aluminium,
+openflowplugin-csit-3node-clustering-perf-bulkomatic-only-aluminium,
+ovsdb-csit-1node-upstream-southbound-all-aluminium,
+ovsdb-csit-3node-upstream-clustering-only-aluminium,
index ff0a29c189e547365afbe994b0a7019541a22f16..a16bb28f2d854a37e6455e83d3191bef1de9c4d5 100644 (file)
@@ -1,3 +1,4 @@
+aaa-csit-1node-authn-all-magnesium,
 bgpcep-csit-1node-bgp-ingest-all-magnesium,
 bgpcep-csit-1node-bgp-ingest-mixed-all-magnesium,
 bgpcep-csit-1node-throughpcep-all-magnesium,
@@ -18,19 +19,19 @@ distribution-csit-1node-userfeatures-all-magnesium,
 distribution-csit-managed-magnesium,
 genius-csit-1node-upstream-only-magnesium,
 genius-csit-3node-upstream-only-magnesium,
+jsonrpc-csit-1node-basic-only-magnesium,
 lispflowmapping-csit-1node-msmr-all-magnesium,
 lispflowmapping-csit-1node-performance-only-magnesium,
 lispflowmapping-csit-3node-msmr-all-magnesium,
-mdsal-csit-1node-bindingv1-only-magnesium,
 netconf-csit-1node-callhome-only-magnesium,
 netconf-csit-1node-scale-max-devices-only-magnesium,
 netconf-csit-1node-scale-only-magnesium,
 netconf-csit-1node-userfeatures-all-magnesium,
+netconf-csit-1node-userfeatures-rfc8040-all-magnesium,
 netconf-csit-3node-clustering-only-magnesium,
 netconf-csit-3node-clustering-scale-only-magnesium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-upstream-snat-conntrack-magnesium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-dcgw-magnesium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-sfc-magnesium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-magnesium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-snat-conntrack-magnesium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-magnesium,
@@ -40,6 +41,14 @@ netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-magnesium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-magnesium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-magnesium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-magnesium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-magnesium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-snat-conntrack-magnesium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-magnesium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-magnesium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-snat-conntrack-magnesium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-magnesium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-magnesium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-snat-conntrack-magnesium,
 netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-dcgw-magnesium,
 netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-magnesium,
 netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-magnesium,
@@ -64,6 +73,3 @@ openflowplugin-csit-3node-clustering-only-magnesium,
 openflowplugin-csit-3node-clustering-perf-bulkomatic-only-magnesium,
 ovsdb-csit-1node-upstream-southbound-all-magnesium,
 ovsdb-csit-3node-upstream-clustering-only-magnesium,
-sfc-csit-3node-docker-full-deploy-all-magnesium,
-sfc-csit-3node-rest-basic-all-magnesium,
-yangtools-csit-1node-system-only-magnesium,
diff --git a/jjb/integration/csit-jobs-neon.lst b/jjb/integration/csit-jobs-neon.lst
deleted file mode 100644 (file)
index 369e4da..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-aaa-csit-1node-authn-all-neon,
-bgpcep-csit-1node-bgp-ingest-all-neon,
-bgpcep-csit-1node-bgp-ingest-mixed-all-neon,
-bgpcep-csit-1node-throughpcep-all-neon,
-bgpcep-csit-1node-userfeatures-all-neon,
-bgpcep-csit-3node-bgpclustering-all-neon,
-bgpcep-csit-3node-bgpclustering-ha-only-neon,
-controller-csit-1node-akka1-all-neon,
-controller-csit-1node-benchmark-all-neon,
-controller-csit-1node-rest-cars-perf-all-neon,
-controller-csit-3node-benchmark-all-neon,
-controller-csit-3node-clustering-ask-all-neon,
-controller-csit-3node-clustering-tell-all-neon,
-controller-csit-3node-rest-clust-cars-perf-ask-only-neon,
-controller-csit-3node-rest-clust-cars-perf-tell-only-neon,
-daexim-csit-1node-basic-only-neon,
-daexim-csit-3node-clustering-basic-only-neon,
-distribution-csit-1node-userfeatures-all-neon,
-distribution-csit-managed-neon,
-genius-csit-1node-upstream-only-neon,
-genius-csit-3node-upstream-only-neon,
-lispflowmapping-csit-1node-msmr-all-neon,
-lispflowmapping-csit-1node-performance-only-neon,
-lispflowmapping-csit-3node-msmr-all-neon,
-mdsal-csit-1node-bindingv1-only-neon,
-netconf-csit-1node-callhome-only-neon,
-netconf-csit-1node-scale-max-devices-only-neon,
-netconf-csit-1node-scale-only-neon,
-netconf-csit-1node-userfeatures-all-neon,
-netconf-csit-3node-clustering-only-neon,
-netconf-csit-3node-clustering-scale-only-neon,
-netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-upstream-snat-conntrack-neon,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-sfc-neon,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-neon,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-snat-conntrack-neon,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-neon,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-neon,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-neon,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-snat-conntrack-neon,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-neon,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-neon,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-snat-conntrack-neon,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-neon,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-neon,
-netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon,
-netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon,
-odltools-csit-1node-upstream-all-neon,
-openflowplugin-csit-1node-bundle-based-reconciliation-all-neon,
-openflowplugin-csit-1node-cbench-only-neon,
-openflowplugin-csit-1node-flow-services-all-neon,
-openflowplugin-csit-1node-perf-bulkomatic-only-neon,
-openflowplugin-csit-1node-perf-stats-collection-only-neon,
-openflowplugin-csit-1node-scale-link-only-neon,
-openflowplugin-csit-1node-scale-only-neon,
-openflowplugin-csit-1node-scale-switch-only-neon,
-openflowplugin-csit-3node-clustering-bulkomatic-only-neon,
-openflowplugin-csit-3node-clustering-only-neon,
-openflowplugin-csit-3node-clustering-perf-bulkomatic-only-neon,
-ovsdb-csit-1node-upstream-southbound-all-neon,
-ovsdb-csit-3node-upstream-clustering-only-neon,
-sfc-csit-3node-docker-full-deploy-all-neon,
-sfc-csit-3node-rest-basic-all-neon,
-yangtools-csit-1node-system-only-neon,
index 6be55703aaf969398e064c7f35e764652a9e9da6..902f7143065cbfa5a53cb22add85ae350617fb1d 100644 (file)
@@ -1,3 +1,4 @@
+aaa-csit-1node-authn-all-sodium,
 bgpcep-csit-1node-bgp-ingest-all-sodium,
 bgpcep-csit-1node-bgp-ingest-mixed-all-sodium,
 bgpcep-csit-1node-throughpcep-all-sodium,
@@ -21,16 +22,15 @@ genius-csit-3node-upstream-only-sodium,
 lispflowmapping-csit-1node-msmr-all-sodium,
 lispflowmapping-csit-1node-performance-only-sodium,
 lispflowmapping-csit-3node-msmr-all-sodium,
-mdsal-csit-1node-bindingv1-only-sodium,
 netconf-csit-1node-callhome-only-sodium,
 netconf-csit-1node-scale-max-devices-only-sodium,
 netconf-csit-1node-scale-only-sodium,
 netconf-csit-1node-userfeatures-all-sodium,
+netconf-csit-1node-userfeatures-rfc8040-all-sodium,
 netconf-csit-3node-clustering-only-sodium,
 netconf-csit-3node-clustering-scale-only-sodium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-upstream-snat-conntrack-sodium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-dcgw-sodium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-sfc-sodium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-snat-conntrack-sodium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-sodium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-sodium,
@@ -45,6 +45,9 @@ netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-sodium,
 netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-sodium,
 netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-snat-conntrack-sodium,
 netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-sodium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-sodium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-snat-conntrack-sodium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-sodium,
 netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-dcgw-sodium,
 netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-sodium,
 netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-sodium,
@@ -71,4 +74,3 @@ ovsdb-csit-1node-upstream-southbound-all-sodium,
 ovsdb-csit-3node-upstream-clustering-only-sodium,
 sfc-csit-3node-docker-full-deploy-all-sodium,
 sfc-csit-3node-rest-basic-all-sodium,
-yangtools-csit-1node-system-only-sodium,
index f6d57342e2ae0af49b138b47a83b3e286deee844..84ea9ea6e10378054a6f192971763b0ddc3bb617 100644 (file)
@@ -64,7 +64,7 @@ netstat -pnatu
 
 if [ "$JDKVERSION" == 'openjdk11' ]; then
     echo "Preparing for JRE Version 11"
-    JAVA_HOME="/opt/jdk-11"
+    JAVA_HOME="/usr/lib/jvm/java-11-openjdk"
 elif [ "${JDKVERSION}" == 'openjdk8' ]; then
     echo "Setting the JRE Version to 8"
     # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start.
index 440077193640fb611efd183c38c53335f31d444d..e90c66301ef18f1b9c397b2139e41f38a0f540a7 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 65387ddfd713a63d9b53634476d86215d27d3fb3..d6278459213f99b7761463adab15439ca4c18458 100644 (file)
     nexus-iq-stage: release
     email-upstream: '[int/dist]'
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          java-version: 'openjdk11'
+          jre: 'openjdk11'
+          karaf-version: odl
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
           karaf-version: odl
       - sodium:
           branch: 'stable/sodium'
               odl-transportpce,
               odl-transportpce-api,
               odl-transportpce-ordmodels
-      - neon:
-          branch: 'stable/neon'
-          karaf-version: odl
-          # Self-Managed projects repos and features:
-          sm-repos: >
-              mvn:org.opendaylight.transportpce/features-transportpce//xml/features
-          sm-features: >
-              odl-transportpce,
-              odl-transportpce-api,
-              odl-transportpce-ordmodels
 
 - project:
     name: distribution-managed
     dist-pom: 'distribution/pom.xml'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           java-version: 'openjdk11'
+          jre: 'openjdk11'
+          dependencies: >
+              aaa-maven-merge-{stream},
+              bgpcep-maven-merge-{stream},
+              controller-maven-merge-{stream},
+              daexim-maven-merge-{stream},
+              genius-maven-merge-{stream},
+              infrautils-maven-merge-{stream},
+              jsonrpc-maven-merge-{stream},
+              lispflowmapping-maven-merge-{stream},
+              netconf-maven-merge-{stream},
+              netvirt-maven-merge-{stream}
+              neutron-maven-merge-{stream},
+              openflowplugin-maven-merge-{stream},
+              ovsdb-maven-merge-{stream},
+              serviceutils-maven-merge-{stream},
+      - magnesium:
+          branch: 'stable/magnesium'
+          java-version: 'openjdk11'
+          jre: 'openjdk11'
           dependencies: >
               aaa-maven-merge-{stream},
               bgpcep-maven-merge-{stream},
-              coe-maven-merge-{stream},
               controller-maven-merge-{stream},
               daexim-maven-merge-{stream},
               genius-maven-merge-{stream},
               infrautils-maven-merge-{stream},
+              jsonrpc-maven-merge-{stream},
               lispflowmapping-maven-merge-{stream},
-              mdsal-maven-merge-{stream},
               netconf-maven-merge-{stream},
               netvirt-maven-merge-{stream}
               neutron-maven-merge-{stream},
               genius-merge-{stream},
               infrautils-merge-{stream},
               lispflowmapping-merge-{stream},
-              mdsal-merge-{stream},
-              netconf-merge-{stream},
-              netvirt-merge-{stream}
-              neutron-merge-{stream},
-              openflowplugin-merge-{stream},
-              ovsdb-merge-{stream},
-              serviceutils-merge-{stream},
-              sfc-merge-{stream}
-      - neon:
-          branch: 'stable/neon'
-          dependencies: >
-              aaa-merge-{stream},
-              bgpcep-merge-{stream},
-              coe-merge-{stream},
-              controller-merge-{stream},
-              daexim-merge-{stream},
-              genius-merge-{stream},
-              infrautils-merge-{stream},
-              lispflowmapping-merge-{stream},
-              mdsal-merge-{stream},
               netconf-merge-{stream},
               netvirt-merge-{stream}
               neutron-merge-{stream},
     dist-pom: 'distribution/opendaylight/pom.xml'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           java-version: 'openjdk11'
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
-      - sodium:
-          branch: 'stable/sodium'
+      - magnesium:
+          branch: 'stable/magnesium'
+          java-version: 'openjdk11'
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
-              transportpce-merge-{stream}
-      - neon:
-          branch: 'stable/neon'
+      - sodium:
+          branch: 'stable/sodium'
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
     staging-profile-id: 2af042ed81d5e2
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           java-version: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
 - project:
     name: distribution-sonar
     mvn-settings: integration-distribution-settings
     mvn-goals: clean install dependency:tree -DoutputFile=dependency_tree.txt
     mvn-opts: '-Xmx1024m'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
     name: distribution-view
index 7fc1f740de5cedbda9ddaaa99aeb080cefd9e682..b7019f85492e06c48f1160bd88820ba3061593a2 100644 (file)
       - integration-controller-parameters:
           controller-features: '{sm-features}'
           # Parameters below are unused in this job so set them all to blank
+          controller-max-mem: ''
           controller-debug-map: ''
           controller-scope: ''
           controller-use-features-boot: ''
+          feature-elasticsearch-attribute: '{elasticsearch-attribute}'
       - integration-jdk-version:
           jdkversion: '{jre}'
       - distribution-karaf-version:
index 33f7b546380e27b206da03000f1c0a892c986610..0fdcb9c587be2a2771f24f313e26e19dd0e6a16e 100644 (file)
@@ -18,6 +18,8 @@ nodes_list=$(get_nodes_list)
 
 run_plan "script"
 
+add_jvm_support
+
 create_configuration_script
 
 create_startup_script
index efb10877920858c737350125102820a2f3fee5b3..e04cfd7bddb100c014704f8941e6d691c5271942 100755 (executable)
@@ -18,6 +18,8 @@ nodes_list=$(get_nodes_list)
 
 run_plan "script"
 
+add_jvm_support
+
 create_configuration_script
 
 create_startup_script
index 0ca5106ce38907945139fd07a1da65f6ae27b58e..81afad6b154f82c15f8c9bf7606917fa1646b2e4 100644 (file)
@@ -105,7 +105,7 @@ function install_openstack_clients_in_robot_vm() {
 
     if [ "${ENABLE_NETWORKING_L2GW}" == "yes" ]; then
         #networking-l2gw is not officially available in any release yet. Getting the latest stable version.
-        $PYTHON -m pip install networking-l2gw==11.0.0
+        $PYTHON -m pip install networking-l2gw==11.0.0 more-itertools==5.0.0
     fi
 }
 
index c31de85f5b4b95ed983f4a67dd47d60053fc7cb2..a5fd3c6fec02bf2fe0f5833554881abbf247ab11 100644 (file)
       - integration-controller-parameters:
           controller-debug-map: '{debug-map}'
           controller-features: '{install-features}'
+          controller-max-mem: '{controller-max-mem}'
           controller-scope: '{controller-scope}'
           controller-use-features-boot: '{use-features-boot}'
+          feature-elasticsearch-attribute: '{elasticsearch-attribute}'
 
 - parameter:
     name: integration-controller-parameters
       - string:
           name: CONTROLLERFEATURES
           default: '{controller-features}'
-          description: 'Features to install in the controller separated by comma'
+          description: |
+              Features to install in the controller separated by comma.
+              (note: Do not include decanter* features used for harvesting JVM metrics.
+               They are inserted in install scripts.)
 
       - string:
           name: CONTROLLERDEBUGMAP
               The levels must be one of: ERROR, WARN, INFO, DEBUG, TRACE.
               (ex. ovsdb.lib:ERROR netvirt.vpnservice:INFO)
 
+      - string:
+          name: CONTROLLERMAXMEM
+          default: '{controller-max-mem}'
+          description: |
+              Max Heap size to use when starting the controller.
+
+      - string:
+          name: ELASTICSEARCHATTRIBUTE
+          default: '{feature-elasticsearch-attribute}'
+          description: |
+              Configure the period the script should harvest JVM metrics.
+              Possible values: long (=120000)
+                               short (=5000)
+                               any number between 5000 and 120000
+                               disabled (use for disabling harvesting)
+
       - string:
           name: USEFEATURESBOOT
           default: '{controller-use-features-boot}'
           only-critical: false
       - integration-csit-archive-build
       - integration-csit-run-postscript
-      - releng-openstack-stack-delete
 
 - publisher:
     name: integration-csit-archive-build
index a1e46356bc267fa8bd2696f415772375e92fe330..e077c34aecd47d8b07865a08b4b4b5af2345a970 100644 (file)
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381'
-    tools_system_count: 1
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
+    controller-max-mem: '2048m'
+    tools_system_count: '1'
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     #####################
     # Job configuration #
           robot-options: '{robot-options}'
           # Controller
           controller-scope: only
+          controller-max-mem: '{controller-max-mem}'
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: 'True'
+          elasticsearch-attribute: '{elasticsearch-attribute}'
       - integration-stack-2-type:
-          vm_0_count: 1
+          vm_0_count: '1'
           vm_0_flavor: '{odl_system_flavor}'
           vm_0_image: '{odl_system_image}'
           vm_1_count: '{tools_system_count}'
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381'
-    tools_system_count: 1
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
+    controller-max-mem: '2048m'
+    tools_system_count: '1'
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+
 
     #####################
     # Job configuration #
           robot-options: '{robot-options}'
           # Controller
           controller-scope: '{scope}'
+          controller-max-mem: '{controller-max-mem}'
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: 'True'
+          elasticsearch-attribute: '{elasticsearch-attribute}'
       - integration-stack-2-type:
-          vm_0_count: 1
+          vm_0_count: '1'
           vm_0_flavor: '{odl_system_flavor}'
           vm_0_image: '{odl_system_image}'
           vm_1_count: '{tools_system_count}'
           robot-options: '{robot-options}'
           # Controller
           controller-scope: '{scope}'
+          controller-max-mem: '{controller-max-mem}'
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: 'True'
+          elasticsearch-attribute: '{elasticsearch-attribute}'
       - integration-stack-2-type:
-          vm_0_count: 1
+          vm_0_count: '1'
           vm_0_flavor: '{odl_system_flavor}'
           vm_0_image: '{odl_system_image}'
           vm_1_count: '{tools_system_count}'
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381'
-    tools_system_count: 1
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
+    controller-max-mem: '2048m'
+    tools_system_count: '1'
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     #####################
     # Job Configuration #
           robot-options: '{robot-options}'
           # Controller
           controller-scope: only
+          controller-max-mem: '{controller-max-mem}'
           debug-map: '{debug-map}'
           install-features: 'odl-jolokia,{install-features}'
           use-features-boot: 'True'
+          elasticsearch-attribute: '{elasticsearch-attribute}'
       - integration-stack-2-type:
-          vm_0_count: 3
+          vm_0_count: '3'
           vm_0_flavor: '{odl_system_flavor}'
           vm_0_image: '{odl_system_image}'
           vm_1_count: '{tools_system_count}'
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381'
-    tools_system_count: 1
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
+    controller-max-mem: '2048m'
+    tools_system_count: '1'
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     #####################
     # Job configuration #
           robot-options: '{robot-options}'
           # Controller
           controller-scope: '{scope}'
+          controller-max-mem: '{controller-max-mem}'
           debug-map: '{debug-map}'
           install-features: 'odl-jolokia,{install-features}'
           use-features-boot: 'True'
+          elasticsearch-attribute: '{elasticsearch-attribute}'
       - integration-stack-2-type:
-          vm_0_count: 3
+          vm_0_count: '3'
           vm_0_flavor: '{odl_system_flavor}'
           vm_0_image: '{odl_system_image}'
           vm_1_count: '{tools_system_count}'
           robot-options: '{robot-options}'
           # Controller
           controller-scope: '{scope}'
+          controller-max-mem: '{controller-max-mem}'
           debug-map: '{debug-map}'
           install-features: 'odl-jolokia,{install-features}'
           use-features-boot: 'True'
+          elasticsearch-attribute: '{elasticsearch-attribute}'
       - integration-stack-2-type:
-          vm_0_count: 3
+          vm_0_count: '3'
           vm_0_flavor: '{odl_system_flavor}'
           vm_0_image: '{odl_system_image}'
           vm_1_count: '{tools_system_count}'
 
     odl_system_count: 1
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381'
-    docker_system_count: 1
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
+    controller-max-mem: '2048m'
+    docker_system_count: '1'
     docker_system_flavor: 'odl-standard-1'
     docker_system_image: 'ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840'
 
           robot-options: '{robot-options}'
           # Controller
           controller-scope: '{scope}'
+          controller-max-mem: '{controller-max-mem}'
           debug-map: '{debug-map}'
           install-features: 'odl-jolokia,{install-features}'
           use-features-boot: 'True'
+          elasticsearch-attribute: '{elasticsearch-attribute}'
       - integration-stack-2-type:
-          vm_0_count: 3
+          vm_0_count: '3'
           vm_0_flavor: '{odl_system_flavor}'
           vm_0_image: '{odl_system_image}'
           vm_1_count: '{docker_system_count}'
 
     odl_system_count: 1
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
+    controller-max-mem: '2048m'
     openstack_system_count: 1
     openstack_system_flavor: 'odl-standard-4'
     openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
     openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     #####################
     # Job configuration #
           robot-options: '{robot-options}'
           # Controller
           controller-scope: ''
+          controller-max-mem: '{controller-max-mem}'
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: '{use-features-boot}'
+          elasticsearch-attribute: '{elasticsearch-attribute}'
       - integration-stack-4-type:
           vm_0_count: '{odl_system_count}'
           vm_0_flavor: '{odl_system_flavor}'
           robot-options: '{robot-options}'
           # Controller
           controller-scope: ''
+          controller-max-mem: '{controller-max-mem}'
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: '{use-features-boot}'
+          elasticsearch-attribute: '{elasticsearch-attribute}'
       - integration-stack-4-type:
           vm_0_count: '{odl_system_count}'
           vm_0_flavor: '{odl_system_flavor}'
 
     odl_system_count: 1
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
+    controller-max-mem: '2048m'
     openstack_system_count: 1
     openstack_system_flavor: 'odl-standard-4'
     openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
     openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     #####################
     # Job configuration #
           robot-options: '{robot-options}'
           # Controller
           controller-scope: ''
+          controller-max-mem: '{controller-max-mem}'
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: '{use-features-boot}'
+          elasticsearch-attribute: '{elasticsearch-attribute}'
       - integration-stack-4-type:
           vm_0_count: '{odl_system_count}'
           vm_0_flavor: '{odl_system_flavor}'
           robot-options: '{robot-options}'
           # Controller
           controller-scope: ''
+          controller-max-mem: '{controller-max-mem}'
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: '{use-features-boot}'
+          elasticsearch-attribute: '{elasticsearch-attribute}'
       - integration-stack-4-type:
           vm_0_count: '{odl_system_count}'
           vm_0_flavor: '{odl_system_flavor}'
     openstack-cloud: vex
     openstack-heat-template: csit-apex-3-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
+    controller-max-mem: '2048m'
 
     #####################
     # Job configuration #
           robot-options: '{robot-options}'
           # Controller
           controller-scope: ''
+          controller-max-mem: '{controller-max-mem}'
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: '{use-features-boot}'
+          elasticsearch-attribute: '{elasticsearch-attribute}'
       - integration-stack-3-type:
           vm_0_count: '{apex_controller_count}'
           vm_0_flavor: '{apex_controller_flavor}'
           vm_0_image: '{apex_controller_image}'
-          vm_1_count: 1
+          vm_1_count: '1'
           vm_1_flavor: '{apex_compute_0_flavor}'
           vm_1_image: '{apex_compute_0_image}'
-          vm_2_count: 1
+          vm_2_count: '1'
           vm_2_flavor: '{apex_compute_1_flavor}'
           vm_2_image: '{apex_compute_1_image}'
       - integration-distribution-branch:
           robot-options: '{robot-options}'
           # Controller
           controller-scope: ''
+          controller-max-mem: '{controller-max-mem}'
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: '{use-features-boot}'
+          elasticsearch-attribute: '{elasticsearch-attribute}'
       - integration-stack-3-type:
           vm_0_count: '{apex_controller_count}'
           vm_0_flavor: '{apex_controller_flavor}'
           vm_0_image: '{apex_controller_image}'
-          vm_1_count: 1
+          vm_1_count: '1'
           vm_1_flavor: '{apex_compute_0_flavor}'
           vm_1_image: '{apex_compute_0_image}'
-          vm_2_count: 1
+          vm_2_count: '1'
           vm_2_flavor: '{apex_compute_1_flavor}'
           vm_2_image: '{apex_compute_1_image}'
       - integration-distribution-branch:
index c91bf39afdc7fcf473f2b6e877e499c40b4da638..037f11cd83b363e4781279f882885105779e722f 100644 (file)
 
     # CSIT Lists in defaults.yaml
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           mvn-version: 'mvn35'
           java-version: 'openjdk11'
-          csit-list: !include: csit-jobs-magnesium.lst
+          csit-list: !include: csit-jobs-aluminium.lst
           build-order: >
               odlparent yangtools mdsal infrautils controller serviceutils aaa netconf
-              daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt
+              daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt
               bgpcep integration/distribution
 
-      - sodium:
-          branch: 'stable/sodium'
+      - magnesium:
+          branch: 'stable/magnesium'
           mvn-version: 'mvn35'
-          csit-list: !include: csit-jobs-sodium.lst
+          java-version: 'openjdk11'
+          csit-list: !include: csit-jobs-magnesium.lst
           build-order: >
               odlparent yangtools mdsal infrautils controller serviceutils aaa netconf
-              daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt
+              daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt
               bgpcep integration/distribution
 
-      - neon:
-          branch: 'stable/neon'
+      - sodium:
+          branch: 'stable/sodium'
           mvn-version: 'mvn35'
-          csit-list: !include: csit-jobs-neon.lst
+          csit-list: !include: csit-jobs-sodium.lst
           build-order: >
               odlparent yangtools mdsal infrautils controller serviceutils aaa netconf
               daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt
     project-name: integration-test
     jobs:
       - 'integration-distribution-test-{stream}'
+      - 'integration-distribution-mri-test-{stream}'
       - 'integration-distribution-weekly-test-trigger-{stream}'
       - 'integration-update-csit-tests-{stream}'
 
     # CSIT Lists in defaults.yaml
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           csit-blacklist: >
-              alto bier didm dluxapps groupbasedpolicy jsonrpc l2switch nemo
-              of-config p4plugin packetcable sxp telemetry tsdr unimgr usc
+              alto bier coe detnet dluxapps groupbasedpolicy l2switch mdsal nemo
+              p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
               gate longevity sanity tdd tempest wip
               netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
               netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
               netvirt-csit-3node-1cmb
               last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used
-          csit-list: !include: csit-jobs-magnesium.lst
-          csit-weekly-list: '{csit-weekly-list-magnesium}'
-      - sodium:
-          branch: 'stable/sodium'
+          csit-list: !include: csit-jobs-aluminium.lst
+          csit-mri-list: '{csit-mri-list-aluminium}'
+          csit-weekly-list: '{csit-weekly-list-aluminium}'
+      - magnesium:
+          branch: 'stable/magnesium'
           csit-blacklist: >
-              alto bier didm dluxapps groupbasedpolicy jsonrpc l2switch nemo
-              of-config p4plugin packetcable sxp telemetry tsdr unimgr usc
+              alto bier coe detnet dluxapps groupbasedpolicy l2switch mdsal nemo
+              p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
               gate longevity sanity tdd tempest wip
               netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
               netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
               netvirt-csit-3node-1cmb
               last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used
-          csit-list: !include: csit-jobs-sodium.lst
-          csit-weekly-list: '{csit-weekly-list-sodium}'
-      - neon:
-          branch: 'stable/neon'
+          csit-list: !include: csit-jobs-magnesium.lst
+          csit-mri-list: '{csit-mri-list-magnesium}'
+          csit-weekly-list: '{csit-weekly-list-magnesium}'
+      - sodium:
+          branch: 'stable/sodium'
           csit-blacklist: >
-              alto bier didm dluxapps groupbasedpolicy jsonrpc l2switch nemo
-              of-config p4plugin packetcable sxp telemetry tsdr unimgr usc
+              alto bier dluxapps groupbasedpolicy jsonrpc l2switch mdsal nemo
+              p4plugin packetcable sxp telemetry tsdr unimgr usc yangtools
               gate longevity sanity tdd tempest wip
               netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
               netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
               netvirt-csit-3node-1cmb
               last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used
-          csit-list: !include: csit-jobs-neon.lst
-          csit-weekly-list: '{csit-weekly-list-neon}'
+          csit-list: !include: csit-jobs-sodium.lst
+          csit-mri-list: '{csit-mri-list-sodium}'
+          csit-weekly-list: '{csit-weekly-list-sodium}'
 
 - project:
     name: integration-sanity
       - 'integration-sanity-test-{stream}'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           karaf-version: odl
+          csit-sanity-list: '{csit-sanity-list-aluminium}'
+      - magnesium:
+          branch: 'stable/magnesium'
+          karaf-version: odl
           csit-sanity-list: '{csit-sanity-list-magnesium}'
       - sodium:
           branch: 'stable/sodium'
           karaf-version: odl
           csit-sanity-list: '{csit-sanity-list-sodium}'
-      - neon:
-          branch: 'stable/neon'
-          karaf-version: odl
-          csit-sanity-list: '{csit-sanity-list-neon}'
 
 - job-template:
     name: 'integration-merge-dashboard'
           condition-expression: $RUN_TEST
           steps:
             - trigger-builds:
-                - project: '{csit-list}'
-                  block: true
+                - project: >
+                      integration-distribution-test-{stream},
+                      integration-distribution-mri-test-{stream}
                   predefined-parameters: |
                     BUNDLE_URL=$BUNDLE_URL
                     KARAF_VERSION=$KARAF_VERSION
           email-recipients: '{email-recipients}'
           email-prefix: '[int/dist]'
 
+- job-template:
+    name: 'integration-distribution-mri-test-{stream}'
+
+    project-type: freestyle
+    node: queue-intque-2c-1g
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
+
+    triggers:
+      - timed: '{schedule-weekly}'
+
+    builders:
+      - trigger-builds:
+          - project: '{csit-mri-list}'
+            block: true
+            predefined-parameters: |
+              BUNDLE_URL=$BUNDLE_URL
+              KARAF_VERSION=$KARAF_VERSION
+
+    publishers:
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[integration]'
+
 - job-template:
     name: 'integration-distribution-weekly-test-trigger-{stream}'
 
     views:
       - project-view
     project-name: integration
-
-- view:
-    name: csit-stable-ne
-    description: 'List of stable integration jobs for managed projects'
-    job-name:
-      - aaa-csit-1node-authn-all-neon
-      - bgpcep-csit-1node-throughpcep-all-neon
-      - controller-csit-1node-akka1-all-neon
-      - controller-csit-1node-benchmark-all-neon
-      - controller-csit-1node-notifications-longevity-only-neon
-      - controller-csit-1node-rest-cars-perf-all-neon
-      - controller-csit-3node-benchmark-all-neon
-      - controller-csit-3node-drb-precedence-longevity-only-neon
-      - controller-csit-3node-rest-clust-cars-perf-ask-only-neon
-      - controller-csit-3node-rest-clust-cars-perf-tell-only-neon
-      - daexim-csit-1node-basic-only-neon
-      - daexim-csit-3node-clustering-basic-only-neon
-      - distribution-csit-1node-userfeatures-all-neon
-      - genius-csit-1node-upstream-only-neon
-      - genius-csit-3node-upstream-only-neon
-      - lispflowmapping-csit-1node-msmr-all-neon
-      - netconf-csit-1node-callhome-only-neon
-      - netconf-csit-1node-userfeatures-all-neon
-      - netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-sfc-neon
-      - netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon
-      - openflowplugin-csit-1node-flow-services-all-neon
-      - openflowplugin-csit-1node-longevity-only-neon
-      - openflowplugin-csit-1node-perf-bulkomatic-only-neon
-      - openflowplugin-csit-1node-perf-stats-collection-only-neon
-      - openflowplugin-csit-1node-sanity-only-neon
-      - openflowplugin-csit-1node-scale-link-only-neon
-      - openflowplugin-csit-1node-scale-only-neon
-      - openflowplugin-csit-1node-scale-switch-only-neon
-      - openflowplugin-csit-3node-clustering-bulkomatic-only-neon
-      - openflowplugin-csit-3node-clustering-only-neon
-      - ovsdb-csit-3node-upstream-clustering-only-neon
-      - sfc-csit-3node-docker-full-deploy-all-neon
-      - sfc-csit-3node-rest-basic-all-neon
-    view-type: list
-    filter-executors: false
-    filter-queue: false
-    columns:
-      - status
-      - weather
-      - job
-      - last-success
-      - last-failure
-      - last-duration
-      - build-button
-      - jacoco
-      - find-bugs
-      - robot-list
-    recurse: false
index 2626339c57b8bed76bf9d2303afd147211c8633f..a29ce98353cb961553713e43b0ccabeb8e0282a0 100644 (file)
     # The functionality under test
     functionality: 'basic'
 
-    # Set trigger
-    trigger-jobs: '{project}-merge-{stream}'
-
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
@@ -31,7 +29,7 @@
     tools_system_count: 0
 
     # Features to install
-    install-features: 'odl-jsonrpc'
+    install-features: 'odl-jsonrpc-all'
 
     # Robot custom options
     robot-options: ''
index 5a339fb0627ffe7309b9b9b2071e1b4a4defef87..354db8a4bde0745a0c49c539ef5bc76c13801fa6 100644 (file)
@@ -1,7 +1,8 @@
 ---
 - project:
-    name: jsonrpc-magnesium
+    name: jsonrpc-aluminium
     jobs:
+      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: jsonrpc
@@ -13,7 +14,7 @@
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
-    stream: magnesium
+    stream: aluminium
     java-version: 'openjdk11'
     branch: 'master'
     mvn-settings: 'jsonrpc-settings'
     staging-profile-id: 96fdf4408765d
 
 - project:
-    name: jsonrpc-sodium
+    name: jsonrpc-magnesium
     jobs:
+      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: jsonrpc
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-jsonrpc/91870/
           rtd-token: 04d31d4414734686d63f9b160e974fe5a18d031d
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
-    stream: sodium
-    branch: 'stable/sodium'
+    stream: magnesium
+    java-version: 'openjdk11'
+    branch: 'stable/magnesium'
     mvn-settings: 'jsonrpc-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
@@ -48,7 +51,7 @@
     staging-profile-id: 96fdf4408765d
 
 - project:
-    name: jsonrpc-neon
+    name: jsonrpc-sodium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -60,8 +63,8 @@
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
-    stream: neon
-    branch: 'stable/neon'
+    stream: sodium
+    branch: 'stable/sodium'
     mvn-settings: 'jsonrpc-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
index c98b2e4ecf5e5b12570af64ccc813e8e612f04dc..a2ccbb1052752237f8cc052415e440e5b0499a22 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index 6263547c9d5f116f5fa31d7a5dde1016e0f9bbea..a35111d361e1c54238514d74e081117d8f109f0c 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index c80044e17a20af08fd56603b1a515ddf28db5430..23ab9c4c2ecbe2967619a90e2f3b3b072d3d4c5d 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index a2d0fa8fb90bcae9b0af0376a28022a000697816..268b6223c36e5d4e3e77b31a9f5ec5200ef0ce04 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          os-branch: 'queens'
-          java-version: 'openjdk11'
+          jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-          os-branch: 'queens'
-      - neon:
-          branch: 'stable/neon'
+
+    os-branch: 'queens'
 
     feature:
       - all:
index 1253ed55267ef70ea8fef7c168df4570d5048210..24c8ef7f676567787772022efe73acd8fc456a56 100644 (file)
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: l2switch-magnesium
+    name: l2switch-aluminium
     jobs:
       - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'l2switch'
     project-name: 'l2switch'
     branch: 'master'
     staging-profile-id: 96fee85953ca0
 
 - project:
-    name: l2switch-sodium
+    name: l2switch-magnesium
     jobs:
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'l2switch'
     project-name: 'l2switch'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
     mvn-settings: 'l2switch-settings'
     mvn-opts: '-Xmx1024m -Dmaven.compile.fork=true'
     dependencies: >
     staging-profile-id: 96fee85953ca0
 
 - project:
-    name: l2switch-neon
+    name: l2switch-sodium
     jobs:
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'l2switch'
     project-name: 'l2switch'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     mvn-settings: 'l2switch-settings'
     mvn-opts: '-Xmx1024m -Dmaven.compile.fork=true'
     dependencies: >
     mvn-settings: 'l2switch-settings'
     mvn-opts: '-Xmx1024m -Dmaven.compile.fork=true'
     disable-job: true
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
     name: l2switch-view
index 3e8ada5dc668f0cd815a3dcd6d3356ebffceee70..20d4d629923e23958862ff8e64d66b653b823116 100644 (file)
@@ -6,11 +6,11 @@
 
     project-name: lf-infra-ansible-roles
     project: ansible/roles/*
-    build-node: centos7-docker-2c-2g
+    build-node: ubuntu1804-docker-2c-2g
     build-timeout: 60
     stream: any
     branch: '*'
-    python-version: python2
+    python-version: python3
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: lf-releng
index a73f0402ae08f7dc8474e48d724e0480ceacbc1d..3df1c63d25eefe9bdfdbb7670bc8353acc2d822a 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index a5f30b4760fd1c64d43228079bd731cbc6a6d934..4a8c17c05e8aca4f26d7687119c90f6787418758 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index 0b99c46c51cded90957ed0c4c81d7810153650db..bf8b6d3ff95e743f7193ac12de98a597f25b61b1 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: lispflowmapping-magnesium
+    name: lispflowmapping-aluminium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -12,7 +12,7 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
     branch: 'master'
@@ -32,7 +32,7 @@
     staging-profile-id: 96fff2503b766
 
 - project:
-    name: lispflowmapping-sodium
+    name: lispflowmapping-magnesium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
           project-pattern: lispflowmapping
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/
           rtd-token: 181be9dd804e4969b9f318a6f1988e3cbee9d9a8
-      - odl-maven-jobs
-      - odl-maven-verify-jobs:
-          java-version:
-            - openjdk8
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
+    java-version: 'openjdk11'
     mvn-settings: 'lispflowmapping-settings'
-    mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
+    mvn-goals: 'clean deploy -DrepoBuild'
     mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
     dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
     email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
@@ -65,7 +64,7 @@
     staging-profile-id: 96fff2503b766
 
 - project:
-    name: lispflowmapping-neon
+    name: lispflowmapping-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
           java-version:
             - openjdk8
 
-    stream: neon
+    stream: sodium
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     mvn-settings: 'lispflowmapping-settings'
     mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
index 44da788e2c1fe5ed804cbca8f4c3de0dbd2dde3b..d34691fc6a425da4d544f67a83b60ba3fe92d2aa 100644 (file)
     functionality: 'bindingv1'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
 
     # No tools system VMs needed, but ODL system needs RAM and benefits from CPUs.
     tools_system_count: 0
+
+    # odl system flavor
     odl_system_flavor: odl-standard-4
 
     # Features to install
     install-features: 'odl-restconf'
 
+    # Robot custom options:
+    robot-options: ''
+
     # Additional patterns to archive
     archive-artifacts: '*.xml'
index 87a3cbd2bc24cd6d0ca9fd4cc6946e4d11d013d3..57fc332f2bf588c921c135f49f73baaf8b12c5aa 100644 (file)
@@ -7,16 +7,16 @@
     project: 'mdsal'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          os-branch: 'queens'
+          java-version: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
           java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-          os-branch: 'queens'
-      - neon:
-          branch: 'stable/neon'
-          os-branch: 'queens'
+
+    os-branch: 'queens'
 
     jdk: 'openjdk8'
 
index 42c96da4eca5b3d3195911c3d172d30e2c0cbfff..93012b2b5409ccf099ff440bfcea8118c4884c1b 100644 (file)
@@ -2,7 +2,8 @@
 - project:
     name: mdsal-master
     jobs:
-      - 'gerrit-release-merge'
+      - 'gerrit-release-merge':
+          build-node: centos7-builder-2c-2g
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: mdsal
 
     java-version: 'openjdk11'
     mvn-settings: 'mdsal-settings'
-    mvn-opts: '-Xmx2048m'
+    mvn-version: mvn36
+    build-timeout: 90
 
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[mdsal] [odlparent] [yangtools]'
     archive-artifacts: >
         **/*.prop
         **/*.log
     staging-profile-id: a674173c7b29d
 
 - project:
-    name: mdsal-v4.0.x
+    name: mdsal-5.0.x
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: mdsal
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-mdsal/44052/
           rtd-token: a56d6212dd3de3eef12642affe8a6100cc8bc002
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     project: mdsal
     project-name: mdsal
-    branch: v4.0.x
-    stream: v4.0.x
+    branch: 5.0.x
+    stream: 5.0.x
 
+    java-version: 'openjdk11'
     mvn-settings: 'mdsal-settings'
     mvn-opts: '-Xmx2048m'
+    build-timeout: 90
 
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[mdsal] [odlparent] [yangtools]'
@@ -66,7 +68,7 @@
     staging-profile-id: a674173c7b29d
 
 - project:
-    name: mdsal-3.0.x
+    name: mdsal-v4.0.x
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
 
     project: mdsal
     project-name: mdsal
-    branch: v3.0.x
-    stream: v3.0.x
+    branch: v4.0.x
+    stream: v4.0.x
 
     mvn-settings: 'mdsal-settings'
     mvn-opts: '-Xmx2048m'
+    build-timeout: 90
 
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[mdsal] [odlparent] [yangtools]'
     mvn-settings: 'mdsal-settings'
     mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
     mvn-opts: '-Xmx2048m'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
     name: mdsal-view
index b6c6f3b58ba74f2140af77e80f9681ede5d0eba1..b68471a95a58eb7f6a1316cedb40d3360150908c 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 7489622dd5e6476638c85eaeb3d9ea1e7df3957a..84ef3bc6a60af7315a3df1a3a57d50b6f4819614 100644 (file)
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: nemo-magnesium
+    name: nemo-aluminium
     jobs:
       - odl-maven-jobs
       - odl-maven-verify-jobs
       - gerrit-release-merge
 
-    stream: magnesium
+    stream: aluminium
     project: 'nemo'
     project-name: 'nemo'
     branch: 'master'
     staging-profile-id: a67a9890f6202
 
 - project:
-    name: nemo-sodium
+    name: nemo-magnesium
     jobs:
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'nemo'
     project-name: 'nemo'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
     mvn-settings: 'nemo-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: ''
     staging-profile-id: a67a9890f6202
 
 - project:
-    name: nemo-neon
+    name: nemo-sodium
     jobs:
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'nemo'
     project-name: 'nemo'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     mvn-settings: 'nemo-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: ''
     mvn-settings: 'nemo-settings'
     mvn-opts: '-Xmx1024m'
     disable-job: true
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
     name: nemo-view
index 64c987eb91b06e95caa9534acb29c247a33cfdc5..7c54ff96db71cf728366773d230d0309c84a232f 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index 37bfcca3cf832dc04b88f3c87c3de68da1eb3276..f55ef62a4c626cd4e2001b5a7bd174095bfdcfdc 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index 1e307e011318d31d0c532170e8ed721d11a09a5f..8b83aebe96e76d1b2a452a5a57542b5ac1a8285f 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index 92b181aa7e2c50a55022850d63d93a791f214af9..47b6c614d11be75563d548ed0ddce19dcee7e766 100644 (file)
@@ -7,16 +7,16 @@
     project: 'netconf'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          os-branch: 'queens'
+          java-version: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
           java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-          os-branch: 'queens'
-      - neon:
-          branch: 'stable/neon'
-          os-branch: 'queens'
+
+    os-branch: 'queens'
 
     feature:
       - core:
index eebbfe58c9cb943d6ee4acfce77ac86e3485b4a7..3c3b69af81993da5750b0c22888bdf041706312a 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+          robot-options: '-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v INIT_DEVICE_COUNT:250
+                          -v MAX_DEVICE_COUNT:1000 -v DEVICE_INCREMENT:100 -v TESTTOOL_BOOT_TIMEOUT:600s
+                          -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
+          robot-options: '-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v INIT_DEVICE_COUNT:250
+                          -v MAX_DEVICE_COUNT:1000 -v DEVICE_INCREMENT:100 -v TESTTOOL_BOOT_TIMEOUT:600s
+                          -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
+          robot-options: '-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v INIT_DEVICE_COUNT:10
+                          -v MAX_DEVICE_COUNT:500 -v DEVICE_INCREMENT:25 -v TESTTOOL_BOOT_TIMEOUT:600s
+                          -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*'
 
     install:
       - only:
         odl-clustering-test-app,
         odl-netconf-mdsal,
         odl-netconf-topology,
-        odl-jolokia,
-        decanter-collector-jmx,
-        decanter-appender-elasticsearch
-
-    # Robot custom options
-    robot-options: '-v USE_NETCONF_CONNECTOR:False'
+        odl-jolokia
 
     # ODL system configuration
     odl_system_flavor: odl-standard-8
+    controller-max-mem: '12G'
+    tools_system_flavor: odl-standard-8
 
     # Plot Info
     01-plot-title: 'Max Devices'
index 01ad34ef7e6a57b5bc61678cbd08c32e6459704c..02f2ffbdc2f3552b0cfe4a10a99f8ce86cd1f244 100644 (file)
     # The functionality under test
     functionality:
       - userfeatures
+      - userfeatures-rfc8040:
+          robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:False -v USE_RFC8040:True'
       - gate-userfeatures
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 8a308cb73e6adf04e19db90b7c2250b7d658df12..89da37c727117c8d969345f46b1cebea6eb6ae95 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: netconf-magnesium
+    name: netconf-aluminium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
@@ -11,7 +11,7 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'netconf'
     project-name: 'netconf'
     branch: 'master'
@@ -28,7 +28,7 @@
     staging-profile-id: a67b22fc3663f
 
 - project:
-    name: netconf-sodium
+    name: netconf-magnesium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
           project-pattern: netconf
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netconf/48397/
           rtd-token: aee2df909686ab7ba36f2ed08d90bdcf81f7b8dc
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'netconf'
     project-name: 'netconf'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
     build-node: centos7-builder-2c-8g
+    java-version: 'openjdk11'
     mvn-settings: 'netconf-settings'
     mvn-goals: 'clean deploy -Pintegrationtests'
     mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@ -55,7 +56,7 @@
     staging-profile-id: a67b22fc3663f
 
 - project:
-    name: netconf-neon
+    name: netconf-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'netconf'
     project-name: 'netconf'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'netconf-settings'
     mvn-goals: 'clean deploy -Pintegrationtests'
index 357a6e6fbeccc02a8c16d79355e9b1c591823dda..80d00fb7a758bf357aeda917d491890a455676ef 100644 (file)
@@ -1,11 +1,11 @@
 ---
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration-magnesium
+    name: netvirt-csit-hwvtep-openstack-integration-aluminium
     jobs:
       - inttest-csit-hwvtep-openstack-custom
 
     project: 'netvirt'
-    stream: 'magnesium'
+    stream: 'aluminium'
     branch: 'master'
     jre: 'openjdk11'
     testplan: '{project}-{topology}-l2gw-openstack.txt'
           openstack_system2_count: 2
           odl_system_count: 1
           enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
+          install-features: 'odl-netvirt-openstack'
       - 3node:
           openstack_system2_count: 3
           odl_system_count: 3
           enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
+          install-features: 'odl-jolokia,odl-netvirt-openstack'
 
     functionality:
       - upstream-stateful
           openstack_system2_image: '{openstack_queens_system_image}'
 
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration-sodium
+    name: netvirt-csit-hwvtep-openstack-integration-magnesium
     jobs:
       - inttest-csit-hwvtep-openstack-custom
 
     project: 'netvirt'
-    stream: 'sodium'
-    branch: 'stable/sodium'
+    stream: 'magnesium'
+    branch: 'stable/magnesium'
+    jre: 'openjdk11'
     testplan: '{project}-{topology}-l2gw-openstack.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,l2gw-plugin'
           openstack_system2_count: 2
           odl_system_count: 1
           enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
+          install-features: 'odl-netvirt-openstack'
       - 3node:
           openstack_system2_count: 3
           odl_system_count: 3
           enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
+          install-features: 'odl-jolokia,odl-netvirt-openstack'
 
     functionality:
       - upstream-stateful
           openstack_system2_image: '{openstack_queens_system_image}'
 
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration-neon
+    name: netvirt-csit-hwvtep-openstack-integration-sodium
     jobs:
       - inttest-csit-hwvtep-openstack-custom
 
     project: 'netvirt'
-    stream: 'neon'
-    branch: 'stable/neon'
+    stream: 'sodium'
+    branch: 'stable/sodium'
     testplan: '{project}-{topology}-l2gw-openstack.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,l2gw-plugin'
           openstack_system2_count: 2
           odl_system_count: 1
           enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
+          install-features: 'odl-netvirt-openstack'
       - 3node:
           openstack_system2_count: 3
           odl_system_count: 3
           enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
+          install-features: 'odl-jolokia,odl-netvirt-openstack'
 
     functionality:
       - upstream-stateful
index cf6ea9a0ab6eba059f6b815402fdcd5bd158dc76..075701fae38a34104364bd6946091ed2e5e28b20 100644 (file)
@@ -8,13 +8,14 @@
 
     project: 'netvirt'
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     testplan: '{project}-{topology}-openstack.txt'
 
@@ -23,7 +24,7 @@
 
     topology: '1node'
 
-    install-features: 'odl-netvirt-openstack, decanter-collector-jmx, decanter-appender-elasticsearch, odl-mdsal-trace'
+    install-features: 'odl-netvirt-openstack, odl-mdsal-trace'
 
     public-bridge: 'br-datacentre'
     public-physical-network: 'datacentre'
index ed750dc49902d1436e669bd7dfba08b37d255a82..9dbe3bbccc9b84587316146bb0572d2cdd630446 100644 (file)
@@ -7,12 +7,14 @@
     project: 'netvirt'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
+          jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     testplan: '{project}-{topology}-openstack-upgrade.txt'
     odl-ml2-driver-version: 'v2'
@@ -31,7 +33,7 @@
           openstack_system2_count: 2
           odl_system_count: 1
           enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
+          install-features: 'odl-netvirt-openstack'
 
     functionality:
       - upgrade
index 84a1f5ed181e794befea8685ba7acf123a143fc8..3a39137567d124ef14e40983d667e5b7e149226e 100644 (file)
@@ -1,11 +1,11 @@
 ---
 - project:
-    name: netvirt-csit-openstack-integration-magnesium
+    name: netvirt-csit-openstack-integration-aluminium
     jobs:
       - inttest-csit-openstack-custom
 
     project: 'netvirt'
-    stream: 'magnesium'
+    stream: 'aluminium'
     branch: 'master'
     jre: 'openjdk11'
     testplan: '{project}-{topology}-openstack.txt'
           openstack_system2_image: '{openstack_rocky_system_image}'
 
 - project:
-    name: netvirt-csit-openstack-integration-sodium
+    name: netvirt-csit-openstack-integration-magnesium
     jobs:
       - inttest-csit-openstack-custom
 
     project: 'netvirt'
-    stream: 'sodium'
-    branch: 'stable/sodium'
+    stream: 'magnesium'
+    branch: 'stable/magnesium'
+    jre: 'openjdk11'
     testplan: '{project}-{topology}-openstack.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,tempest'
           openstack_system2_image: '{openstack_rocky_system_image}'
 
 - project:
-    name: netvirt-csit-openstack-integration-neon
+    name: netvirt-csit-openstack-integration-sodium
     jobs:
       - inttest-csit-openstack-custom
 
     project: 'netvirt'
-    stream: 'neon'
-    branch: 'stable/neon'
+    stream: 'sodium'
+    branch: 'stable/sodium'
     testplan: '{project}-{topology}-openstack.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,tempest'
           odl-snat-mode: 'conntrack'
       - gate-minimal-cluster:
           testplan: '{project}-{topology}-minimal-openstack.txt'
+      - dcgw:
+          testplan: '{project}-{topology}-dcgw-openstack.txt'
+          tools_system_count: 3
+          enable-gre-type-driver: 'yes'
       # 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: ''
+          schedule: '{schedule-weekly}'
           tools_system_count: 3
           enable-gre-type-driver: 'yes'
       - tempest-stateful:
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
           openstack_system_image: '{openstack_queens_system_image}'
           openstack_system2_image: '{openstack_queens_system_image}'
-
-- project:
-    name: netvirt-csit-sfc-openstack-integration
-    jobs:
-      - inttest-csit-openstack-custom
-
-    project: 'netvirt'
-    security-group-mode: 'stateful'
-    odl_system_flavor: odl-highcpu-4
-    openstack_system2_flavor: odl-highcpu-8
-    os-cmb-cnt: 0
-    os-ctl-cnt: 1
-    os-cmp-cnt: 2
-
-    topology:
-      - 1node:
-          openstack_system2_count: 2
-          odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-sfc'
-
-    functionality:
-      - sfc:
-          enable-openstack-services: 'placement-api,tempest'
-          enable-openstack-compute-services: 'placement-client'
-          enable-openstack-plugins: 'networking-odl,networking-sfc'
-          testplan: '{project}-extensions-sfc.txt'
-
-    openstack:
-      - queens:
-          openstack-branch: 'stable/queens'
-          odl-ml2-branch: 'stable/queens'
+      - rocky:
+          openstack-branch: 'stable/rocky'
+          odl-ml2-branch: 'stable/rocky'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_queens_system_image}'
-          openstack_system2_image: '{openstack_queens_system_image}'
-
-    stream:
-      - magnesium:
-          branch: 'master'
-          ovs-install: 'v2.9.2'
-          jre: 'openjdk11'
-      - sodium:
-          branch: 'stable/sodium'
-          ovs-install: 'v2.9.2'
-      - neon:
-          branch: 'stable/neon'
-          ovs-install: 'v2.9.2'
+          openstack_system_image: '{openstack_rocky_system_image}'
+          openstack_system2_image: '{openstack_rocky_system_image}'
 
 - project:
     name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration
     os-cmp-cnt: 0
 
     stream:
-      - sodium:
+      - aluminium:
           branch: 'master'
-      - neon:
-          branch: 'stable/neon'
+          jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
+      - sodium:
+          branch: 'stable/sodium'
 
     topology:
       - 1node:
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
           openstack_system_image: '{openstack_rocky_system_image}'
           openstack_system2_image: '{openstack_rocky_system_image}'
+      - stein:
+          openstack-branch: 'stable/stein'
+          odl-ml2-branch: 'stable/stein'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          openstack_system_image: '{openstack_stein_system_image}'
+          openstack_system2_image: '{openstack_stein_system_image}'
index 97d4693b21abffd09bf2188d60253f8b96a55bbe..5ea926796848160a1d295c513d16fd77797f7a2b 100644 (file)
@@ -5,10 +5,8 @@
     jobs:
       - netvirt-job-reports
     report-jobnames: >
-        netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon
-        netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-neon
-        netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-fluorine
-        netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-neon
+        netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-sodium
+        netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-sodium
     report-logurl: 'https://logs.opendaylight.org/releng/vex-yul-odl-jenkins-1'
     report-numjobs: 100
     report-path: '/tmp/jobreports'
@@ -36,8 +34,8 @@
           default: '{report-jobnames}'
           description: |
               Space separated list of job names to process. Example:
-              netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon
-              netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-neon
+              netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-sodium
+              netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-sodium
       - string:
           name: LOG_URL
           default: '{report-logurl}'
index e141afbc2c1a344d53f28104e239a8b9ed86db0f..b745f5f9fc8a6c394ff2387aaab6a7ae5b9fa828 100644 (file)
@@ -7,16 +7,16 @@
     project: 'netvirt'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          os-branch: 'queens'
+          java-version: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
           java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-          os-branch: 'queens'
-      - neon:
-          branch: 'stable/neon'
-          os-branch: 'queens'
+
+    os-branch: 'queens'
 
     jdk: 'openjdk8'
 
index 03c1962adc7370193f10f7e405f09c5f63117c22..f3932e81b45642b8e049cac21dcccd68c8c50891 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: netvirt-magnesium
+    name: netvirt-aluminium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -17,7 +17,7 @@
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
 
-    stream: magnesium
+    stream: aluminium
     branch: 'master'
 
     project: 'netvirt'
         neutron-merge-{stream},
         openflowjava-merge-{stream},
         openflowplugin-merge-{stream},
-        ovsdb-merge-{stream},
-        sfc-merge-{stream}
-    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
+        ovsdb-merge-{stream}
+    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]'
 
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba
 
 - project:
-    name: netvirt-sodium
+    name: netvirt-magnesium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netvirt/32929/
           rtd-token: 7b6a1dcfc729957ace511e016274e253e07a8d6c
       - gerrit-tox-verify
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
 
-    stream: sodium
-    branch: 'stable/sodium'
+    stream: magnesium
+    branch: 'stable/magnesium'
 
     project: 'netvirt'
     project-name: 'netvirt'
+
+    java-version: 'openjdk11'
     mvn-settings: 'netvirt-settings'
     mvn-opts: '-Xmx2048m'
     build-timeout: 90
         neutron-merge-{stream},
         openflowjava-merge-{stream},
         openflowplugin-merge-{stream},
-        ovsdb-merge-{stream},
-        sfc-merge-{stream}
-    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
+        ovsdb-merge-{stream}
+    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]'
 
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba
 
 - project:
-    name: netvirt-neon
+    name: netvirt-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -97,8 +97,8 @@
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
 
-    stream: neon
-    branch: 'stable/neon'
+    stream: sodium
+    branch: 'stable/sodium'
 
     project: 'netvirt'
     project-name: 'netvirt'
         neutron-merge-{stream},
         openflowjava-merge-{stream},
         openflowplugin-merge-{stream},
-        ovsdb-merge-{stream},
-        sfc-merge-{stream}
-    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
+        ovsdb-merge-{stream}
+    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]'
 
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba
index e6837b0113500446228ba46caf0be249d2cf3eac..18180a94a277cc117fd7e882f22e85a0c4a152fc 100644 (file)
@@ -7,15 +7,14 @@
     project: 'neutron'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          os-branch: 'queens'
+      - magnesium:
+          branch: 'stable/magnesium'
       - sodium:
           branch: 'stable/sodium'
-          os-branch: 'queens'
-      - neon:
-          branch: 'stable/neon'
-          os-branch: 'queens'
+
+    os-branch: 'queens'
 
     jdk: 'openjdk8'
 
index 6ece2ce8b88ab5e685bcfa32e3b5232e99e17006..dab038e5f3c876809644b65255c14a377a751f50 100644 (file)
@@ -1,13 +1,13 @@
 ---
 - project:
-    name: neutron-magnesium
+    name: neutron-aluminium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 90
     staging-profile-id: a67e1b40d7419
 
 - project:
-    name: neutron-sodium
+    name: neutron-magnesium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 90
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
+    java-version: 'openjdk11'
     mvn-settings: 'neutron-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
     staging-profile-id: a67e1b40d7419
 
 - project:
-    name: neutron-neon
+    name: neutron-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 90
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     mvn-settings: 'neutron-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
diff --git a/jjb/odlguice/odlguice.yaml b/jjb/odlguice/odlguice.yaml
new file mode 100644 (file)
index 0000000..cfe818f
--- /dev/null
@@ -0,0 +1,27 @@
+---
+- project:
+    name: odlguice
+    jobs:
+      - gerrit-release-merge
+      - gerrit-tox-verify
+
+    stream:
+      - aluminium:
+          branch: 'master'
+      - magnesium:
+          branch: 'stable/magnesium'
+
+    project: odlguice
+    project-name: odlguice
+    build-node: centos7-builder-2c-2g
+    build-timeout: 60
+    mvn-settings: 'odlguice-settings'
+
+    # Used by the release job
+    staging-profile-id: 44ce7d1aad49e
+
+- project:
+    name: odlguice-view
+    views:
+      - project-view
+    project-name: odlguice
diff --git a/jjb/odlmicro/odlmicro.yaml b/jjb/odlmicro/odlmicro.yaml
new file mode 100644 (file)
index 0000000..46cd584
--- /dev/null
@@ -0,0 +1,27 @@
+---
+- project:
+    name: odlmicro
+    jobs:
+      - gerrit-release-merge
+      - gerrit-tox-verify
+
+    stream:
+      - aluminium:
+          branch: 'master'
+      - magnesium:
+          branch: 'stable/magnesium'
+
+    project: odlmicro
+    project-name: odlmicro
+    build-node: centos7-builder-2c-2g
+    build-timeout: 60
+    mvn-settings: 'odlmicro-settings'
+
+    # Used by the release job
+    staging-profile-id: 44ce67428fd0d
+
+- project:
+    name: odlmicro-view
+    views:
+      - project-view
+    project-name: odlmicro
index 2dbb20fbd6e55347da0cc6ada4fcb2826a0fa151..0141f7801b8f4500e37a15e3d69cb9f601d69a22 100644 (file)
@@ -7,15 +7,14 @@
     project: 'odlparent'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          os-branch: 'queens'
+      - magnesium:
+          branch: 'stable/magnesium'
       - sodium:
           branch: 'stable/sodium'
-          os-branch: 'queens'
-      - neon:
-          branch: 'stable/neon'
-          os-branch: 'queens'
+
+    os-branch: 'queens'
 
     jdk: 'openjdk8'
 
index e685258d6e782cb60ffb6db5164a43d603a8b3ad..f48a844967236d77f052ad24b8be42e214fea2b0 100644 (file)
@@ -2,7 +2,8 @@
 - project:
     name: odlparent-master
     jobs:
-      - 'gerrit-release-merge'
+      - 'gerrit-release-merge':
+          build-node: centos7-builder-2c-2g
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
@@ -20,8 +21,7 @@
 
     java-version: 'openjdk11'
     mvn-settings: odlparent-settings
-    mvn-opts: '-Xmx1024m'
-    mvn-version: mvn35
+    mvn-version: mvn36
 
     dependencies: ''
     email-upstream: '[odlparent]'
     staging-profile-id: 880d5ac25eaa
 
 - project:
-    name: odlparent-5.0.x
+    name: odlparent-6.0.x
     jobs:
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
+          project-pattern: odlparent
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-odlparent/50830/
+          rtd-token: e5afd4ac1ead64408d9e13cd1f628ade55512f8f
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
       - gerrit-tox-verify
 
     project: odlparent
     project-name: odlparent
-    stream: 5.0.x
-    branch: 5.0.x
+    stream: 6.0.x
+    branch: 6.0.x
 
+    java-version: 'openjdk11'
     mvn-settings: odlparent-settings
     mvn-opts: '-Xmx1024m'
     mvn-version: mvn35
@@ -67,7 +73,7 @@
     staging-profile-id: 880d5ac25eaa
 
 - project:
-    name: odlparent-4.0.x
+    name: odlparent-5.0.x
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
     project: odlparent
     project-name: odlparent
-    stream: 4.0.x
-    branch: 4.0.x
+    stream: 5.0.x
+    branch: 5.0.x
 
     mvn-settings: odlparent-settings
     mvn-opts: '-Xmx1024m'
+    mvn-version: mvn35
 
     dependencies: ''
     email-upstream: '[odlparent]'
         **/target/feature/feature.xml
 
     # Used by the release job
-    javadoc-path: org.opendaylight.$PROJECT/$STREAM
     staging-profile-id: 880d5ac25eaa
 
 - project:
     java-version: 'openjdk11'
     mvn-settings: 'odlparent-settings'
     mvn-opts: '-Xmx1024m'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
     name: odlparent-view
index 0ccc84561db0e8f37e864966d6564d08e1ebb4e4..a84a280e6bf02f644604d9a87dfcbf27cd959f7a 100644 (file)
     testplan: '{project}-basic.txt'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     functionality:
       - 'upstream'
index f3d77f3172b24ec5fa14542180e8f32b566ffcea..c3503a955b78a5638976c41c2c0961eced1e7bd3 100644 (file)
@@ -8,12 +8,12 @@
     jdk: openjdk8
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
+      - magnesium:
+          branch: 'stable/magnesium'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     feature:
       - current:
index 4e2743d3447fbff7b2bcf0fbf19da8f854bcec90..ca1c3f774e5290e0dfdcdad4bfd4e8bcb10494ac 100644 (file)
           rtd-token: 225d4ef64e1efce4fe3ba4c9c4fe772355d3c8b2
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
+      - magnesium:
+          branch: 'stable/magnesium'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     project: odltools
     project-name: odltools
index 1800cf6de51dc8e8d531b24dd68edd017f5c9c31..1bec36cb0e0ba02a500e461baf6664d11a9b4dd9 100644 (file)
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: of-config-magnesium
+    name: of-config-aluminium
     jobs:
       - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'of-config'
     project-name: 'of-config'
     branch: 'master'
     staging-profile-id: a6880455efe67
 
 - project:
-    name: of-config-sodium
+    name: of-config-magnesium
     jobs:
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'of-config'
     project-name: 'of-config'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
     mvn-settings: 'of-config-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: netconf-merge-{stream}'
     staging-profile-id: a6880455efe67
 
 - project:
-    name: of-config-neon
+    name: of-config-sodium
     jobs:
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'of-config'
     project-name: 'of-config'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     mvn-settings: 'of-config-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: netconf-merge-{stream}'
     mvn-settings: 'of-config-settings'
     mvn-opts: '-Xmx1024m'
     disable-job: true
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
     name: of-config-view
index 4dbaa9ce21f7fd64ff9fa76e32bae470b4f93832..3fca0825abe306784b053e12d4c044546be0e5c5 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 31f189ce2b9676a3a3af8d8ec4cb89f6b3088246..be28da8d5be220a7957dc2dc66c110f1c14ff554 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index 6e4981092feb08281555ac785fc7f425316045c4..27007e3d08ebffbab57bbe6186a3a1e4fe519c20 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index 81a810814e05f96930ddd85391a5599ba5ce4d0c..ff8f0e119700c1115002150313aa37a907bf3169 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
@@ -33,9 +34,7 @@
     install-features: >
         odl-openflowplugin-flow-services-rest,
         odl-openflowplugin-app-bulk-o-matic,
-        odl-jolokia,
-        decanter-collector-jmx,
-        decanter-appender-elasticsearch
+        odl-jolokia
 
     # Robot custom options
     robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count_per_switch:2250'
index b717e4e6e73aceac565b031583dd58482c6b5a0f..2e25311f6d1595cb139f10b4d646925f8446f1f8 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
@@ -32,8 +33,7 @@
     # Features to install
     install-features: >
         odl-openflowplugin-flow-services-rest,
-        odl-openflowplugin-app-table-miss-enforcer,
-        odl-infrautils-metrics
+        odl-openflowplugin-app-table-miss-enforcer
 
     # Robot custom options
     robot-options: '-v ODL_OF_PLUGIN:lithium'
index 4f47b917d3f1e7e03abdaaa74d705ef5ec20b4ce..b595352b1ce39b1d30f86e3136744833d76f24da 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 0b9f4d4557d713ab9d46b1711c0c9e584f84e60f..6fe25d0fddacfb80cfec2fe12d056ede3a66e185 100644 (file)
     # The functionality under test
     functionality: 'longevity'
 
+    # Set elasticsearch attribute to value 'long' for longevity jobs
+    #elasticsearch-attribute: 'long'
+
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
@@ -31,9 +35,7 @@
     # Features to install
     install-features: >
         odl-openflowplugin-flow-services-rest,
-        odl-openflowplugin-app-table-miss-enforcer,
-        decanter-collector-jmx,
-        decanter-appender-elasticsearch
+        odl-openflowplugin-app-table-miss-enforcer
 
     # Robot custom options
     robot-options: '-v TEST_LENGTH:23h -v NUM_SWITCHES:16'
index 6f8689db906abfe33488edf425cead9d0c4e0640..c690cc11c48dc8dd796d5b94d99872f3695b7cfc 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
@@ -33,9 +34,7 @@
     install-features: >
         odl-openflowplugin-flow-services-rest,
         odl-openflowplugin-app-bulk-o-matic,
-        odl-jolokia,
-        decanter-collector-jmx,
-        decanter-appender-elasticsearch
+        odl-jolokia
 
     # Robot custom options
     robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count_per_switch:3125'
index d2f324fb0855316d456be343fd1a22ab4df4a43d..da81f9e39e3dce47720c203b50bd83186e927415 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index e413c3a290dcb4488554964c482a6bd7efa1dfab..4c3fdfdb28eac7f158094de5c9f55703873f5db9 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index 8694eae4963371bf65782c0ddb478fc9afd94523..2f15c4062d8ac93f4e5bb5c56744eee92dc960ff 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
@@ -30,9 +31,7 @@
     # Features to install
     install-features: >
         odl-openflowplugin-flow-services-rest,
-        odl-openflowplugin-app-table-miss-enforcer,
-        decanter-collector-jmx,
-        decanter-appender-elasticsearch
+        odl-openflowplugin-app-table-miss-enforcer
 
     # Robot custom options
     robot-options: ''
index accf402b576b89889b904ccd8528c12eab8ab716..54a71fbf33a087dc8b282358a28ed74e3d70b9aa 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
@@ -29,9 +30,7 @@
 
     # Features to install
     install-features: >
-        odl-openflowplugin-flow-services-rest,
-        decanter-collector-jmx,
-        decanter-appender-elasticsearch
+        odl-openflowplugin-flow-services-rest
 
     # Robot custom options
     robot-options: ''
index 3b99f45495c41532c4a9eaa4f751b72117d0758a..74a5ef9fce4820250832f6d2fb75b72fd8c6eff6 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
@@ -32,9 +33,7 @@
     # Features to install
     install-features: >
         odl-openflowplugin-flow-services-rest,
-        odl-openflowplugin-app-table-miss-enforcer,
-        decanter-collector-jmx,
-        decanter-appender-elasticsearch
+        odl-openflowplugin-app-table-miss-enforcer
 
     # Robot custom options
     robot-options: '-v TOPO_TREE_DEPTH:7'
index 7da1a5c0911e5642a8827d9ad85376ed601cd23a..d5d2ecac1368bd786104124657f61138c33c7de8 100644 (file)
@@ -9,20 +9,23 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          os-branch: 'queens'
+          java-version: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
           java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-          os-branch: 'queens'
-      - neon:
-          branch: 'stable/neon'
-          os-branch: 'queens'
 
+    os-branch: 'queens'
     jdk: 'openjdk8'
 
     feature:
+      - cbench:
+          csit-list: >
+              openflowplugin-csit-1node-cbench-only-{stream}
+
       - core:
           csit-list: >
               openflowplugin-csit-1node-gate-flow-services-all-{stream},
index fbcc00bb268a6f73fd16a1cdccfc08c67300230c..d6e473db8eec1b11358b5b816e1c18d0c4733c42 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: openflowplugin-magnesium
+    name: openflowplugin-aluminium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -16,7 +16,7 @@
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
 
-    stream: magnesium
+    stream: aluminium
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'master'
@@ -37,7 +37,7 @@
     staging-profile-id: a68a76dc1b44c
 
 - project:
-    name: openflowplugin-sodium
+    name: openflowplugin-magnesium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
           project-pattern: openflowplugin
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/
           rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
 
-    stream: sodium
+    stream: magnesium
     project: 'openflowplugin'
     project-name: 'openflowplugin'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
     build-node: centos7-builder-2c-8g
     build-timeout: 90
+    java-version: 'openjdk11'
     mvn-settings: 'openflowplugin-settings'
     mvn-goals: 'clean deploy javadoc:aggregate'
     mvn-opts: '-Xmx1024m'
@@ -73,7 +74,7 @@
     staging-profile-id: a68a76dc1b44c
 
 - project:
-    name: openflowplugin-neon
+    name: openflowplugin-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
 
-    stream: neon
+    stream: sodium
     project: 'openflowplugin'
     project-name: 'openflowplugin'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     build-node: centos7-builder-2c-8g
     build-timeout: 90
     mvn-settings: 'openflowplugin-settings'
index f7fe12edd2ab1150b16b5d6e71c21802782c68ab..3d6531ae56ca555bb232f594faf3cc79f6aff8df 100644 (file)
@@ -6,21 +6,21 @@
       - 'opflex-merge-{stream}'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          libuv-version: '1.8.0'
+          libuv-version: '1.20.2'
+          rapidjson-version: '1.1.0'
+          openvswitch-version: '2.12.0'
+      - magnesium:
+          branch: 'stable/magnesium'
+          libuv-version: '1.20.2'
           rapidjson-version: '1.1.0'
-          openvswitch-version: '2.6.7'
+          openvswitch-version: '2.12.0'
       - sodium:
           branch: 'stable/sodium'
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
-      - neon:
-          branch: 'stable/neon'
-          libuv-version: '1.8.0'
-          rapidjson-version: '1.0.2'
-          openvswitch-version: '2.6.0'
 
     project: 'opflex'
     archive-artifacts: '**/*.tar.gz'
index a02fbb9dc183ce9ee910faef5ebde12d353a187c..0a2f14d7fdb2d63e88793b3d138371565122957d 100644 (file)
@@ -9,9 +9,9 @@
     stream:
       - oxygen:
           branch: 'master'
-          libuv-version: '1.8.0'
+          libuv-version: '1.20.2'
           rapidjson-version: '1.1.0'
-          openvswitch-version: '2.6.7'
+          openvswitch-version: '2.12.0'
           disable-job: true
 
     project: 'opflex'
 - job-template:
     name: 'opflex-thirdparty-libuv-{stream}'
 
-    disable-job: false
-
     project-type: freestyle
     node: centos7-builder-2c-8g
     concurrent: true
-    disabled: '{disable-job}'
 
     group-id: 'libuv'
 
index 5cc90942a1b03814e7119bca2486fae01ec3640a..b5cc790e3894c7078e379f03285148645efbab30 100644 (file)
       - 'opflex-release-{stream}'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          libuv-version: '1.8.0'
+          libuv-version: '1.20.2'
+          rapidjson-version: '1.1.0'
+          openvswitch-version: '2.12.0'
+      - magnesium:
+          branch: 'stable/magnesium'
+          libuv-version: '1.20.2'
           rapidjson-version: '1.1.0'
-          openvswitch-version: '2.6.7'
+          openvswitch-version: '2.12.0'
       - sodium:
           branch: 'stable/sodium'
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
-      - neon:
-          branch: 'stable/neon'
-          libuv-version: '1.8.0'
-          rapidjson-version: '1.0.2'
-          openvswitch-version: '2.6.0'
 
     project: 'opflex'
     project-name: 'opflex'
index f93afe536107c50834bee5b0782edd0f2a31257f..61ae9b4b8abb8fd381b203adc80c29cf067666ac 100644 (file)
@@ -25,7 +25,7 @@ mkdir -p "$DESTDIR"
 make -j4
 DESTDIR=$(pwd)/$DESTDIR make install
 
-if [[ $OPENVSWITCH_VERSION =~ 2.6.7 ]]; then
+if [[ $OPENVSWITCH_VERSION =~ 2.12.0 ]]; then
     mkdir -p $DESTDIR/$ROOT/include/openvswitch/openvswitch
     mv $DESTDIR/$ROOT/include/openvswitch/*.h $DESTDIR/$ROOT/include/openvswitch/openvswitch
     mv $DESTDIR/$ROOT/include/openflow $DESTDIR/$ROOT/include/openvswitch
index 75fa4a6a3f7e7d52e7c10e4e063bccbfd672b666..046a98406d51c559ea8c7d972503b1021f7bbff0 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
           scope: 'only'
 
     # Features to install
-    install-features: 'odl-ovsdb-southbound-impl-rest,decanter-collector-jmx,decanter-appender-elasticsearch'
+    install-features: 'odl-ovsdb-southbound-impl-rest'
 
     # Robot custom options
     robot-options: ''
index 4da2bcbd1e657b1c6a47f44993a4e6f47ff76896..22e0e8ae8fb3d899106eefd35ccd7b4a1cd675d3 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 1acc416fa2f0f078e595da5239efc8269f8da214..dc40a19352bad0033f4bde0c7e65f277903354e9 100644 (file)
@@ -5,12 +5,13 @@
       - 'ovsdb-daily-full-integration-{stream}'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
+          java-version: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     project: 'ovsdb'
     archive-artifacts: '*.log'
index 23cf86b4bd680b7015eb3ce3b9fe32814b884c1e..c52b34d364d52530c64e728aa6b694bfadbeed8b 100644 (file)
@@ -8,17 +8,16 @@
     project: 'ovsdb'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          os-branch: 'queens'
+          java-version: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
           java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-          os-branch: 'queens'
-      - neon:
-          branch: 'stable/neon'
-          os-branch: 'queens'
 
+    os-branch: 'queens'
     jdk: 'openjdk8'
 
     feature:
index 1a9736ff9c6a01d8f2cd1ec8b597d74c4e5aec9d..139dcc56ed5dd6e98113a13166a68babe330fee3 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: ovsdb-magnesium
+    name: ovsdb-aluminium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -15,7 +15,7 @@
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
 
-    stream: magnesium
+    stream: aluminium
     project: 'ovsdb'
     project-name: 'ovsdb'
     branch: 'master'
@@ -30,7 +30,7 @@
     staging-profile-id: a68b188166958
 
 - project:
-    name: ovsdb-sodium
+    name: ovsdb-magnesium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
           project-pattern: ovsdb
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/
           rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
 
-    stream: sodium
+    stream: magnesium
     project: 'ovsdb'
     project-name: 'ovsdb'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
     build-node: centos7-builder-2c-8g
+    java-version: 'openjdk11'
     mvn-settings: 'ovsdb-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
@@ -59,7 +60,7 @@
     staging-profile-id: a68b188166958
 
 - project:
-    name: ovsdb-neon
+    name: ovsdb-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
 
-    stream: neon
+    stream: sodium
     project: 'ovsdb'
     project-name: 'ovsdb'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'ovsdb-settings'
     mvn-opts: '-Xmx1024m'
index 13a0d1b5b59b4c1439dbf006576f443042a5f9ed..1d5d28b650b8cca345f550c51e843a5ff6839616 100644 (file)
@@ -1,13 +1,13 @@
 ---
 - project:
-    name: p4plugin-magnesium
+    name: p4plugin-aluminium
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'p4plugin'
     project-name: 'p4plugin'
     branch: 'master'
     staging-profile-id: a68bf26e208d4
 
 - project:
-    name: p4plugin-sodium
+    name: p4plugin-magnesium
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'p4plugin'
     project-name: 'p4plugin'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
     mvn-settings: 'p4plugin-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: ''
     staging-profile-id: a68bf26e208d4
 
 - project:
-    name: p4plugin-neon
+    name: p4plugin-sodium
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'p4plugin'
     project-name: 'p4plugin'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     mvn-settings: 'p4plugin-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: ''
index 24aed852effdfd651efed8c5961e27c5f274c5e1..402bc882b89bc892938c8429999bf5e9a9de08ac 100644 (file)
@@ -15,9 +15,7 @@ $PYTHON -m pip install --upgrade pip
 $PYTHON -m pip install -r "$WORKSPACE/packaging/packages/requirements.txt"
 
 # Convert stream to numeric ODL major version
-if [ "$STREAM" == "neon" ]; then
-  VERSION_MAJOR=10
-elif [ "$STREAM" == "sodium" ]; then
+if [ "$STREAM" == "sodium" ]; then
   VERSION_MAJOR=11
 elif [ "$STREAM" == "magnesium" ]; then
   VERSION_MAJOR=12
index 304cf03d6f3d40dc7142fe2aae208edd87b4d852..17b19f6ca3396f7d781e815f70b445a74ae5eb71 100644 (file)
@@ -27,7 +27,6 @@
     project: 'integration/packaging'
 
     stream:
-      - neon
       - sodium
 
     distro:
           build-timeout: '{build-timeout}'
 
     builders:
-      # Test Neon SR2 ('Managed Release Common Distro') release tarball
-      - inject:
-          # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/opendaylight/0.10.2/opendaylight-0.10.2.tar.gz'
-      - shell: !include-raw-escape: build-rpm.sh
-      - install-test-uninstall-rpm
-
       # Test Sodium ('Managed Release Common Distro') release tarball
       - inject:
           # yamllint disable-line rule:line-length
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
-      # Test latest Neon snapshot
-      - inject:
-          properties-content: 'STREAM=neon'
-      - shell: !include-raw: build-rpm-snap.sh
-      - install-test-uninstall-rpm
-
       # Test latest Sodium snapshot
       - inject:
           properties-content: 'STREAM=sodium'
           build-timeout: '{build-timeout}'
 
     builders:
-      # Test Neon SR2 release tarball
-      - inject:
-          # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.10.2/karaf-0.10.2.tar.gz'
-      - shell: !include-raw-escape: build-rpm.sh
-      - install-test-uninstall-rpm
-
       # Test Sodium release tarball
       - inject:
           # yamllint disable-line rule:line-length
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
-      # Test Neon pre-release autorelease tarball
-      # NB: This will need to be updated as old builds expire
-      # NB: Commented out to reduce maintenance
-      # - inject:
-      # yamllint disable-line rule:line-length
-      #     properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2620/org/opendaylight/integration/karaf/0.10.0/karaf-0.10.0.tar.g'
-      # - shell: !include-raw-escape: build-rpm.sh
-      # - install-test-uninstall-rpm
-
-      # Test Neon multipatch zip (no parallel tarball available)
-      # NB: This will need to be updated as old builds expire
-      # NB: Commented out to reduce maintenance
-      # - inject:
-      # yamllint disable-line rule:line-length
-      #     properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.10.0-SNAPSHOT/karaf-0.10.0-20190103.173010-50.zip'
-      # - shell: !include-raw-escape: build-rpm.sh
-      # - install-test-uninstall-rpm
-
-      # Test latest Neon snapshot
-      - inject:
-          properties-content: 'STREAM=neon'
       - shell: !include-raw: build-rpm-snap.sh
       - install-test-uninstall-rpm
 
index c0c1701c1bb5daa614dfd3305cabfe16ede17f97..11b94e5dd43637dce342daeedf881a25ba414c85 100644 (file)
@@ -26,7 +26,7 @@ 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" == "neon" ] || [ "$STREAM" == "sodium" ]; then
+if [ "$STREAM" == "sodium" ]; 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
index eda5976753dc45f9723316189e584e8145055318..dd794b7fdddc6876e20d67eb9e9e23856080e915 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 346735aac584273bebb743a4d8cb0ea7bdf4a6f1..dd10741d8844ecc4fb72527c8afd47282636c348 100644 (file)
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: packetcable-magnesium
+    name: packetcable-aluminium
     jobs:
       - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'packetcable'
     project-name: 'packetcable'
     branch: 'master'
     staging-profile-id: a68ca4a24655c
 
 - project:
-    name: packetcable-sodium
+    name: packetcable-magnesium
     jobs:
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'packetcable'
     project-name: 'packetcable'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
     mvn-settings: 'packetcable-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: ''
     staging-profile-id: a68ca4a24655c
 
 - project:
-    name: packetcable-neon
+    name: packetcable-sodium
     jobs:
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'packetcable'
     project-name: 'packetcable'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     mvn-settings: 'packetcable-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: ''
     mvn-settings: 'packetcable-settings'
     mvn-opts: '-Xmx1024m'
     disable-job: true
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
     name: packetcable-view
index 4cf3cd16c9ad553c027b7e73f8d4b2ddc401fc62..7b4ebc16e4c43ef314a3ee8059036fb9ac720228 100644 (file)
@@ -2,19 +2,27 @@
 - project:
     name: plastic-master
     jobs:
-      - odl-maven-jobs-jdk11
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
+          project-pattern: plastic
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-plastic/102307/
+          rtd-token: 963a1745b909ae6a1eae01f814c4983d17fdd44c
+      - gerrit-tox-verify
+      - gerrit-release-merge
+      - odl-maven-jobs
       - odl-maven-verify-jobs
 
     stream: master
     project: plastic
     project-name: plastic
     branch: master
-    java-version: openjdk11
+    java-version: openjdk8
     mvn-settings: plastic-settings
     mvn-opts: '-Xmx1024m'
 
     # Used by the release job
-    staging-profile-id: abc123_need_lf_to_give_this_id
+    staging-profile-id: 380d129f253e1
 
 - project:
     name: plastic-sonar
@@ -24,7 +32,7 @@
     project: plastic
     project-name: plastic
     branch: master
-    java-version: openjdk11
+    java-version: openjdk8
     mvn-settings: plastic-settings
     mvn-opts: '-Xmx1024m'
 
index e106e25599771e2f16ddef198f5ba0c298292aba..f2d8ed89cb4ef4763fbc3c75a788da13b67f3f75 100644 (file)
     builders:
       - shell: 'if [ -d /tmp/r ]; then rm -rf /tmp/r; fi'
 
-- publisher:
-    name: releng-openstack-stack-delete
-    publishers:
-      - postbuildscript:
-          builders:
-            - role: BOTH
-              build-on:
-                - ABORTED
-                - FAILURE
-                - SUCCESS
-                - UNSTABLE
-              build-steps:
-                - shell: |
-                    #!/bin/bash -l
-                    echo "Deleting $STACK_NAME"
-                    openstack stack delete --yes "$STACK_NAME"
-          mark-unstable-if-failed: false
-
 - wrapper:
     # This wrapper is required for all jobs as it configures the wrappers
     # needed by OpenDaylight infra.
index 390b8c91f019828a60caab3409771cfe6ccf714f..a2c44a170b3186cd25ebbc6f2ca8906162582d5e 100644 (file)
     platforms:
       - centos-7
       - ubuntu-16.04
+      - ubuntu-18.04
     templates: docker
     update-cloud-image: true
 
     templates: robot
     update-cloud-image: true
 
-- project:
-    name: packer-kubernetes-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
-    cron: '00 H 1 * *'
-
-    platforms:
-      - ubuntu-16.04
-      - ubuntu-18.04:
-          disable-job: true
-    templates: kubernetes
-    update-cloud-image: true
-
 - project:
     name: openstack-update-cloud-images
     jobs:
index 2a592fdb8ed975b15bb9b84bde66c73d3967483f..2397c85dfe2ba9cf89b1c6a7c1100d9506fafa0a 100644 (file)
@@ -7,16 +7,14 @@
     project: 'serviceutils'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          os-branch: 'queens'
+      - magnesium:
+          branch: 'stable/magnesium'
       - sodium:
           branch: 'stable/sodium'
-          os-branch: 'queens'
-      - neon:
-          branch: 'stable/neon'
-          os-branch: 'queens'
 
+    os-branch: 'queens'
     jdk: 'openjdk8'
 
     feature:
index 953cc6941fc60e4069999ddad589dfbdebbf7e68..2a87a1f7684873cb07285c6785f13267a776e53d 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: serviceutils-magnesium
+    name: serviceutils-aluminium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -13,7 +13,7 @@
       - odl-maven-verify-jobs
 
     branch: 'master'
-    stream: magnesium
+    stream: aluminium
 
     project: 'serviceutils'
     project-name: 'serviceutils'
@@ -33,7 +33,7 @@
     staging-profile-id: 12cc4ba8bf01ba
 
 - project:
-    name: serviceutils-sodium
+    name: serviceutils-magnesium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
           project-pattern: serviceutils
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/
           rtd-token: 866f76be38ed7efc7027b9c52e7ad869e523e7c4
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    branch: 'stable/sodium'
-    stream: sodium
+    branch: 'stable/magnesium'
+    stream: magnesium
 
     project: 'serviceutils'
     project-name: 'serviceutils'
     build-node: centos7-builder-2c-2g
+    java-version: 'openjdk11'
     mvn-settings: 'serviceutils-settings'
     mvn-opts: '-Xmx1024m'
     build-timeout: 90
@@ -65,7 +66,7 @@
     staging-profile-id: 12cc4ba8bf01ba
 
 - project:
-    name: serviceutils-neon
+    name: serviceutils-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -77,8 +78,8 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    branch: 'stable/neon'
-    stream: neon
+    branch: 'stable/sodium'
+    stream: sodium
 
     project: 'serviceutils'
     project-name: 'serviceutils'
index 3ffe3401dcb1524d4ffec1e61a4bdb641555faa4..5bbfbdcba30c204d1692200853be404e910cb94f 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index ecb62e765f9f1403f4d86eb3816825a804ddd9c9..80d389143b674c00bd9b8409e2c05de99a4aa40d 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index f412d80269b6dee233bebdd7908ef18ac6e1784c..42f334eb608a9ec77d76ab76b0e2cbffbaa7b1ff 100644 (file)
@@ -9,16 +9,16 @@
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          os-branch: 'queens'
+          java-version: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
           java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-          os-branch: 'queens'
-      - neon:
-          branch: 'stable/neon'
-          os-branch: 'queens'
+
+    os-branch: 'queens'
 
     feature:
       - basic:
index 6de3b14dbb7051fdee1f006171696d9f0396897a..bd0daa5a1763c823605cfdf5aca8c459363bc14c 100644 (file)
@@ -5,12 +5,12 @@
       - 'gerrit-tox-verify'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
+      - magnesium:
+          branch: 'stable/magnesium'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     project: 'sfc'
     project-name: 'sfc'
index 7d539580df00ec66eb3747be242f0994dde73f59..ed7f35edeefece9870cef50e0e9e4515a1cf96e6 100644 (file)
@@ -1,8 +1,7 @@
 ---
 - project:
-    name: sfc-magnesium
+    name: sfc-aluminium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: sfc
@@ -11,7 +10,7 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'sfc'
     project-name: 'sfc'
     branch: 'master'
     staging-profile-id: a68eb361ca48a
 
 - project:
-    name: sfc-sodium
+    name: sfc-magnesium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: sfc
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sfc/38996/
           rtd-token: 2fa6c2900bbe181b0427ad65df3dc494ac749edb
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'sfc'
     project-name: 'sfc'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
+    java-version: 'openjdk11'
     mvn-settings: 'sfc-settings'
     mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
     build-timeout: 120
@@ -53,7 +52,7 @@
     staging-profile-id: a68eb361ca48a
 
 - project:
-    name: sfc-neon
+    name: sfc-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'sfc'
     project-name: 'sfc'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     mvn-settings: 'sfc-settings'
     mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
     build-timeout: 120
index 8dd08a140e360c7de03f25098fb6de9e811cfa4e..b97c25f51f270eeabecb8f6cc85a5c749d19f81b 100644 (file)
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: snmp-magnesium
+    name: snmp-aluminium
     jobs:
       - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'snmp'
     project-name: 'snmp'
     branch: 'master'
     staging-profile-id: a68fb236b93a6
 
 - project:
-    name: snmp-sodium
+    name: snmp-magnesium
     jobs:
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'snmp'
     project-name: 'snmp'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
     mvn-settings: 'snmp-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream}'
     staging-profile-id: a68fb236b93a6
 
 - project:
-    name: snmp-neon
+    name: snmp-sodium
     jobs:
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'snmp'
     project-name: 'snmp'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     mvn-settings: 'snmp-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream}'
     branch: 'master'
     mvn-settings: 'snmp-settings'
     mvn-opts: '-Xmx1024m'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
     name: snmp-view
index 03ed8de9842939e05012ec253bdbc6a53be87540..58bb0ddc2787233408551f0fe3d6f194d3434ff1 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: snmp4sdn-magnesium
+    name: snmp4sdn-aluminium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -11,7 +11,7 @@
       - odl-maven-verify-jobs
       - gerrit-release-merge
 
-    stream: magnesium
+    stream: aluminium
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
     branch: 'master'
@@ -24,7 +24,7 @@
     staging-profile-id: a69034a4b6ef5
 
 - project:
-    name: snmp4sdn-sodium
+    name: snmp4sdn-magnesium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
     mvn-settings: 'snmp4sdn-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
@@ -47,7 +47,7 @@
     staging-profile-id: a69034a4b6ef5
 
 - project:
-    name: snmp4sdn-neon
+    name: snmp4sdn-sodium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     mvn-settings: 'snmp4sdn-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     branch: 'master'
     mvn-settings: 'snmp4sdn-settings'
     mvn-opts: '-Xmx1024m'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
     name: snmp4sdn-view
index ffbdeb981fbe5cef7a84a37b5ed5311c0a2ec716..28b1270e3797d6638c57b1c12ae7b649dcccaa60 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
-          trigger-jobs: '{project}-merge-{stream}'
-          karaf-version: 'odl'
-          # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
 
     install:
       - all:
index ee524c73f3e886d740fbafef713975d50bbed23f..d6c9a4ff3204087d93b84fbe10f379f0a60eab41 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
-          trigger-jobs: '{project}-merge-{stream}'
-          karaf-version: 'odl'
-          # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
 
     install:
       - all:
index 09790fbad2d52707e65bda66ca068ab721917d62..52d70be1913fc2c0b7aca19e091b0e6d6e038845 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
-          trigger-jobs: '{project}-merge-{stream}'
-          karaf-version: 'odl'
-          # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
 
     install:
       - all:
index 372822e6ee68c9745805db09adc1b5ec187ff58e..7fc430817878b15e3df0d9f61126bc4f25a01af9 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
-          trigger-jobs: '{project}-merge-{stream}'
-          karaf-version: 'odl'
-          # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
 
     install:
       - all:
index 1fdebcbbd1dbb7c8f193d9d7b597d47b0cf8f653..a83f648eef70fcea5bb1cce8378cd2223a22939d 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
-          trigger-jobs: '{project}-merge-{stream}'
-          karaf-version: 'odl'
-          # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
 
     install:
       - all:
index f9bebfe318aaf92b496980224aec91dbf7014060..4af044b963a1af4c5143eae5e371a2390ac8e72e 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
-          trigger-jobs: '{project}-merge-{stream}'
-          karaf-version: 'odl'
-          # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
 
     install:
       - all:
index b701b947b8518ab943fef414f74aa644a82bcdf1..443585b0c686b8b0d37229331c7de6f51404c36d 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
-          trigger-jobs: '{project}-merge-{stream}'
-          karaf-version: 'odl'
-          # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
 
     install:
       - all:
index d29586e5bc2bf2475dd077a43ba72edbd8ac401b..1a0ece8d7a00e8e7092cc484a1e71d9152af83f4 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: sxp-magnesium
+    name: sxp-aluminium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -13,7 +13,7 @@
 
     java-version: 'openjdk11'
 
-    stream: magnesium
+    stream: aluminium
     project: 'sxp'
     project-name: 'sxp'
     branch: 'master'
@@ -28,7 +28,7 @@
     staging-profile-id: a6909c75719b7
 
 - project:
-    name: sxp-sodium
+    name: sxp-magnesium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    java-version:
-      - openjdk8
+    java-version: 'openjdk11'
 
-    stream: sodium
+    stream: magnesium
     project: 'sxp'
     project-name: 'sxp'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
 
     mvn-settings: 'sxp-settings'
     mvn-opts: '-Xmx1024m'
@@ -56,7 +55,7 @@
     staging-profile-id: a6909c75719b7
 
 - project:
-    name: sxp-neon
+    name: sxp-sodium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
     java-version:
       - openjdk8
 
-    stream: neon
+    stream: sodium
     project: 'sxp'
     project-name: 'sxp'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
 
     mvn-settings: 'sxp-settings'
     mvn-opts: '-Xmx1024m'
index cc17f29bcfc3b13116e0bc36a15abc50feea652a..af637e1d68781bbe34a3314c922df75d6e6f7cfd 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 8c04f1cf4789e7b40263bba70b1a494bb0e7eb54..e52de623fdfb95591ceb7cbe2e0723f87cfff373 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: telemetry-magnesium
+    name: telemetry-aluminium
     jobs:
       - 'odl-maven-jobs'
       - odl-maven-verify-jobs
@@ -12,7 +12,7 @@
           rtd-token: 694bcbf8e0b45b3c4e53174c6e5773ca351e1efb
       - gerrit-release-merge
 
-    stream: magnesium
+    stream: aluminium
     project: 'telemetry'
     project-name: 'telemetry'
     branch: 'master'
@@ -26,7 +26,7 @@
     staging-profile-id: 8ed9c52266504
 
 - project:
-    name: telemetry-sodium
+    name: telemetry-magnesium
     jobs:
       - 'odl-maven-jobs'
       - odl-maven-verify-jobs
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-telemetry/57583/
           rtd-token: 694bcbf8e0b45b3c4e53174c6e5773ca351e1efb
 
-    stream: sodium
+    stream: magnesium
     project: 'telemetry'
     project-name: 'telemetry'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
     mvn-settings: 'telemetry-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: ''
@@ -51,7 +51,7 @@
     staging-profile-id: 8ed9c52266504
 
 - project:
-    name: telemetry-neon
+    name: telemetry-sodium
     jobs:
       - 'odl-maven-jobs'
       - odl-maven-verify-jobs
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-telemetry/57583/
           rtd-token: 694bcbf8e0b45b3c4e53174c6e5773ca351e1efb
 
-    stream: neon
+    stream: sodium
     project: 'telemetry'
     project-name: 'telemetry'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     mvn-settings: 'telemetry-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: ''
index a2bfdcbe30af502f11939ddf083f48be458f4563..762559292b35eca85f8a0c9c6201d3d9145ca8c1 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: transportpce-magnesium
+    name: transportpce-aluminium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           build-timeout: 120
           build-node: centos7-builder-8c-8g
       - gerrit-release-merge
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     project: 'transportpce'
     project-name: 'transportpce'
-    stream: magnesium
+    stream: aluminium
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'transportpce-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -27,7 +28,7 @@
     staging-profile-id: a6927323fa3d4
 
 - project:
-    name: transportpce-sodium
+    name: transportpce-magnesium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
       - gerrit-tox-verify:
           build-timeout: 120
           build-node: centos7-builder-8c-8g
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     project: 'transportpce'
     project-name: 'transportpce'
-    stream: sodium
-    branch: 'stable/sodium'
+    stream: magnesium
+    branch: 'stable/magnesium'
+    java-version: 'openjdk11'
     mvn-settings: 'transportpce-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -53,7 +55,7 @@
     staging-profile-id: a6927323fa3d4
 
 - project:
-    name: transportpce-neon
+    name: transportpce-sodium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -68,8 +70,8 @@
 
     project: 'transportpce'
     project-name: 'transportpce'
-    stream: neon
-    branch: 'stable/neon'
+    stream: sodium
+    branch: 'stable/sodium'
     mvn-settings: 'transportpce-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -86,6 +88,7 @@
     project: 'transportpce'
     project-name: 'transportpce'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'transportpce-settings'
     mvn-opts: '-Xmx1024m'
 
index 606978e654000ae9dce2284d06e815750dcc5ffe..c1df5fbcdcf3076a5529e2c6e82d0204fbb66643 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
-          trigger-jobs: '{project}-merge-{stream}'
-          karaf-version: 'odl'
-          # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr//xml/features'
 
     install:
       - only:
index 5b9a83d8642a0045c6c7676861922687c8300238..6e4de655e9b3eb0759b3db0456cb38e22a16dbeb 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
-          trigger-jobs: '{project}-merge-{stream}'
-          karaf-version: 'odl'
-          # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr//xml/features'
 
     install:
       - only:
index f8687f553edd3d4da8d248a1e553f116426a5f2e..d7b38c30b96f9cb7ceab6c3056b46956333c18d1 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
-          trigger-jobs: '{project}-merge-{stream}'
-          karaf-version: 'odl'
-          # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr//xml/features'
 
     install:
       - all:
index 49f447c746398c035c8d8908a7ff461dc7ccc62d..a58b1ba6b9e9351f1392f2d95bcdd9d630cb42bb 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
-          trigger-jobs: '{project}-merge-{stream}'
-          karaf-version: 'odl'
-          # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr//xml/features'
 
     install:
       - all:
index 34e5d03cc073763f8804e8020a72cb1093f53515..7eecb3de2c8f9f1d813a2e574aff4477dc4ef316 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: tsdr-magnesium
+    name: tsdr-aluminium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -11,7 +11,7 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'tsdr'
     project-name: 'tsdr'
     branch: 'master'
@@ -24,7 +24,7 @@
     staging-profile-id: a69373036303c
 
 - project:
-    name: tsdr-sodium
+    name: tsdr-magnesium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'tsdr'
     project-name: 'tsdr'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
     mvn-settings: 'tsdr-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: ''
@@ -47,7 +47,7 @@
     staging-profile-id: a69373036303c
 
 - project:
-    name: tsdr-neon
+    name: tsdr-sodium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'tsdr'
     project-name: 'tsdr'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     mvn-settings: 'tsdr-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: ''
     branch: 'master'
     mvn-settings: 'tsdr-settings'
     mvn-opts: '-Xmx1024m'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
     name: tsdr-view
index f6ffac6774ebdd475af05d7d38b177b4aeb77bf8..d597f70f66ed74fa85b7438c5f2f673b76deb14f 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: unimgr-magnesium
+    name: unimgr-aluminium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -11,7 +11,7 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'unimgr'
     project-name: 'unimgr'
     branch: 'master'
@@ -25,7 +25,7 @@
     staging-profile-id: a695d0a0b8d51
 
 - project:
-    name: unimgr-sodium
+    name: unimgr-magnesium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'unimgr'
     project-name: 'unimgr'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
     mvn-settings: 'unimgr-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'ovsdb-merge-{stream}'
@@ -49,7 +49,7 @@
     staging-profile-id: a695d0a0b8d51
 
 - project:
-    name: unimgr-neon
+    name: unimgr-sodium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'unimgr'
     project-name: 'unimgr'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     mvn-settings: 'unimgr-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'ovsdb-merge-{stream}'
index 1404bee7c9f81598b23489c3e4ff4546a1f5cc83..2f2b42e46b2ac54fa667b50d431da323b869b825 100644 (file)
 
     # Project branches
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index e069737627638e8aa98520c8219b7a940af513ab..21221cbf21c8160851a0056209b310588003e803 100644 (file)
@@ -1,13 +1,13 @@
 ---
 - project:
-    name: usc-magnesium
+    name: usc-aluminium
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'usc'
     project-name: 'usc'
     branch: 'master'
     staging-profile-id: a697b633b3ffe
 
 - project:
-    name: usc-sodium
+    name: usc-magnesium
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'usc'
     project-name: 'usc'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
     mvn-settings: 'usc-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
     staging-profile-id: a697b633b3ffe
 
 - project:
-    name: usc-neon
+    name: usc-sodium
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'usc'
     project-name: 'usc'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     mvn-settings: 'usc-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
     branch: 'master'
     mvn-settings: 'usc-settings'
     mvn-opts: '-Xmx1024m'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
     name: usc-view
index 0d6c51d541f69244e625dabb75c212c221ac4b84..202c028d83d43c75ec3a45de6e58458c9dca6660 100644 (file)
 
     # Project branches.
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index 01bb964f3df95178dbb301ed281f8b83716f19df..a9808ef6901e7805079571bb72d4ad36d35a176f 100644 (file)
@@ -7,17 +7,16 @@
     project: 'yangtools'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
-          os-branch: 'queens'
-          java-version: 'openjdk11'
+          jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-          os-branch: 'queens'
-      - neon:
-          branch: 'stable/neon'
-          os-branch: 'queens'
 
+    os-branch: 'queens'
     jdk: 'openjdk8'
 
     feature:
index 5facaeae0629119a1f81524438950a0b0abd54bb..8171e5bb2591ba64abbafd62294f3719f4aeb615 100644 (file)
@@ -2,7 +2,8 @@
 - project:
     name: yangtools-master
     jobs:
-      - 'gerrit-release-merge'
+      - 'gerrit-release-merge':
+          build-node: centos7-builder-2c-2g
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
@@ -13,6 +14,7 @@
 
     java-version: 'openjdk11'
     mvn-settings: 'yangtools-settings'
+    mvn-version: mvn36
 
     dependencies: ''
     email-upstream: '[yangtools]'
     staging-profile-id: 1271cf710cc09d
 
 - project:
-    name: yangtools-v3.0.x
+    name: yangtools-4.0.x
     jobs:
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     project: yangtools
     project-name: yangtools
-    branch: v3.0.x
-    stream: v3.0.x
+    branch: 4.0.x
+    stream: 4.0.x
 
+    java-version: 'openjdk11'
     mvn-settings: 'yangtools-settings'
-    mvn-opts: '-Xmx1024m'
 
     dependencies: ''
     email-upstream: '[yangtools]'
     staging-profile-id: 1271cf710cc09d
 
 - project:
-    name: yangtools-v2.1.x
+    name: yangtools-v3.0.x
     jobs:
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
     project: yangtools
     project-name: yangtools
-    branch: v2.1.x
-    stream: v2.1.x
+    branch: v3.0.x
+    stream: v3.0.x
 
     mvn-settings: 'yangtools-settings'
     mvn-opts: '-Xmx1024m'
     java-version: 'openjdk11'
     mvn-settings: 'yangtools-settings'
     mvn-opts: '-Xmx1024m'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
     name: yangtools-view
index c320011f14715c5757160e895b57967b90600254..da5d5cf92fafcdc0f31a76d2955e8ac9c327c100 160000 (submodule)
@@ -1 +1 @@
-Subproject commit c320011f14715c5757160e895b57967b90600254
+Subproject commit da5d5cf92fafcdc0f31a76d2955e8ac9c327c100
diff --git a/packer/provision/examples/apache-e-w.yaml b/packer/provision/examples/apache-e-w.yaml
deleted file mode 100644 (file)
index 66e3ba5..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    name: apacheservice
-    role: service
-  name: apacheservice
-spec:
-  ports:
-    - port: 8800
-      targetPort: 80
-      protocol: TCP
-      name: tcp
-  selector:
-    name: webserver
diff --git a/packer/provision/examples/apache-n-s.yaml b/packer/provision/examples/apache-n-s.yaml
deleted file mode 100644 (file)
index e99b52c..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    name: apacheexternal
-    role: service
-  name: apacheexternal
-spec:
-  ports:
-    - port: 8800
-      targetPort: 80
-      protocol: TCP
-      name: tcp
-  selector:
-    name: webserver
-  type: NodePort
diff --git a/packer/provision/examples/apache-pod.yaml b/packer/provision/examples/apache-pod.yaml
deleted file mode 100644 (file)
index a4a01a8..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: apachetwin
-  labels:
-    name: webserver
-spec:
-  containers:
-    - name: apachetwin
-      image: fedora/apache
diff --git a/packer/provision/examples/busybox.yaml b/packer/provision/examples/busybox.yaml
deleted file mode 100644 (file)
index a013157..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: busybox
-  namespace: default
-spec:
-  containers:
-    - image: busybox
-      command:
-        - sleep
-        - "3600"
-      imagePullPolicy: IfNotPresent
-      name: busybox
-  restartPolicy: Always
diff --git a/packer/provision/examples/nginx-pod.yaml b/packer/provision/examples/nginx-pod.yaml
deleted file mode 100644 (file)
index 779775a..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: nginxtwin
-  labels:
-    name: webserver
-spec:
-  containers:
-    - name: nginxtwin
-      image: nginx
diff --git a/packer/provision/kubernetes.yaml b/packer/provision/kubernetes.yaml
deleted file mode 100644 (file)
index 77df480..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
----
-- import_playbook: ../common-packer/provision/baseline.yaml
-
-- hosts: all
-  vars:
-    openvswitch_version: 2.8.2
-    openvswitch_checksum: sha256:87b4a7e7134a44ce1f808d3415a2244b4518c2b0b2a42fa2f8231e592f13103d
-    k8s_version: 1.13.2
-    golang_version: 1.11.5
-    golang_checksum: sha256:ff54aafedff961eb94792487e827515da683d61a5f9482f668008832631e5d25
-
-  pre_tasks:
-    - include_role: name=lfit.system-update
-
-  roles:
-    - {role: lfit.docker-install, ubuntu_docker_version: 18.06.0~ce~3-0~ubuntu}
-    - fkautz.bridge-utils-install
-    - fkautz.golang-install
-    - fkautz.kubernetes-install
-    - fkautz.openvswitch-install
-
-- hosts: all
-  tasks:
-    - name: Make example directory
-      file:
-        path: /opt/k8s-examples
-        state: directory
-      become: true
-    - name: Copy example files to example directory
-      synchronize:
-        src: ../provision/examples/
-        dest: /opt/k8s-examples/
-      become: true
-
-  post_tasks:
-    - name: System Reseal
-      script: ../common-packer/provision/system-reseal.sh
-      become: true
diff --git a/packer/provision/roles/coe/requirements.yaml b/packer/provision/roles/coe/requirements.yaml
deleted file mode 100644 (file)
index c4e1b21..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- src: fkautz.bridge-utils-install
-- src: fkautz.openvswitch-install
-- src: fkautz.kubernetes-install
-- src: fkautz.golang-install
diff --git a/packer/provision/templates/odlovs-cni.conf.j2 b/packer/provision/templates/odlovs-cni.conf.j2
deleted file mode 100644 (file)
index 3782908..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "cniVersion": "0.3.0",
-    "name": "odl-cni",
-    "type": "odlovs-cni",
-    "mgrPort": {{ manager_port }},
-    "mgrActive": true,
-    "manager": "{{ manager_ip }}",
-    "ovsBridge": "br-int",
-    "ctlrPort": {{ controller_port }},
-    "ctlrActive": true,
-    "controller": "{{ controller_ip }}",
-    "externalIntf": "{{ external_interface }}",
-    "externalIp": "{{ external_ip }}",
-    "ipam": {
-        "type": "host-local",
-        "subnet": "{{ subnet }}",
-        "routes": [{
-            "dst": "0.0.0.0/0"
-        }],
-        "gateway": "{{ gateway }}"
-    }
-}
diff --git a/packer/templates/kubernetes.json b/packer/templates/kubernetes.json
deleted file mode 100644 (file)
index 1e972c0..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  "variables": {
-    "ansible_roles_path": "roles/coe",
-    "arch": "x86_64",
-    "base_image": null,
-    "cloud_network": null,
-    "cloud_user_data": null,
-    "cloud_region": "ca-ymq-1",
-    "cloud_availability_zone": "ca-ymq-2",
-    "vm_use_block_storage": "true",
-    "vm_volume_size": "20",
-    "vm_image_disk_format": "",
-    "distro": null,
-    "flavor": "v2-highcpu-1",
-    "ssh_user": null,
-    "ssh_proxy_host": ""
-  },
-  "builders": [
-    {
-      "name": "vexxhost",
-      "image_name": "ZZCI - {{user `distro`}} - kubernetes - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
-      "instance_name": "{{user `distro`}}-kubernetes-{{uuid}}",
-      "source_image_name": "{{user `base_image`}}",
-      "type": "openstack",
-      "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": "shell-local",
-      "command": "./common-packer/ansible-galaxy.sh {{user `ansible_roles_path`}} provision/roles/coe/requirements.yaml"
-    },
-    {
-      "type": "ansible",
-      "playbook_file": "provision/kubernetes.yaml",
-      "ansible_env_vars": [
-        "ANSIBLE_NOCOWS=1",
-        "ANSIBLE_PIPELINING=True",
-        "ANSIBLE_ROLES_PATH={{user `ansible_roles_path`}}",
-        "ANSIBLE_CALLBACK_WHITELIST=profile_tasks",
-        "ANSIBLE_STDOUT_CALLBACK=debug"
-      ]
-    }
-  ]
-}
index e4553a9ac8a91e7a9dee4746a78c3b15d490cb3c..a31766292091ee32a0f0e529a1764e828f87d795 100755 (executable)
@@ -33,7 +33,8 @@ BEGIN {
     # replace block to add new release
     new_rel_yaml_tag            = "- " new_release ":";
     br_master_yaml_tag          = "    branch: 'master'";
-    jre_yaml_tag                = "    jre: 'openjdk8'";
+    jre_yaml_tag                = "    jre: 'openjdk11'";
+    java_version_yaml_tag       = "    java-version: 'openjdk11'";
     curr_rel_yaml_tag           = "- " curr_release ":";
     br_stable_curr_yaml_tag     = "    branch: 'stable/" curr_release "'";
 
@@ -166,6 +167,7 @@ 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;
+                    newblk[++nex3] = indent java_version_yaml_tag;
                     newblk[++nex3] = indent curr_rel_yaml_tag;
                     newblk[++nex3] = indent br_stable_curr_yaml_tag;
                     stream_found = 0;