Merge "Move unimgr Sonar scan to Sonarcloud"
authorThanh Ha (zxiiro) <zxiiro@gmail.com>
Tue, 4 Aug 2020 11:20:38 +0000 (11:20 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 4 Aug 2020 11:20:38 +0000 (11:20 +0000)
130 files changed:
.pre-commit-config.yaml
INFO.yaml [new file with mode: 0644]
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 [deleted file]
jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-8g.cfg [deleted file]
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/centos7-docker-1c-4g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg
jenkins-config/clouds/openstack/odlvex/cloud.cfg
jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg
jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-28-1c-4g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-25-1c-4g.cfg
jenkins-config/global-vars-releng.sh
jenkins-config/global-vars-sandbox.sh
jjb/aaa/aaa.yaml
jjb/alt-datastores/alt-datastores.yaml
jjb/alto/alto-csit-setup.yaml [deleted file]
jjb/alto/alto.yaml [deleted file]
jjb/ansible/ansible.yaml
jjb/archetypes/archetypes.yaml
jjb/autorelease/autorelease-macros.yaml
jjb/autorelease/autorelease-projects.yaml
jjb/autorelease/autorelease-templates.yaml
jjb/autorelease/generate-release-notes.sh
jjb/autorelease/validate-autorelease-aluminium.yaml [new file with mode: 0644]
jjb/autorelease/validate-autorelease-magnesium.yaml [new file with mode: 0644]
jjb/autorelease/view-autorelease-aluminium.yaml [new file with mode: 0644]
jjb/autorelease/view-autorelease-magnesium.yaml [new file with mode: 0644]
jjb/bgpcep/bgpcep.yaml
jjb/bier/bier.yaml
jjb/coe/coe.yaml
jjb/controller/controller.yaml
jjb/copy-sandbox-logs.sh
jjb/daexim/daexim.yaml
jjb/defaults.yaml
jjb/detnet/detnet.yaml
jjb/dlux/dlux.yaml
jjb/dluxapps/dluxapps.yaml
jjb/docs/docs-rtd.yaml
jjb/genius/genius.yaml
jjb/groupbasedpolicy/groupbasedpolicy.yaml
jjb/honeycomb/vbd/vbd.yaml
jjb/infrautils/infrautils.yaml
jjb/integration/common-functions.sh
jjb/integration/csit-jobs-aluminium.lst
jjb/integration/csit-jobs-magnesium.lst
jjb/integration/csit-jobs-sodium.lst
jjb/integration/distribution/distribution-jobs.yaml
jjb/integration/integration-apex-run-tests.sh
jjb/integration/integration-deploy-controller-run-test.sh
jjb/integration/integration-deploy-openstack-run-test.sh
jjb/integration/integration-install-robotframework.sh
jjb/integration/integration-start-cluster-run-test.sh
jjb/integration/integration-templates.yaml
jjb/integration/integration-test-jobs.yaml
jjb/integration/multipatch-distribution.sh
jjb/integration/update-csit-tests.sh
jjb/jsonrpc/jsonrpc.yaml
jjb/l2switch/l2switch.yaml
jjb/lf-infra/lf-infra-jobs.yaml
jjb/lfn/lfn.yaml [deleted file]
jjb/lispflowmapping/lispflowmapping-csit-performance.yaml [deleted file]
jjb/lispflowmapping/lispflowmapping.yaml
jjb/mdsal/mdsal.yaml
jjb/nemo/nemo.yaml
jjb/netconf/netconf-csit-callhome.yaml
jjb/netconf/netconf-patch-test.yaml
jjb/netconf/netconf-userfeatures.yaml
jjb/netconf/netconf.yaml
jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
jjb/netvirt/netvirt-csit-multi-openstack.yaml
jjb/netvirt/netvirt-dependencies.yaml
jjb/netvirt/netvirt-patch-test.yaml
jjb/netvirt/netvirt.yaml
jjb/neutron/neutron.yaml
jjb/odlguice/odlguice.yaml [new file with mode: 0644]
jjb/odlmicro/odlmicro.yaml
jjb/odlparent/odlparent.yaml
jjb/odlsaf/odlsaf.yaml [new file with mode: 0644]
jjb/odltools/odltools.yaml
jjb/of-config/of-config.yaml
jjb/openci/create-ape.sh [deleted file]
jjb/openci/openci-odl-daily-jobs.yaml [deleted file]
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.yaml
jjb/opflex/opflex.yaml
jjb/ovsdb/ovsdb.yaml
jjb/p4plugin/p4plugin.yaml
jjb/packaging/packaging.yaml
jjb/packetcable/packetcable.yaml
jjb/plastic/plastic.yaml
jjb/releng-jobs.yaml
jjb/releng-packer-jobs.yaml
jjb/serviceutils/serviceutils.yaml
jjb/sfc/sfc.yaml
jjb/snmp/snmp.yaml
jjb/snmp4sdn/snmp4sdn.yaml
jjb/sxp/sxp.yaml
jjb/telemetry/telemetry.yaml
jjb/transportpce/transportpce.yaml
jjb/tsdr/tsdr.yaml
jjb/unimgr/unimgr.yaml
jjb/usc/usc.yaml
jjb/yangtools/yangtools.yaml
packer/common-packer
packer/provision/local-builder.yaml
packer/provision/mininet-ovs-2.8.yaml
scripts/.gitignore [deleted file]
tox.ini

index 275074f2d44a88f5549359bbb11c95cef7806d6a..7ff009625209fc5c8fd6108bdf87910f7020f754 100644 (file)
@@ -1,7 +1,7 @@
 ---
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.2.1
+    rev: v2.5.0
     hooks:
       - id: check-json
       - id: flake8
@@ -10,12 +10,12 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/jorisroovers/gitlint
-    rev: v0.11.0
+    rev: v0.13.1
     hooks:
       - id: gitlint
 
   - repo: https://github.com/jumanjihouse/pre-commit-hooks
-    sha: 1.11.0
+    sha: 2.0.2
     hooks:
       - id: shellcheck
         exclude: >
@@ -25,6 +25,6 @@ repos:
             )$
 
   - repo: https://github.com/adrienverge/yamllint
-    rev: v1.15.0
+    rev: v1.23.0
     hooks:
       - id: yamllint
diff --git a/INFO.yaml b/INFO.yaml
new file mode 100644 (file)
index 0000000..a1f7cc0
--- /dev/null
+++ b/INFO.yaml
@@ -0,0 +1,88 @@
+---
+project: 'releng_builder'
+project_creation_date: '2014-10-22'
+project_category: 'Integration & Testing'
+lifecycle_state: 'Incubation'
+project_lead: &odl_releng_builder_ptl
+    name: 'Thanh Ha'
+    email: 'zxiiro@gmail.com'
+    id: 'zxiiro'
+    company: 'Lumina Networks'
+    timezone: 'America/Toronto'
+primary_contact: *odl_releng_builder_ptl
+issue_tracking:
+    type: 'jira'
+    url: 'https://jira.opendaylight.org/projects/'
+    key: 'releng_builder'
+mailing_list:
+    type: 'groups.io'
+    url: 'release@lists.opendaylight.org'
+    tag: '[]'
+realtime_discussion:
+    type: 'irc'
+    server: 'freenode.net'
+    channel: '#lf-releng'
+meetings:
+    - type: ''
+      agenda: 'https://wiki.opendaylight.org'
+      url: ''
+      server: 'freenode.net'
+      channel: '#lf-releng'
+      repeats: ''
+      time: ''
+repositories:
+    - releng/builder
+committers:
+    - <<: *odl_releng_builder_ptl
+    - name: 'Andrew Grimberg'
+      email: 'agrimberg@linuxfoundation.org'
+      company: 'Linux Foundation'
+      id: 'agrimberg'
+      timezone: 'America/Los_Angeles'
+    - name: 'Sam Hague'
+      email: 'shague@redhat.com'
+      company: 'redhat'
+      id: 'shague'
+      timezone: 'Unknown/Unknown'
+    - name: 'Jamo Luhrsen'
+      email: 'jluhrsen@gmail.com'
+      company: 'Lumina Networks'
+      id: 'jluhrsen'
+      timezone: 'America/Los_Angeles'
+    - name: 'Anil Belur'
+      email: 'abelur@linuxfoundation.org'
+      company: 'Linux Foundation'
+      id: 'askb'
+      timezone: 'Unknown/Unknown'
+    - name: 'Marcus Williams'
+      email: 'marcus.williams@intel.com'
+      company: 'intel'
+      id: 'mgkwill'
+      timezone: 'Unknown/Unknown'
+    - name: 'Luis Gomez'
+      email: 'ecelgp@gmail.com'
+      company: 'Lumina Networks'
+      id: 'ecelgp'
+      timezone: 'Unknown/Unknown'
+    - name: 'Daniel Farrell'
+      email: 'dfarrell07@gmail.com'
+      company: ''
+      id: 'dfarrell07'
+      timezone: 'Unknown/Unknown'
+    - name: 'Venkatrangan Govindarajan'
+      email: 'vgovindarajan@luminanetworks.com'
+      company: 'Lumina Networks'
+      id: 'gvrangan'
+      timezone: 'Asia/Kolkata'
+    - name: 'Faseela K'
+      email: 'k.faseela@gmail.com'
+      company: ''
+      id: 'k.faseela'
+      timezone: 'Asia/Kolkata'
+tsc:
+    # yamllint disable rule:line-length
+    approval: 'https://meetings.opendaylight.org/opendaylight-meeting/2014/tsc/opendaylight-meeting-tsc.2014-10-23-16.59.html'
+    changes:
+        - type: ''
+          name: ''
+          link: ''
index 6229602791f3096aa849c65c299d276bb02594b3..e8a0c1962de7d60a661f0ac4334d9953beb9654f 100644 (file)
@@ -260,8 +260,8 @@ Pool: ODLVEX
           prd-centos7-autorelease-4c-16g
         <td><b>Packer Template</b><br/>
         releng/builder/packer/templates/builder.json</td>
-        <td><b>Spinup Script</b><br/>
-        releng/builder/jenkins-scripts/builder.sh</td>
+        <td><b>Playbook</b><br/>
+        releng/builder/packer/common-packer/provision/baseline.yaml</td>
       </tr>
       <tr>
         <td colspan="4">
@@ -278,7 +278,7 @@ Pool: ODLVEX
         <td><b>Minion Template names</b><br/> centos7-robot-2c-2g</td>
         <td><b>Packer Template</b><br/>
         releng/builder/packer/templates/robot.json</td>
-        <td><b>Spinup Script</b><br/> releng/builder/jenkins-scripts/robot.sh</td>
+        <td><b>Playbook</b><br/> releng/builder/packer/provision/robot.yaml</td>
       </tr>
       <tr>
         <td colspan="4">
@@ -292,27 +292,38 @@ Pool: ODLVEX
       </tr>
 
       <tr class="warning">
-        <td><b>Jenkins Labels</b><br/> ubuntu1404-mininet-2c-2g</td>
-        <td><b>Minion Template names</b><br/> ubuntu1404-mininet-2c-2g</td>
-        <td><b>Packer Template</b><br/>
-        releng/builder/packer/teamplates/mininet.json</td>
-        <td><b>Spinup Script</b><br/> releng/builder/jenkins-scripts/mininet-ubuntu.sh</td>
+        <td><b>Jenkins Labels</b><br/> ubuntu1604-mininet-ovs-25-2c-2g</td>
+        <td><b>Minion Template names</b><br/> ubuntu1604-mininet-ovs-25-2c-2g</td>
+        <td><b>Packer Template</b><br/> releng/builder/packer/templates/mininet-ovs-2.5.json</td>
+        <td><b>Playbook</b><br/> releng/builder/packer/provision//mininet-ovs-2.5.yaml</td>
+      </tr>
+      <tr>
+        <td colspan="4">
+          Basic Ubuntu 16.04 (Xenial) system with ovs 2.5 and mininet 2.2.1
+        </td>
+      </tr>
+
+      <tr class="warning">
+        <td><b>Jenkins Labels</b><br/> ubuntu1604-mininet-ovs-26-2c-2g</td>
+        <td><b>Minion Template names</b><br/> ubuntu1604-mininet-ovs-26-2c-2g</td>
+        <td><b>Packer Template</b><br/> releng/builder/packer/templates/mininet-ovs-2.6.json</td>
+        <td><b>Playbook</b><br/> releng/builder/packer/provision//mininet-ovs-2.6.yaml</td>
       </tr>
       <tr>
         <td colspan="4">
-          Basic Ubuntu 14.04 (Trusty) system with ovs 2.0.2 and mininet 2.1.0
+          Ubuntu 16.04 (Xenial) system with ovs 2.6 and mininet 2.2.1
         </td>
       </tr>
 
       <tr class="warning">
-        <td><b>Jenkins Labels</b><br/> ubuntu1404-mininet-ovs-23-2c-2g</td>
-        <td><b>Minion Template names</b><br/> ubuntu1404-mininet-ovs-23-2c-2g</td>
-        <td><b>Packer Template</b><br/> releng/builder/packer/templates/mininet-ovs-2.3.json</td>
-        <td><b>Spinup Script</b><br/> releng/builder/jenkins-scripts/mininet-ubuntu.sh</td>
+        <td><b>Jenkins Labels</b><br/> ubuntu1604-mininet-ovs-28-2c-2g</td>
+        <td><b>Minion Template names</b><br/> ubuntu1604-mininet-ovs-28-2c-2g</td>
+        <td><b>Packer Template</b><br/> releng/builder/packer/templates/mininet-ovs-2.8.json</td>
+        <td><b>Playbook</b><br/> releng/builder/packer/provision//mininet-ovs-2.8.yaml</td>
       </tr>
       <tr>
         <td colspan="4">
-          Ubuntu 16.04 (Xenial) system with ovs 2.5 and mininet 2.2.1
+          Ubuntu 16.04 (Xenial) system with ovs 2.8 and mininet 2.2.1
         </td>
       </tr>
 
@@ -320,7 +331,7 @@ Pool: ODLVEX
         <td><b>Jenkins Labels</b><br/> centos7-devstack-2c-4g</td>
         <td><b>Minion Template names</b><br/> centos7-devstack-2c-4g</td>
         <td><b>Packer Template</b><br/> releng/builder/packer/templates/devstack.json</td>
-        <td><b>Spinup Script</b><br/> releng/builder/jenkins-scripts/devstack.sh</td>
+        <td><b>Playbook</b><br/> releng/builder/packer/provision/devstack.yaml</td>
       </tr>
       <tr>
         <td colspan="4">
@@ -335,7 +346,7 @@ Pool: ODLVEX
         <td><b>Jenkins Labels</b><br/> centos7-docker-2c-4g</td>
         <td><b>Minion Template names</b><br/> centos7-docker-2c-4g</td>
         <td><b>Packer Template</b><br/> releng/builder/packer/templates/docker.json</td>
-        <td><b>Spinup Script</b><br/> releng/builder/jenkins-scripts/docker.sh</td>
+        <td><b>Playbook</b><br/> releng/builder/packer/common-packer/provision/docker.yaml</td>
       </tr>
       <tr>
         <td colspan="4">
@@ -347,22 +358,10 @@ Pool: ODLVEX
       </tr>
 
       <tr class="warning">
-        <td><b>Jenkins Labels</b><br/> ubuntu1404-gbp-2c-2g</td>
-        <td><b>Minion Template names</b><br/> ubuntu1404-gbp-2c-2g</td>
-        <td><b>Packer Template</b><br/> releng/builder/packer/templates/gbp.json</td>
-        <td><b>Spinup Script</b><br/> releng/builder/jenkins-scripts/ubuntu-docker-ovs.sh</td>
-      </tr>
-      <tr>
-        <td colspan="4">
-          Ubuntu 14.04 (Trusty) node with latest OVS and docker installed. Used by Group Based Policy.
-        </td>
-      </tr>
-
-      <tr class="warning">
-        <td><b>Jenkins Labels</b><br/> ubuntu1604-gbp-2c-4g</td>
-        <td><b>Minion Template names</b><br/> ubuntu1604-gbp-2c-4g</td>
+        <td><b>Jenkins Labels</b><br/> ubuntu1604-gbp-2c-2g</td>
+        <td><b>Minion Template names</b><br/> ubuntu1604-gbp-2c-2g</td>
         <td><b>Packer Template</b><br/> releng/builder/packer/templates/gbp.json</td>
-        <td><b>Spinup Script</b><br/> releng/builder/jenkins-scripts/ubuntu-docker-ovs.sh</td>
+        <td><b>Spinup Script</b><br/> releng/builder/jenkins-scripts/gpb.sh</td>
       </tr>
       <tr>
         <td colspan="4">
index 5dc3432cae2f13d9e5151a00a76a78ce73d92d70..6b4eba38370203ded897068371a4e50255ef588b 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 5dc3432cae2f13d9e5151a00a76a78ce73d92d70
+Subproject commit 6b4eba38370203ded897068371a4e50255ef588b
index 74f75f97a4a8aece2185e022f182a8659b4a5473..dda4381e7d21b21bb9410a563e4ff0fb7e40ab7e 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474
 VOLUME_SIZE=100
 HARDWARE_ID=odl-highcpu-2
diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg
deleted file mode 100644 (file)
index e7cc9da..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-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-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-8g.cfg
deleted file mode 100644 (file)
index 179dad5..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246
-VOLUME_SIZE=150
-HARDWARE_ID=odl-highcpu-8
index 29e1f9de0611f513f22b599a9585eed4cc78fb9e..e72391243c6163693c9e535cc409cda30766fcd8 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474
 HARDWARE_ID=v1-standard-1
index ae9459213b7b6217b9904aa2363737776e6ce26e..accee7db2c1fbe112e67deca25eb4b15e2edf362 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474
 HARDWARE_ID=odl-highcpu-2
index 0ce20babce23f0cd206a410a155df0219a69318a..a391dc00e6a879b3d8db861cd52b583473e9e39f 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474
 HARDWARE_ID=odl-standard-2
index 485f9af524ff3c952a2f4af632d689c4d618cf45..56a4f863747a66882b211eeec1da209eec5cb955 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474
 HARDWARE_ID=odl-standard-4
index f5cc893f3e8daddaf438d7e88b57e5ee7be2ccff..dc2aaa756446efa92707659a02cf95fd22a392ab 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474
 HARDWARE_ID=odl-highcpu-4
index 7c70aba49d009b5cfe7d5e756090e388a2cd6148..cebc67cad69332407cc6cde928ff7260eda5ee08 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200421-202608.246
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474
 HARDWARE_ID=odl-highcpu-8
index 5ab3289f93d6f1377267586079a8e82e3394b027..413e724e00ed1c889c8ee93a5d192c17ae3fd2fc 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200801-220136.401
 HARDWARE_ID=odl-standard-1
index e75e5302a9728a80e69f62551b67f44aed451537..0d7c50b0b20c295931ac55d39d052c564bb07664 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200801-220136.401
 HARDWARE_ID=odl-highcpu-2
index 4f052ef41eabd09666b59f57a408cffed3c6e40a..7d7aa5c98390986f0ef02bc04b87b99eb960e081 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200801-220136.401
 HARDWARE_ID=odl-standard-2
index ff144c6ffc9b01bf04106fb8059ac62881a16eb6..46a768ca313a96711b3edbb18141f0917cc32c26 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 - 20200421-202608.246
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474
 HARDWARE_ID=v1-standard-1
 NETWORK_ID=b5fcd86e-efac-4997-b8bc-dbe0d35bc229
 USER_DATA_ID=jenkins-init-script
index 184dbc9a9c0e98b453c1cb2cb5f4ad3c0356be81..69960b6949f3bd03e3ea7c4f674a196ef9205a74 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - mininet-ovs-25 - x86_64 - 20200501-040138.328
 HARDWARE_ID=odl-standard-1
diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-28-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-28-1c-4g.cfg
new file mode 100644 (file)
index 0000000..59abc8d
--- /dev/null
@@ -0,0 +1,2 @@
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013
+HARDWARE_ID=odl-standard-1
index 1eff3f1c82dee296ddda8cab4fbae4e3c2a02453..0b8d865207f23939eb99396c20ea7475833db11f 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - mininet-ovs-25 - x86_64 - 20200121-232651.765
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - mininet-ovs-25 - x86_64 - 20200521-041758.169
 HARDWARE_ID=odl-standard-1
index cd754e49cf0cb8431ee91bcd89366eca24cc73be..924341c78a2b448d89ceac13b4cc99e1a86425a9 100644 (file)
@@ -11,3 +11,4 @@ SIGUL_BRIDGE_IP=10.30.168.3
 SIGUL_KEY=odl-release-2018
 SILO=releng
 SONAR_URL=https://sonar.opendaylight.org
+S3_BUCKET=
index e34e0fb48e9f147477be8e2489de0460839303a8..7d43a6d3c8fbc500fa89d6572c35ed88484a0ea8 100644 (file)
@@ -9,3 +9,4 @@ SIGUL_BRIDGE_IP=10.30.168.3
 SIGUL_KEY=odl-sandbox
 SILO=sandbox
 SONAR_URL=https://sonar.opendaylight.org
+S3_BUCKET=
index ad1b3edc61cfe8255b666d2ce30f8d94134889d0..e13c590b9617b829563ec84883f8c43bb71040ba 100644 (file)
     java-version: 'openjdk11'
     mvn-settings: 'aaa-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: aaa-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aaa
+    project-name: aaa
+    branch: 'master'
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: aaa-view
index cf2e9954af01dcd866a67bcd1777e1dcb734373c..53a7bcf908ee428dfaf988508d58b1ee447c8c09 100644 (file)
     mvn-settings: 'alt-datastores-settings'
     mvn-opts: '-Xmx1024m'
 
+- project:
+    name: alt-datastores-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: alt-datastores
+    project-name: alt-datastores
+    branch: master
+    build-node: centos7-builder-2c-1g
+
 - project:
     name: alt-datastores-view
     views:
diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml
deleted file mode 100644 (file)
index 265dd0b..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
----
-- project:
-    name: alto-csit-setup
-    jobs:
-      - inttest-csit-1node
-
-    # The project name
-    project: 'alto'
-
-    # The functionality under test
-    functionality: 'setup'
-
-    disable-job: true
-
-    # Project branches
-    stream:
-      - aluminium:
-          branch: 'master'
-          jre: 'openjdk11'
-      - magnesium:
-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
-      - sodium:
-          branch: 'stable/sodium'
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: 'odl-alto-resourcepool,odl-restconf-all,odl-alto-basic'
-
-    # Robot custom options
-    robot-options: ''
-
-    # Don't spin up mininet vms as alto-csit-setup jobs don't need them
-    tools_system_count: 0
diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml
deleted file mode 100644 (file)
index dd766f1..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
----
-- project:
-    name: alto-aluminium
-    jobs:
-      - gerrit-release-merge
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: aluminium
-    project: 'alto'
-    project-name: 'alto'
-    branch: 'master'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'alto-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'l2switch-merge-{stream}'
-    email-upstream: '[alto] [l2switch]'
-    disable-job: true
-
-    # Used by the release job
-    staging-profile-id: 931eabae9693c
-
-- project:
-    name: alto-magnesium
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    project: 'alto'
-    project-name: 'alto'
-    branch: 'stable/magnesium'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'alto-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'l2switch-merge-{stream}'
-    email-upstream: '[alto] [l2switch]'
-    disable-job: true
-
-    # Used by the release job
-    staging-profile-id: 931eabae9693c
-
-- project:
-    name: alto-sodium
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: sodium
-    project: 'alto'
-    project-name: 'alto'
-    branch: 'stable/sodium'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'alto-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'l2switch-merge-{stream}'
-    email-upstream: '[alto] [l2switch]'
-    disable-job: true
-
-    # Used by the release job
-    staging-profile-id: 931eabae9693c
-
-- project:
-    name: alto-sonar
-    jobs:
-      - gerrit-maven-sonar
-
-    project: 'alto'
-    project-name: 'alto'
-    branch: 'master'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'alto-settings'
-    mvn-opts: '-Xmx1024m'
-    disable-job: true
-
-- project:
-    name: alto-view
-    views:
-      - project-view
-    project-name: alto
index 780d2064ef392e31df5b92638fa1011fbc1608b6..701f76ec3b2f9b47fbab568f7507e25e63063d95 100644 (file)
     build-timeout: 60
     staging-profile-id: 'da5a90345bd62'
 
+- project:
+    name: ansible-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: ansible
+    project-name: ansible
+    branch: master
+    build-node: centos7-builder-2c-1g
+
 - project:
     name: ansible-view
     views:
index 508ff6f75bbb00ba13ba424c22fc7e3b61fb6d60..5480703c15df5dabacd147879283cae377acf790 100644 (file)
     branch: 'master'
     java-version: 'openjdk11'
     mvn-settings: 'archetypes-settings'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+
+- project:
+    name: archetypes-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: archetypes
+    project-name: archetypes
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: archetypes-view
index 217bdddcc184ce28cf0edc3ca6ac261a65a51a08..a1ab67240d25d3d05c23d53144427b6fb6de22b0 100644 (file)
@@ -44,7 +44,8 @@
     builders:
       - shell: |
           #!/bin/bash -l
-          virtualenv --system-site-packages $WORKSPACE/venv
+          set -xe -o pipefail
+          virtualenv -p python3 --system-site-packages $WORKSPACE/venv
           source $WORKSPACE/venv/bin/activate
           PYTHON="$WORKSPACE/venv/bin/python"
           $PYTHON -m pip install --upgrade networkx
index f15d67080271c65d2c404a1690a10d7f05a230e7..f842d22bfb0df9e8910baed90adedd4ad62f5109 100644 (file)
@@ -5,18 +5,14 @@
       - autorelease-branch-cut
       - 'autorelease-generate-release-notes-{stream}'
       - 'autorelease-release-{stream}-{mvn-version}-{java-version}':
-          build-node: centos7-autorelease-4c-16g
-      - 'autorelease-update-submodules-{stream}'
-      - 'autorelease-update-validate-jobs-{stream}'
-      - 'autorelease-version-bump-{stream}-{mvn-version}-{java-version}':
-          build-node: centos7-autorelease-4c-16g
-      - '{project-name}-validate-autorelease-{stream}'
-      - gerrit-tox-verify
+          build-node: centos7-builder-4c-16g
+      - 'autorelease-version-bump-{stream}-{mvn-version}-{java-version}'
 
     stream:
       - sodium:
           branch: 'stable/sodium'
           integration-test: sodium
+          cron: '@weekly'
 
     project: releng/autorelease
     project-name: autorelease
@@ -32,7 +28,7 @@
     staging-profile-id: 425e43800fea70
     # TODO: **/*.hprof is too large, compress with xz first
     mvn-params: >
-        -Pintegrationtests,repoBuild
+        -PrepoBuild
         -P!karaf
         -Pignore-lispflowmapping-integrationtest
         -Dcheckstyle.skip=true
         -Dsft.heap.max=4g
     java-version: openjdk8
 
-
 - project:
     name: autorelease-projects-openjdk11
     jobs:
+      - 'autorelease-generate-release-notes-{stream}'
       - 'autorelease-release-{stream}-{mvn-version}-{java-version}':
-          build-node: centos7-autorelease-4c-16g
-      - 'autorelease-version-bump-{stream}-{mvn-version}-{java-version}':
+          build-node: centos7-builder-4c-16g
+      - 'autorelease-update-submodules-{stream}'
+      - 'autorelease-update-validate-jobs-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - 'autorelease-version-bump-{stream}-{mvn-version}-{java-version}'
+      - gerrit-tox-verify
 
     stream:
       - aluminium:
@@ -55,9 +55,6 @@
       - magnesium:
           branch: 'stable/magnesium'
           integration-test: magnesium
-      - sodium:
-          branch: 'stable/sodium'
-          integration-test: sodium-dev-null
 
     project: releng/autorelease
     project-name: autorelease
@@ -73,7 +70,7 @@
     staging-profile-id: 425e43800fea70
     # TODO: **/*.hprof is too large, compress with xz first
     mvn-params: >
-        -Pintegrationtests,repoBuild
+        -PrepoBuild
         -P!karaf
         -Pignore-lispflowmapping-integrationtest
         -Dcheckstyle.skip=true
         -Dsft.heap.max=4g
     java-version: 'openjdk11'
 
+- project:
+    name: autorelease-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: releng/autorelease
+    project-name: autorelease
+    branch: master
+    build-node: centos7-builder-2c-1g
+
 - project:
     name: autorelease-view
     views:
index 5d46c1a8bdc3f926f52e198250796bd72684c202..d607c9f0527de29117ff09cb78d53d8b976e36b9 100644 (file)
           gerrit-user: 'jenkins-$SILO'
           gerrit-host: 'git.opendaylight.org'
           gerrit-topic: 'autorelease-update-validate-jobs-{stream}'
-          gerrit-commit-message: |
-              'Update validate autorelease projects for {stream}'
+          gerrit-commit-message: 'Update validate-ar jobs for {stream}'
           reviewers-email: 'jenkins-releng@opendaylight.org'
 
     publishers:
 
     builders:
       - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
       - autorelease-checkout-gerrit-patch
-      - autorelease-compare-projects
       - lf-jacoco-nojava-workaround
       - shell: "./scripts/list-project-dependencies.sh"
       - autorelease-determine-merge-order
index c741d75aafaf4ea72fd7377a9f1433c1dff90aba..46efa078f2b52513a4d5a387cb9f8204a9f6ac07 100644 (file)
@@ -15,7 +15,7 @@ set -x
 
 pip install --user --quiet --upgrade git-review
 
-RELEASE=${RELEASE:-$(echo "$GERRIT_EVENT_COMMENT_TEXT" | grep generate-release-notes | awk '{print $2}')}
+RELEASE=${RELEASE:-$(echo "$GERRIT_EVENT_COMMENT_TEXT" | base64 -d | grep generate-release-notes | awk '{print $2}')}
 if [ -z "$RELEASE" ]; then
     echo "ERROR: The RELEASE variable is not set."
     exit 1
@@ -36,7 +36,7 @@ cd "$DOCS_DIR" || exit 1
 cp "$WORKSPACE/release-notes.rst" "docs/release-notes/release-notes-${RELEASE,,}.rst"
 git add docs/release-notes/
 
-GERRIT_COMMIT_MESSAGE="Update release notes"
+GERRIT_COMMIT_MESSAGE="Update release notes for $RELEASE"
 GERRIT_TOPIC="autogenerate-release-notes"
 CHANGE_ID=$(ssh -p 29418 "jenkins-$SILO@git.opendaylight.org" gerrit query \
                limit:1 owner:self is:open project:docs \
diff --git a/jjb/autorelease/validate-autorelease-aluminium.yaml b/jjb/autorelease/validate-autorelease-aluminium.yaml
new file mode 100644 (file)
index 0000000..c58822c
--- /dev/null
@@ -0,0 +1,35 @@
+---
+# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job
+- project:
+    name: autorelease-validate-aluminium
+    jobs:
+      - '{project-name}-validate-autorelease-{stream}'
+    stream: aluminium
+    branch: master
+    project-name:
+      - aaa:
+          project: aaa
+      - bgpcep:
+          project: bgpcep
+      - daexim:
+          project: daexim
+      - genius:
+          project: genius
+      - integration-distribution:
+          project: integration/distribution
+      - jsonrpc:
+          project: jsonrpc
+      - lispflowmapping:
+          project: lispflowmapping
+      - netconf:
+          project: netconf
+      - netvirt:
+          project: netvirt
+      - neutron:
+          project: neutron
+      - openflowplugin:
+          project: openflowplugin
+      - ovsdb:
+          project: ovsdb
+      - serviceutils:
+          project: serviceutils
diff --git a/jjb/autorelease/validate-autorelease-magnesium.yaml b/jjb/autorelease/validate-autorelease-magnesium.yaml
new file mode 100644 (file)
index 0000000..cfed3ae
--- /dev/null
@@ -0,0 +1,39 @@
+---
+# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job
+- project:
+    name: autorelease-validate-magnesium
+    jobs:
+      - '{project-name}-validate-autorelease-{stream}'
+    stream: magnesium
+    branch: stable/magnesium
+    project-name:
+      - aaa:
+          project: aaa
+      - bgpcep:
+          project: bgpcep
+      - controller:
+          project: controller
+      - daexim:
+          project: daexim
+      - genius:
+          project: genius
+      - infrautils:
+          project: infrautils
+      - integration-distribution:
+          project: integration/distribution
+      - jsonrpc:
+          project: jsonrpc
+      - lispflowmapping:
+          project: lispflowmapping
+      - netconf:
+          project: netconf
+      - netvirt:
+          project: netvirt
+      - neutron:
+          project: neutron
+      - openflowplugin:
+          project: openflowplugin
+      - ovsdb:
+          project: ovsdb
+      - serviceutils:
+          project: serviceutils
diff --git a/jjb/autorelease/view-autorelease-aluminium.yaml b/jjb/autorelease/view-autorelease-aluminium.yaml
new file mode 100644 (file)
index 0000000..56fb982
--- /dev/null
@@ -0,0 +1,38 @@
+---
+# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job
+- releng_view: &releng_autorelease_view_common_aluminium
+    name: releng-view-autorelease-aluminium
+    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-Aluminium
+    description: 'List of Aluminium Merge jobs for Autorelease'
+    job-name:
+      - 'aaa-merge-aluminium'
+      - 'bgpcep-merge-aluminium'
+      - 'daexim-merge-aluminium'
+      - 'genius-merge-aluminium'
+      - 'integration/distribution-merge-aluminium'
+      - 'jsonrpc-merge-aluminium'
+      - 'lispflowmapping-merge-aluminium'
+      - 'netconf-merge-aluminium'
+      - 'netvirt-merge-aluminium'
+      - 'neutron-merge-aluminium'
+      - 'openflowplugin-merge-aluminium'
+      - 'ovsdb-merge-aluminium'
+      - 'serviceutils-merge-aluminium'
+    <<: *releng_autorelease_view_common_aluminium
diff --git a/jjb/autorelease/view-autorelease-magnesium.yaml b/jjb/autorelease/view-autorelease-magnesium.yaml
new file mode 100644 (file)
index 0000000..9fa0634
--- /dev/null
@@ -0,0 +1,40 @@
+---
+# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job
+- releng_view: &releng_autorelease_view_common_magnesium
+    name: releng-view-autorelease-magnesium
+    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-Magnesium
+    description: 'List of Magnesium Merge jobs for Autorelease'
+    job-name:
+      - 'aaa-merge-magnesium'
+      - 'bgpcep-merge-magnesium'
+      - 'controller-merge-magnesium'
+      - 'daexim-merge-magnesium'
+      - 'genius-merge-magnesium'
+      - 'infrautils-merge-magnesium'
+      - 'integration/distribution-merge-magnesium'
+      - 'jsonrpc-merge-magnesium'
+      - 'lispflowmapping-merge-magnesium'
+      - 'netconf-merge-magnesium'
+      - 'netvirt-merge-magnesium'
+      - 'neutron-merge-magnesium'
+      - 'openflowplugin-merge-magnesium'
+      - 'ovsdb-merge-magnesium'
+      - 'serviceutils-merge-magnesium'
+    <<: *releng_autorelease_view_common_magnesium
index aaead5681486a2babe6156ba2e74c2b7a1c0f86b..0362e3d8a84e9d7dfc4aaac5988547e8a9d21824 100644 (file)
     mvn-settings: 'bgpcep-settings'
     mvn-opts: '-Xmx1024m'
 
+- project:
+    name: bgpcep-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: bgpcep
+    project-name: bgpcep
+    branch: master
+    build-node: centos7-builder-2c-1g
+
 - project:
     name: bgpcep-view
     views:
index e8d9f2ae7ced4bb50b8efe3cf9ee6ee5aa743a0b..9a4f47ecc35b84365613c0b9c19c8df4513caf34 100644 (file)
     mvn-settings: 'bier-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: bier-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: bier
+    project-name: bier
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: bier-view
index ff1208e9a0076aeaa3bbdf31ae6ab4f995c037a3..25a1cf6117513e3d756b8e475a8cd4ef8aa6e509 100644 (file)
     java-version: 'openjdk11'
     mvn-settings: 'coe-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: coe-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: coe
+    project-name: coe
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: coe-view
index 2819e2cb183b16ad95bcc9359763873562d837c7..b03b92c9d2181d4894e0d39db1cc1d33b6604ab1 100644 (file)
     project: 'controller'
     project-name: 'controller'
     branch: master
-    build-node: centos7-builder-8c-8g
-    java-version: 'openjdk11'
-    mvn-settings: 'controller-settings'
-    mvn-goals: 'clean deploy -Pintegrationtests,docs'
-    mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true'
-
-- project:
-    name: controller-sonarcloud
-    jobs:
-      - gerrit-maven-sonar:
-          mvn-params: >
-            -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
-            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
-
-    project: 'controller'
-    project-name: 'controller-sonarcloud'
-    branch: master
-    build-node: centos7-builder-8c-8g
     java-version: 'openjdk11'
     mvn-settings: 'controller-settings'
     mvn-goals: 'clean deploy -Pintegrationtests,docs'
     sonarcloud-api-token: '{sonarcloud_api_token}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
+- project:
+    name: controller-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: controller
+    project-name: controller
+    branch: master
+    build-node: centos7-builder-2c-1g
+
 - project:
     name: controller-view
     views:
index 2cc2c82c6d45aaf8e7fce482b860620c5c5219a8..e3885e5897bc102e2728cf2ee00c9b586907356d 100644 (file)
@@ -18,7 +18,7 @@
 # Usage: copy-logs: JOB_NAME/BUILD_NUMBER
 echo "---> copy-sandbox-logs.sh"
 
-build_path="$(echo "$GERRIT_EVENT_COMMENT_TEXT" | grep 'copy-logs:' | awk -F: '{print $2}' | tr -d '[:space:]')"
+build_path="$(echo "$GERRIT_EVENT_COMMENT_TEXT" | base64 -d | grep 'copy-logs:' | awk -F: '{print $2}' | tr -d '[:space:]')"
 fetch_url="https://logs.opendaylight.org/sandbox/vex-yul-odl-jenkins-2/$build_path"
 
 COPY_DIR="$WORKSPACE/archives"
index 4a7bafd256f8be3723bef97e06d687819025d57d..77abd1a756ad7b045947bd0f50438cd1991c198b 100644 (file)
     java-version: 'openjdk11'
     mvn-settings: 'daexim-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: daexim-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: daexim
+    project-name: daexim
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: daexim-view
index 2edafdf1bd99f4ae9cb456e6b9dd88de2d1a2d74..0f8758bee8675cee3c788d554b8913e343a6cc5d 100644 (file)
@@ -61,6 +61,7 @@
     tenant-network-type: 'vxlan'
     odl-sfc-driver: 'odl'
     odl-snat-mode: 'controller'
+    group-add-mod-enabled: 'false'
     enable-itm-direct-tunnels: 'false'
     openstack_legacy_default_network_services: 'q-dhcp,q-meta,q-svc'
     os-cmb-cnt: 1
@@ -86,9 +87,9 @@
     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
+    openstack_stein_system_image: ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200801-010144.168
+    openstack_rocky_system_image: ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20200801-000156.903
+    openstack_queens_system_image: ZZCI - CentOS 7 - devstack-queens - x86_64 - 20200801-190141.781
 
     # Default Robot framework options
     robot-options: ''
 
     # Manual CSIT job lists used by sanity or periodic in nature.
     csit-mri-list-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,
         yangtools-csit-1node-system-only-aluminium
     csit-mri-list-magnesium: >
         yangtools-csit-1node-system-only-magnesium
index 2cade96987dff6751797dc3f957e6d5c074d0bde..68d68e788610d1128047ace3690d9e50f2beb602 100644 (file)
     branch: 'master'
     mvn-settings: 'detnet-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: detnet-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: detnet
+    project-name: detnet
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: detnet-view
index cbe8003708b735c75b6f156c7e89cd4fd5f67b14..c05f468072f5e00ba1ce77cfaa66a388403022cc 100644 (file)
     branch: 'master'
     mvn-settings: 'dlux-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: dlux-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dlux
+    project-name: dlux
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: dlux-view
index 3f93d2cdf4432d05f6037bc9835f0323bf10ce86..5fe9eee1907b7ae0c9d4b3f3a7567006fb35b5ac 100644 (file)
     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-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dluxapps
+    project-name: dluxapps
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: dluxapps-view
index 857850373d2e274542b6ca30a4f3b8ab2021d77a..fd9faf1b080f3f83146987edb0cd76096e98402c 100644 (file)
     rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight/32322/
     rtd-token: 86e54dd38c651e2164ea63c183ae601d19cd1f3c
 
+- project:
+    name: docs-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: docs
+    project-name: docs
+    branch: master
+    build-node: centos7-builder-2c-1g
+
 - project:
     name: docs-view
     views:
index 55cb3062485386cab632b7cb71fe83a5b3adcfa3..0a5084ddd2b37098b4cecc8c1f277afa45d33083 100644 (file)
     java-version: 'openjdk11'
     mvn-settings: 'genius-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: genius-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: genius
+    project-name: genius
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: genius-view
index d44e686f977b12ffe714bda904be914a32d61c87..c33f97ebf96a27260c6f851c8155e8ac4821b0c7 100644 (file)
     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-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: groupbasedpolicy
+    project-name: groupbasedpolicy
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: groupbasedpolicy-view
index 28d3a59128f2a7b9004f506aec4c4c82866f8fac..2db27664efa1707454affc24aadc93940c901874 100644 (file)
     branch: 'master'
     mvn-settings: 'honeycomb-vbd-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: vbd-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: honeycomb/vbd
+    project-name: vbd
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: vbd-view
index 6c1079c3972160be57ffb869f9b1748f8d41f496..4ebffb44781afad67fbf1c6f44ef8da52b54c54f 100644 (file)
@@ -1,9 +1,9 @@
 ---
 - project:
-    name: infrautils-aluminium
+    name: infrautils-master
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
+      - '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
@@ -13,7 +13,7 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: master
     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'master'
     java-version: 'openjdk11'
     mvn-settings: 'infrautils-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: infrautils-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: infrautils
+    project-name: infrautils
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: infrautils-view
index 01409f2c5246cb8421fe196b25755395e02ebad5..f16a93a0ea52f4deb90cbb5c73434de55386a045 100644 (file)
@@ -495,6 +495,7 @@ CREATE_INITIAL_NETWORKS: ${CREATE_INITIAL_NETWORKS}
 LBAAS_SERVICE_PROVIDER: ${LBAAS_SERVICE_PROVIDER}
 ODL_SFC_DRIVER: ${ODL_SFC_DRIVER}
 ODL_SNAT_MODE: ${ODL_SNAT_MODE}
+GROUP_ADD_MOD_ENABLED: ${GROUP_ADD_MOD_ENABLED}
 
 EOF
 }
@@ -670,7 +671,7 @@ EOF
         echo "collect_logs: for opendaylight controller ip: ${!CONTROLLERIP}"
         NODE_FOLDER="odl_${i}"
         mkdir -p "${NODE_FOLDER}"
-        echo "Lets's take the karaf thread dump again..."
+        echo "Let's take the karaf thread dump again..."
         ssh "${!CONTROLLERIP}" "sudo ps aux" > "${WORKSPACE}"/ps_after.log
         pid=$(grep org.apache.karaf.main.Main "${WORKSPACE}"/ps_after.log | grep -v grep | tr -s ' ' | cut -f2 -d' ')
         echo "karaf main: org.apache.karaf.main.Main, pid:${pid}"
@@ -1086,7 +1087,7 @@ function copy_and_run_post_startup_script() {
 function dump_controller_threads() {
     for i in $(seq 1 "${NUM_ODL_SYSTEM}"); do
         CONTROLLERIP="ODL_SYSTEM_${i}_IP"
-        echo "Lets's take the karaf thread dump"
+        echo "Let's take the karaf thread dump"
         ssh "${!CONTROLLERIP}" "sudo ps aux" > "${WORKSPACE}"/ps_before.log
         pid=$(grep org.apache.karaf.main.Main "${WORKSPACE}"/ps_before.log | grep -v grep | tr -s ' ' | cut -f2 -d' ')
         echo "karaf main: org.apache.karaf.main.Main, pid:${pid}"
index 6c70d5d79ee62c04b674e544a04db9986ed267c6..840795b5e83fee0d8dd2751984e550280bb6d5c1 100644 (file)
@@ -3,16 +3,6 @@ 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,
@@ -21,7 +11,6 @@ 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,
@@ -31,36 +20,35 @@ 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-upgrade-aluminium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upgrade-snat-conntrack-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-0cmb-1ctl-2cmp-openstack-stein-dcgw-aluminium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upgrade-aluminium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upgrade-snat-conntrack-aluminium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-aluminium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-aluminium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-snat-conntrack-aluminium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-dcgw-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,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-dcgw-aluminium,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-aluminium,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-aluminium,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-snat-conntrack-aluminium,
+netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-aluminium,
+netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-aluminium,
+netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-aluminium,
+netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-stein-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,
index a16bb28f2d854a37e6455e83d3191bef1de9c4d5..b54dab6a1afb5b5cca9eb9e31c59ddbf78c0204d 100644 (file)
@@ -3,8 +3,6 @@ bgpcep-csit-1node-bgp-ingest-all-magnesium,
 bgpcep-csit-1node-bgp-ingest-mixed-all-magnesium,
 bgpcep-csit-1node-throughpcep-all-magnesium,
 bgpcep-csit-1node-userfeatures-all-magnesium,
-bgpcep-csit-3node-bgpclustering-all-magnesium,
-bgpcep-csit-3node-bgpclustering-ha-only-magnesium,
 controller-csit-1node-akka1-all-magnesium,
 controller-csit-1node-benchmark-all-magnesium,
 controller-csit-1node-rest-cars-perf-all-magnesium,
@@ -21,7 +19,6 @@ 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,
 netconf-csit-1node-callhome-only-magnesium,
 netconf-csit-1node-scale-max-devices-only-magnesium,
@@ -31,36 +28,37 @@ 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-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,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-magnesium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-magnesium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-magnesium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upgrade-magnesium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upgrade-snat-conntrack-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-0cmb-1ctl-2cmp-openstack-stein-dcgw-magnesium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upgrade-magnesium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upgrade-snat-conntrack-magnesium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-magnesium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-magnesium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-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,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-magnesium,
 netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-magnesium,
 netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-magnesium,
 netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-magnesium,
 netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-magnesium,
-netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-magnesium,
-netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-magnesium,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-dcgw-magnesium,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-magnesium,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-magnesium,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-snat-conntrack-magnesium,
+netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-magnesium,
+netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-magnesium,
+netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-magnesium,
+netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-magnesium,
 odltools-csit-1node-upstream-all-magnesium,
-openflowplugin-csit-1node-bundle-based-reconciliation-all-magnesium,
 openflowplugin-csit-1node-cbench-only-magnesium,
 openflowplugin-csit-1node-flow-services-all-magnesium,
 openflowplugin-csit-1node-perf-bulkomatic-only-magnesium,
index 902f7143065cbfa5a53cb22add85ae350617fb1d..7b44c748b92fab974864d6f19c56f9ee34917682 100644 (file)
@@ -3,8 +3,6 @@ bgpcep-csit-1node-bgp-ingest-all-sodium,
 bgpcep-csit-1node-bgp-ingest-mixed-all-sodium,
 bgpcep-csit-1node-throughpcep-all-sodium,
 bgpcep-csit-1node-userfeatures-all-sodium,
-bgpcep-csit-3node-bgpclustering-all-sodium,
-bgpcep-csit-3node-bgpclustering-ha-only-sodium,
 controller-csit-1node-akka1-all-sodium,
 controller-csit-1node-benchmark-all-sodium,
 controller-csit-1node-rest-cars-perf-all-sodium,
@@ -20,7 +18,6 @@ distribution-csit-managed-sodium,
 genius-csit-1node-upstream-only-sodium,
 genius-csit-3node-upstream-only-sodium,
 lispflowmapping-csit-1node-msmr-all-sodium,
-lispflowmapping-csit-1node-performance-only-sodium,
 lispflowmapping-csit-3node-msmr-all-sodium,
 netconf-csit-1node-callhome-only-sodium,
 netconf-csit-1node-scale-max-devices-only-sodium,
@@ -31,12 +28,12 @@ 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-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,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-sodium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-sodium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-sodium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upgrade-snat-conntrack-sodium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upgrade-sodium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-sodium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-sodium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-sodium,
@@ -45,9 +42,6 @@ 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,
@@ -56,10 +50,9 @@ netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-sodium,
 netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-sodium,
 netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-sodium,
 netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-sodium,
-netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-sodium,
-netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-sodium,
+netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-sodium,
+netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-sodium,
 odltools-csit-1node-upstream-all-sodium,
-openflowplugin-csit-1node-bundle-based-reconciliation-all-sodium,
 openflowplugin-csit-1node-cbench-only-sodium,
 openflowplugin-csit-1node-flow-services-all-sodium,
 openflowplugin-csit-1node-perf-bulkomatic-only-sodium,
index ed0ef380cc1ae38baeea7f50afba36f49f201068..36dd6ba9bf6374aed929e787b5d19133340397db 100644 (file)
     stream:
       - aluminium:
           branch: 'master'
+          java-version: openjdk11
           jre: 'openjdk11'
           karaf-version: odl
       - magnesium:
           branch: 'stable/magnesium'
+          java-version: openjdk11
           jre: 'openjdk11'
           karaf-version: odl
       - sodium:
           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},
     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 49c7aa6d85bced1c158ae6c2fc52dad31e2983b6..6ce6d5c01c2b0a5ea87839910b0fc457ab0ad65f 100644 (file)
@@ -126,7 +126,7 @@ for suite in ${SUITES}; do
     # prepend an incremental counter to the suite name so that the full robot log combining all the suites as is done
     # in the rebot step below will list all the suites in chronological order as rebot seems to alphabetize them
     ((suite_num = suite_num + 1))
-    suite_index="$(printf %02d ${suite_num})"
+    suite_index="$(printf %02d "${suite_num}")"
     suite_name="$(basename "${suite}" | cut -d. -f1)"
     log_name="${suite_index}_${suite_name}"
     robot -N "${log_name}" \
index e04cfd7bddb100c014704f8941e6d691c5271942..baae769d8d977cc143397103db6951a0e68b5945 100755 (executable)
@@ -95,7 +95,7 @@ ssh "${ODL_SYSTEM_IP}" "du -hs /tmp/${BUNDLEFOLDER}/data/log/*"
 for i in $(seq 1 "${NUM_ODL_SYSTEM}")
 do
     CONTROLLERIP="ODL_SYSTEM_${i}_IP"
-    echo "Lets's take the karaf thread dump again..."
+    echo "Let's take the karaf thread dump again..."
     ssh "${!CONTROLLERIP}" "sudo ps aux" > "${WORKSPACE}"/ps_after.log
     pid=$(grep org.apache.karaf.main.Main "${WORKSPACE}/ps_after.log" | grep -v grep | tr -s ' ' | cut -f2 -d' ')
     echo "karaf main: org.apache.karaf.main.Main, pid:${pid}"
index 81afad6b154f82c15f8c9bf7606917fa1646b2e4..464072b7f946520831c4c2c7efd364181a1950db 100644 (file)
@@ -97,6 +97,10 @@ function install_openstack_clients_in_robot_vm() {
        wget "https://raw.githubusercontent.com/openstack/requirements/stable/${openstack_version}/upper-constraints.txt" -O /tmp/constraints.txt 2>/dev/null
        #python openstackclient version in rocky contradicts with version in global-jjb and stops openstackclient installation in rocky. Will be removed based on version change in global-jjb.
        sed -i s/python-openstackclient===3.16.2/python-openstackclient===3.14.0/ /tmp/constraints.txt
+       #Python uwsgi 2.0.19 is having errors, forcing it to pick 2.0.18
+       sed -i '1 auwsgi===2.0.18' /tmp/constraints.txt
+       #Python3 paramiko 2.7.1 has requirement cryptography>=2.5, Updating it to the latest
+       sed -i s/cryptography===2.3/cryptography===2.9.2/ /tmp/constraints.txt
        echo "$PYTHON -m pip install --upgrade --no-deps ${package} --no-cache-dir -c /tmp/constraints.txt"
        $PYTHON -m pip install --upgrade --no-deps "${package}" --no-cache-dir -c /tmp/constraints.txt
        echo "$PYTHON -m pip install ${package} --no-cache-dir -c /tmp/constraints.txt"
@@ -104,6 +108,8 @@ function install_openstack_clients_in_robot_vm() {
     done
 
     if [ "${ENABLE_NETWORKING_L2GW}" == "yes" ]; then
+        #alembic 1.4.2 is having issues. Updating the package with 1.4.0
+        $PYTHON -m pip install alembic===1.4.0
         #networking-l2gw is not officially available in any release yet. Getting the latest stable version.
         $PYTHON -m pip install networking-l2gw==11.0.0 more-itertools==5.0.0
     fi
@@ -145,11 +151,14 @@ EOF
     ssh "${control_ip}" "bash /tmp/setup_live_migration_control.sh"
 }
 
+#Fix for broken requirements versions while bringing up the stack.
 #Fix Problem caused due to new libvirt version in CentOS repo.
 #The libvirt-python 3.10 does not support all the new API exposed
 #This fix will force devstack to use latest libvirt-python
 #from pypi.org (latest version as of 06-Dec-2018)
-function fix_libvirt_python_build() {
+#Python uwsgi 2.0.19 is having errors, forcing it to pick 2.0.18
+#more info: https://lists.opendaylight.org/g/app-dev/topic/netvirt_jobs_are_failing_with/74897077
+function fix_broken_requirements_versions() {
     local ip=$1
     ${SSH} "${ip}" "
         cd /opt/stack;
@@ -157,6 +166,7 @@ function fix_libvirt_python_build() {
         cd requirements;
         git checkout ${ODL_ML2_BRANCH};
         sed -i s/libvirt-python===3.10.0/libvirt-python===4.10.0/ upper-constraints.txt
+        sed -i '1 auwsgi===2.0.18' upper-constraints.txt
         "
 }
 
@@ -856,7 +866,7 @@ for i in $(seq 1 "${NUM_OPENSTACK_CONTROL_NODES}"); do
         # but in the meantime do it ourselves
         ssh "${!CONTROLIP}" "sudo ovs-vsctl set Open_vSwitch . external_ids:of-tunnel=true"
     fi
-    fix_libvirt_python_build "${!CONTROLIP}"
+    fix_broken_requirements_versions "${!CONTROLIP}"
     echo "Stack the control node ${i} of ${NUM_OPENSTACK_CONTROL_NODES}: ${CONTROLIP}"
     # Workaround: fixing boneheaded polkit issue, to be removed later
     ssh "${!CONTROLIP}" "sudo bash -c 'echo deltarpm=0 >> /etc/yum.conf && yum -y update polkit'"
@@ -915,7 +925,7 @@ for i in $(seq 1 "${NUM_OPENSTACK_COMPUTE_NODES}"); do
         # but in the meantime do it ourselves
         ssh "${!COMPUTEIP}" "sudo ovs-vsctl set Open_vSwitch . external_ids:of-tunnel=true"
     fi
-    fix_libvirt_python_build "${!COMPUTEIP}"
+    fix_broken_requirements_versions "${!COMPUTEIP}"
     echo "Stack the compute node ${i} of ${NUM_OPENSTACK_COMPUTE_NODES}: ${!COMPUTEIP}"
     ssh "${!COMPUTEIP}" "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &"
     ssh "${!COMPUTEIP}" "ps -ef | grep stack.sh"
@@ -1178,6 +1188,7 @@ for suite in ${SUITES}; do
     -v NUM_OS_SYSTEM:"${NUM_OPENSTACK_SYSTEM}" \
     -v NUM_TOOLS_SYSTEM:"${NUM_TOOLS_SYSTEM}" \
     -v ODL_SNAT_MODE:"${ODL_SNAT_MODE}" \
+    -v GROUP_ADD_MOD_ENABLED:"${GROUP_ADD_MOD_ENABLED}" \
     -v ODL_STREAM:"${DISTROSTREAM}" \
     -v ODL_SYSTEM_IP:"${ODL_SYSTEM_IP}" \
     -v ODL_SYSTEM_1_IP:"${ODL_SYSTEM_1_IP}" \
index de6fb254aa303cac234751c1c43db4d3528c6b23..e91454dcb03a361859b4d8e418e13ef7b2522a13 100644 (file)
@@ -8,6 +8,7 @@
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
+# vim: sw=4 ts=4 sts=4 et ft=sh :
 
 ROBOT_VENV="/tmp/v/robot"
 echo ROBOT_VENV="${ROBOT_VENV}" >> "${WORKSPACE}/env.properties"
@@ -15,54 +16,52 @@ echo ROBOT_VENV="${ROBOT_VENV}" >> "${WORKSPACE}/env.properties"
 # The --system-site-packages parameter allows us to pick up system level
 # installed packages. This allows us to bake matplotlib which takes very long
 # to install into the image.
-virtualenv --system-site-packages "${ROBOT_VENV}"
+virtualenv -p python3 --system-site-packages "${ROBOT_VENV}"
 # shellcheck disable=SC1090
 source "${ROBOT_VENV}/bin/activate"
 
 set -exu
 
 # Make sure pip itself us up-to-date.
-pip install --upgrade pip
-python3 -m pip install --user --upgrade pip
+python -m pip install --upgrade pip
 
-pip install --upgrade docker-py importlib requests scapy netifaces netaddr ipaddr pyhocon
-pip install --upgrade robotframework-httplibrary \
-    requests==2.15.1 \
-    robotframework-requests \
-    robotframework-sshlibrary==3.1.1 \
-    robotframework-selenium2library \
-    robotframework-pycurllibrary
+echo "Installing Python Requirements"
+cat << 'EOF' > "requirements.txt"
+docker-py
+importlib
+ipaddr
+netaddr
+netifaces
+pyhocon
+requests
+robotframework-httplibrary
+robotframework-requests
+robotframework-selenium2library
+robotframework-sshlibrary==3.1.1
+scapy
 
 # Module jsonpath is needed by current AAA idmlite suite.
-pip install --upgrade jsonpath-rw
+jsonpath-rw
 
 # Modules for longevity framework robot library
-pip install --upgrade elasticsearch==1.7.0 elasticsearch-dsl==0.0.11
+elasticsearch
+elasticsearch-dsl
 
 # Module for pyangbind used by lispflowmapping project
-pip install --upgrade pyangbind
+pyangbind
 
 # Module for iso8601 datetime format
-pip install --upgrade isodate
+isodate
 
 # Module for TemplatedRequests.robot library
-pip install --upgrade jmespath
+jmespath
 
 # Module for backup-restore support library
-pip install --upgrade jsonpatch
-
-#Module for elasticsearch python client
-#Module for elasticsearch python client
-python3 -m pip install --user urllib3==1.22
-python3 -m pip install --user requests==2.9.1
-python3 -m pip install --user elasticsearch==6.2.0
-python3 -m pip install --user PyYAML==3.11
+jsonpatch
 
 # odltools for extra debugging
-pip install odltools
+odltools
+EOF
+python -m pip install -r requirements.txt
 odltools -V
-
-# Print installed versions.
 pip freeze
-
-# vim: sw=4 ts=4 sts=4 et ft=sh :
index 368e151bfed5e74d3b4cf9f34d401d029ed8504e..f9849976dcd4adae41b458fe36f28bd1ddf71e62 100644 (file)
@@ -90,7 +90,7 @@ set +e  # We do not want to create red dot just because something went wrong whi
 for i in $(seq 1 "${NUM_ODL_SYSTEM}")
 do
     CONTROLLERIP="ODL_SYSTEM_${i}_IP"
-    echo "Lets's take the karaf thread dump again"
+    echo "Let's take the karaf thread dump again"
     ssh "${!CONTROLLERIP}" "sudo ps aux" > "${WORKSPACE}/ps_after.log"
     pid=$(grep org.apache.karaf.main.Main "${WORKSPACE}/ps_after.log" | grep -v grep | tr -s ' ' | cut -f2 -d' ')
     echo "karaf main: org.apache.karaf.main.Main, pid:${pid}"
index e077c34aecd47d8b07865a08b4b4b5af2345a970..e6f512f75f4ff415a5baebb65183ead866b9bf61 100644 (file)
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474'
     controller-max-mem: '2048m'
     tools_system_count: '1'
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229'
 
     #####################
     # Job configuration #
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474'
     controller-max-mem: '2048m'
     tools_system_count: '1'
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229'
 
 
     #####################
           repo-url: '{repo-url}'
           robot-options: '{robot-options}'
           # Controller
-          controller-scope: '{scope}'
+          controller-scope: '{install}'
           controller-max-mem: '{controller-max-mem}'
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           repo-url: '{repo-url}'
           robot-options: '{robot-options}'
           # Controller
-          controller-scope: '{scope}'
+          controller-scope: '{install}'
           controller-max-mem: '{controller-max-mem}'
           debug-map: '{debug-map}'
           install-features: '{install-features}'
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474'
     controller-max-mem: '2048m'
     tools_system_count: '1'
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229'
 
     #####################
     # Job Configuration #
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474'
     controller-max-mem: '2048m'
     tools_system_count: '1'
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229'
 
     #####################
     # Job configuration #
           repo-url: '{repo-url}'
           robot-options: '{robot-options}'
           # Controller
-          controller-scope: '{scope}'
+          controller-scope: '{install}'
           controller-max-mem: '{controller-max-mem}'
           debug-map: '{debug-map}'
           install-features: 'odl-jolokia,{install-features}'
           repo-url: '{repo-url}'
           robot-options: '{robot-options}'
           # Controller
-          controller-scope: '{scope}'
+          controller-scope: '{install}'
           controller-max-mem: '{controller-max-mem}'
           debug-map: '{debug-map}'
           install-features: 'odl-jolokia,{install-features}'
 
     odl_system_count: 1
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474'
     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'
+    docker_system_image: 'ZZCI - CentOS 7 - docker - x86_64 - 20200801-220136.401'
 
     #####################
     # Job Configuration #
           repo-url: '{repo-url}'
           robot-options: '{robot-options}'
           # Controller
-          controller-scope: '{scope}'
+          controller-scope: '{install}'
           controller-max-mem: '{controller-max-mem}'
           debug-map: '{debug-map}'
           install-features: 'odl-jolokia,{install-features}'
 
     odl_system_count: 1
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474'
     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_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20200801-230142.896'
     openstack_system2_count: 0
     openstack_system2_flavor: 'odl-standard-1'
-    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
+    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20200801-230142.896'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229'
 
     #####################
     # Job configuration #
       - string:
           name: ODL_ML2_PORT_BINDING
           default: '{odl-ml2-port-binding}'
-          description: 'Method of networking-odl port-binding (pseudo-agentdb-binding or legacy-port-binding or
-          network-topology)'
+          description: >
+            Method of networking-odl port-binding (pseudo-agentdb-binding or
+            legacy-port-binding or network-topology)
       - string:
           name: DEVSTACK_KUBERNETES_PLUGIN_REPO
           default: '{devstack-kubernetes-plugin-repo}'
       - string:
           name: LBAAS_SERVICE_PROVIDER
           default: '{lbaas-service-provider}'
-          description: 'The NEUTRON_LBAAS_SERVICE_PROVIDERV2 value to be used in local.conf - only relevant when using
-          neutron-lbaas'
+          description: >
+            The NEUTRON_LBAAS_SERVICE_PROVIDERV2 value to be used in
+            local.conf - only relevant when using neutron-lbaas
       - string:
           name: ODL_SFC_DRIVER
           default: '{odl-sfc-driver}'
           name: ODL_SNAT_MODE
           default: '{odl-snat-mode}'
           description: 'The SNAT mode to be configured - options are conntrack/controller.'
+      - string:
+          name: GROUP_ADD_MOD_ENABLED
+          default: '{group-add-mod-enabled}'
+          description: 'The Group add mod enabled mode to be configured - options are true/false.'
       - string:
           name: OVS_INSTALL
           default: '{ovs-install}'
-          description: 'Install a custom OVS. It can be an OVS version to build (like v2.9.2 or v2.6.1-nsh) or a yum
-          repo url to pull from.'
+          description: >
+            Install a custom OVS. It can be an OVS version to build
+            (like v2.9.2 or v2.6.1-nsh) or a yum repo url to pull from.
 
     scm:
       - integration-gerrit-scm:
           name: ODL_SNAT_MODE
           default: '{odl-snat-mode}'
           description: 'The SNAT mode to be configured - options are conntrack/controller.'
+      - string:
+          name: GROUP_ADD_MOD_ENABLED
+          default: '{group-add-mod-enabled}'
+          description: 'The Group add mod enabled mode to be configured - options are true/false.'
       - string:
           name: OVS_INSTALL
           default: '{ovs-install}'
 
     odl_system_count: 1
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474'
     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_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20200801-230142.896'
     openstack_system2_count: 0
     openstack_system2_flavor: 'odl-standard-1'
-    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
+    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20200801-230142.896'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229'
 
     #####################
     # Job configuration #
           name: ODL_SNAT_MODE
           default: '{odl-snat-mode}'
           description: 'The SNAT mode to be configured - options are conntrack/controller.'
+      - string:
+          name: GROUP_ADD_MOD_ENABLED
+          default: '{group-add-mod-enabled}'
+          description: 'The Group add mod enabled mode to be configured - options are true/false.'
       - string:
           name: OVS_INSTALL
           default: '{ovs-install}'
           name: ODL_SNAT_MODE
           default: '{odl-snat-mode}'
           description: 'The SNAT mode to be configured - options are conntrack/controller.'
+      - string:
+          name: GROUP_ADD_MOD_ENABLED
+          default: '{group-add-mod-enabled}'
+          description: 'The Group add mod enabled mode to be configured - options are true/false.'
       - string:
           name: OVS_INSTALL
           default: '{ovs-install}'
           name: ODL_SNAT_MODE
           default: '{odl-snat-mode}'
           description: 'The SNAT mode to be configured - options are conntrack/controller.'
+      - string:
+          name: GROUP_ADD_MOD_ENABLED
+          default: '{group-add-mod-enabled}'
+          description: 'The Group add mod enabled mode to be configured - options are true/false.'
 
     scm:
       - integration-gerrit-scm:
           name: ODL_SNAT_MODE
           default: '{odl-snat-mode}'
           description: 'The SNAT mode to be configured - options are conntrack/controller.'
+      - string:
+          name: GROUP_ADD_MOD_ENABLED
+          default: '{group-add-mod-enabled}'
+          description: 'The Group add mod enabled mode to be configured - options are true/false.'
index 037f11cd83b363e4781279f882885105779e722f..d5fca6febd5b0be7de424c0e0c9f45a4feaa0fab 100644 (file)
@@ -15,6 +15,7 @@
       - gerrit-tox-verify:
           branch: master
           stream: master
+          build-node: centos7-builder-2c-2g
 
     # CSIT Lists in defaults.yaml
     stream:
@@ -24,7 +25,7 @@
           java-version: 'openjdk11'
           csit-list: !include: csit-jobs-aluminium.lst
           build-order: >
-              odlparent yangtools mdsal infrautils controller serviceutils aaa netconf
+              odlparent yangtools mdsal controller infrautils serviceutils aaa netconf
               daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt
               bgpcep integration/distribution
 
     stream:
       - aluminium:
           branch: 'master'
-          csit-blacklist: >
-              alto bier coe detnet dluxapps groupbasedpolicy l2switch mdsal nemo
-              p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
+          csit-blocklist: >
+              alto bier coe controller detnet dluxapps groupbasedpolicy l2switch mdsal
+              nemo p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
               gate longevity sanity tdd tempest wip
+              bgpcep-csit-3node-bgpclustering-all
+              bgpcep-csit-3node-bgpclustering-ha-only
               netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
               netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
               netvirt-csit-3node-1cmb
+              openflowplugin-csit-1node-bundle-based-reconciliation
               last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used
           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: >
+          csit-blocklist: >
               alto bier coe detnet dluxapps groupbasedpolicy l2switch mdsal nemo
               p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
               gate longevity sanity tdd tempest wip
+              bgpcep-csit-3node-bgpclustering-all
+              bgpcep-csit-3node-bgpclustering-ha-only
               netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
               netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
               netvirt-csit-3node-1cmb
+              openflowplugin-csit-1node-bundle-based-reconciliation
               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-mri-list: '{csit-mri-list-magnesium}'
           csit-weekly-list: '{csit-weekly-list-magnesium}'
       - sodium:
           branch: 'stable/sodium'
-          csit-blacklist: >
+          csit-blocklist: >
               alto bier dluxapps groupbasedpolicy jsonrpc l2switch mdsal nemo
               p4plugin packetcable sxp telemetry tsdr unimgr usc yangtools
               gate longevity sanity tdd tempest wip
+              bgpcep-csit-3node-bgpclustering-all
+              bgpcep-csit-3node-bgpclustering-ha-only
               netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
               netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
               netvirt-csit-3node-1cmb
+              openflowplugin-csit-1node-bundle-based-reconciliation
               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-mri-list: '{csit-mri-list-sodium}'
           branch: master  # Hardcode as releng/builder only has master
           lftools-version: '{lftools-version}'
       - string:
-          name: CSIT_BLACKLIST
-          default: '{csit-blacklist}'
-          description: Space separated list of jobs strings to blacklist.
+          name: CSIT_BLOCKLIST
+          default: '{csit-blocklist}'
+          description: Space separated list of jobs strings to blocklist.
 
     scm:
       - lf-infra-gerrit-scm:
     publishers:
       - lf-infra-publish
 
+- project:
+    name: integration-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: integration
+    project-name: integration
+    branch: master
+    build-node: centos7-builder-2c-1g
+
 - project:
     name: integration-view
     views:
index a0399a09cff01fd20390d81b26f144497995922e..a054e1fa042923cf6c92f0ab502fb09f6798b0ea 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -ex
 
 # create a fresh empty place to build this custom distribution
 BUILD_DIR=${WORKSPACE}/patch_tester
@@ -18,16 +18,19 @@ mkdir -p "$BUILD_DIR"
 cd "$BUILD_DIR"
 
 # Download distribution pom.xml
-wget "http://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=blob_plain;f=artifacts/upstream/properties/pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml"
+wget "https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=blob_plain;f=artifacts/upstream/properties/pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml"
 cat pom.xml
 
 # Set up git committer name and email, needed for commit creation when cherry-picking.
-export EMAIL="sandbox@jenkins.opendaylight.org"
+export EMAIL="jenkins-$SILO@opendaylight.org"
 export GIT_COMMITTER_NAME="Multipatch Job"
 
 # Extract a list of patches per project from an comment trigger. An example is:
 # multipatch-build:openflowplugin:45/69445/1,genius:46/69446/1,netvirt:47/69447/1
 if [ -n "$GERRIT_EVENT_COMMENT_TEXT" ]; then
+    # Decode Base64 before parsing text.
+    GERRIT_EVENT_COMMENT_TEXT=$(echo "$GERRIT_EVENT_COMMENT_TEXT" | base64 -d)
+
     if [[ "$GERRIT_EVENT_COMMENT_TEXT" == *fast* ]]; then
         BUILD_FAST="true"
         PATCHES_TO_BUILD=$(echo "$GERRIT_EVENT_COMMENT_TEXT" | grep 'multipatch-build-fast:')
@@ -145,29 +148,36 @@ do
         git checkout FETCH_HEAD
         # If the patch is for MRI project, adjust the MRI versions
         # shellcheck disable=SC2235
-        if [ "${PROJECT}" == "odlparent" ] || [ "${PROJECT}" == "yangtools" ] || ([ "${PROJECT}" == "mdsal" ] && [ "${DISTROSTREAM}" != "fluorine" ]); then
+        if [ "${PROJECT}" == "odlparent" ] || [ "${PROJECT}" == "yangtools" ] || [ "${PROJECT}" == "mdsal" ] || ([ "${PROJECT}" == "controller" ] && [ "${DISTROSTREAM}" != "magnesium" ] && [ "${DISTROSTREAM}" != "sodium" ]); then
             ODLPARENT_VERSION="$(xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -v //x:odlparent.version ../pom.xml)"
             echo "change odlparent version to ${ODLPARENT_VERSION}"
             find . -name "pom.xml" -print0 | xargs -0 xmlstarlet ed --inplace -P -N x=http://maven.apache.org/POM/4.0.0 -u //x:version\[../x:parent/x:groupId=\"org.opendaylight.odlparent\"\] -v "${ODLPARENT_VERSION}"
             find . -name "pom.xml" -print0 | xargs -0 xmlstarlet ed --inplace -P -N x=http://maven.apache.org/POM/4.0.0 -u //x:version\[../x:groupId=\"org.opendaylight.odlparent\"\] -v "${ODLPARENT_VERSION}"
         fi
         # shellcheck disable=SC2235
-        if [ "${PROJECT}" == "yangtools" ] || ([ "${PROJECT}" == "mdsal" ] && [ "${DISTROSTREAM}" != "fluorine" ]); then
+        if [ "${PROJECT}" == "yangtools" ] || [ "${PROJECT}" == "mdsal" ] || ([ "${PROJECT}" == "controller" ] && [ "${DISTROSTREAM}" != "magnesium" ] && [ "${DISTROSTREAM}" != "sodium" ]); then
             YANGTOOLS_VERSION="$(xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -v //x:yangtools.version ../pom.xml)"
             echo "change yangtools version to ${YANGTOOLS_VERSION}"
             find . -name "pom.xml" -print0 | xargs -0 xmlstarlet ed --inplace -P -N x=http://maven.apache.org/POM/4.0.0 -u //x:version\[../x:parent/x:groupId=\"org.opendaylight.yangtools\"\] -v "${YANGTOOLS_VERSION}"
             find . -name "pom.xml" -print0 | xargs -0 xmlstarlet ed --inplace -P -N x=http://maven.apache.org/POM/4.0.0 -u //x:version\[../x:groupId=\"org.opendaylight.yangtools\"\] -v "${YANGTOOLS_VERSION}"
         fi
-        if [ "${PROJECT}" == "mdsal" ] && [ "${DISTROSTREAM}" != "fluorine" ]; then
+       # shellcheck disable=SC2235
+        if [ "${PROJECT}" == "mdsal" ] || ([ "${PROJECT}" == "controller" ] && [ "${DISTROSTREAM}" != "magnesium" ] && [ "${DISTROSTREAM}" != "sodium" ]); then
             MDSAL_VERSION="$(xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -v //x:mdsal.version ../pom.xml)"
             echo "change mdsal version to ${MDSAL_VERSION}"
             find . -name "pom.xml" -print0 | xargs -0 xmlstarlet ed --inplace -P -N x=http://maven.apache.org/POM/4.0.0 -u //x:version\[../x:parent/x:groupId=\"org.opendaylight.mdsal\"\] -v "${MDSAL_VERSION}"
             find . -name "pom.xml" -print0 | xargs -0 xmlstarlet ed --inplace -P -N x=http://maven.apache.org/POM/4.0.0 -u //x:version\[../x:groupId=\"org.opendaylight.mdsal\"\] -v "${MDSAL_VERSION}"
         fi
+        if [ "${PROJECT}" == "controller" ] && [ "${DISTROSTREAM}" != "magnesium" ] && [ "${DISTROSTREAM}" != "sodium" ]; then
+            CONTROLLER_VERSION="$(xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -v //x:controller.version ../pom.xml)"
+            echo "change controller version to ${CONTROLLER_VERSION}"
+            find . -name "pom.xml" -print0 | xargs -0 xmlstarlet ed --inplace -P -N x=http://maven.apache.org/POM/4.0.0 -u //x:version\[../x:parent/x:groupId=\"org.opendaylight.controller\"\] -v "${CONTROLLER_VERSION}"
+            find . -name "pom.xml" -print0 | xargs -0 xmlstarlet ed --inplace -P -N x=http://maven.apache.org/POM/4.0.0 -u //x:version\[../x:groupId=\"org.opendaylight.controller\"\] -v "${CONTROLLER_VERSION}"
+        fi
     else
         # If project with no patch is MRI, download release tag:
         # shellcheck disable=SC2235
-        if [ "${PROJECT}" == "odlparent" ] || [ "${PROJECT}" == "yangtools" ] || ([ "${PROJECT}" == "mdsal" ] && [ "${DISTROSTREAM}" != "fluorine" ]); then
+        if [ "${PROJECT}" == "odlparent" ] || [ "${PROJECT}" == "yangtools" ] || [ "${PROJECT}" == "mdsal" ] || ([ "${PROJECT}" == "controller" ] && [ "${DISTROSTREAM}" != "magnesium" ] && [ "${DISTROSTREAM}" != "sodium" ]); then
             # shellcheck disable=SC2086
             PROJECT_VERSION="$(xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -v //x:${PROJECT_SHORTNAME}.version ../pom.xml)"
             echo "2. checking out tag v${PROJECT_VERSION}"
index 92bfe1e45c077b41c026ce807cb65e5dfac4b4a6..8d2c46a6d399bb7279a179117c18ab349f965eb9 100644 (file)
@@ -22,8 +22,8 @@ jobs=($(xmlstarlet sel -t -m '//hudson/job' \
 job_list="${WORKSPACE}/jjb/integration/csit-jobs-${STREAM}.lst"
 rm "$job_list"
 for job in "${jobs[@]}"; do
-    echo "Checking if $job is blacklisted."
-    if [[ ! $job =~ update-csit-tests|${CSIT_BLACKLIST// /\|} ]]; then
+    echo "Checking if $job is blocklisted."
+    if [[ ! $job =~ update-csit-tests|${CSIT_BLOCKLIST// /\|} ]]; then
         echo "${job}," >> "$job_list"
         echo "    Added $job to job list."
     fi
index 354db8a4bde0745a0c49c539ef5bc76c13801fa6..6bdd54d834f279b5f1641dc7568c8813fd3c36a3 100644 (file)
     branch: 'master'
     mvn-settings: 'jsonrpc-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: jsonrpc-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: jsonrpc
+    project-name: jsonrpc
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: jsonrpc-view
index ca8c2fd8bf733da45478c500ed6c48342b957533..16be7f055b3609c414b13c009163dced3ab0afd0 100644 (file)
     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-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: l2switch
+    project-name: l2switch
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: l2switch-view
index 20d4d629923e23958862ff8e64d66b653b823116..d27c3f5ef5ddc34977d421a0f5e3da947f8269cb 100644 (file)
     project: releng/lftools
     project-pattern: releng/lftools
     build-node: centos7-builder-2c-2g
+    build-timeout: 30
     rtd-build-url: https://readthedocs.org/api/v2/webhook/lf-releng-tools/32933/
     rtd-token: 47a135ceba9053c6f88394a7171ebf5602a9fc95
     stream: any
diff --git a/jjb/lfn/lfn.yaml b/jjb/lfn/lfn.yaml
deleted file mode 100644 (file)
index 68d5396..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
----
-- project:
-    name: lfn-process
-    jobs:
-      - '{project-name}-rtd-jobs'
-      - gerrit-tox-verify
-
-    project-name: lfn-process
-    project: lfn/process
-    project-pattern: lfn/process
-    build-node: centos7-builder-2c-1g
-    rtd-build-url: https://readthedocs.org/api/v2/webhook/lfn-process/33719/
-    rtd-token: e505b4ae2bf222dcd2b6b08d7b04384ac0459b19
-    stream: any
-    branch: '*'
-
-    git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
-    gerrit-server-name: lf-releng
-
-- project:
-    name: lfn-view
-    views:
-      - project-view
-    project-name: lfn-process
diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
deleted file mode 100644 (file)
index 4a8c17c..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
----
-- project:
-    name: lispflowmapping-csit-performance
-    jobs:
-      - inttest-csit-1node
-
-    # The project name
-    project: 'lispflowmapping'
-
-    # The functionality under test
-    functionality: 'performance'
-
-    # Project branches
-    stream:
-      - aluminium:
-          branch: 'master'
-          jre: 'openjdk11'
-      - magnesium:
-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
-      - sodium:
-          branch: 'stable/sodium'
-
-    install:
-      - only:
-          scope: 'only'
-
-    # Job instance type
-    odl_system_flavor: 'odl-highcpu-8'
-
-    # Features to install
-    install-features: 'odl-lispflowmapping-msmr'
-
-    # Robot custom options
-    robot-options: ''
-
-    # Plot Info
-    01-plot-title: 'Southbound Map-Reply Rate'
-    01-plot-yaxis: 'req/sec'
-    01-plot-group: 'Performance'
-    01-plot-data-file: 'pps.csv'
-
-    02-plot-title: 'RPC mapping setup rate (for 10k IPv4-to-IPv4 mappings)'
-    02-plot-yaxis: 'req/sec'
-    02-plot-group: 'Performance'
-    02-plot-data-file: 'rpcs.csv'
index bf8b6d3ff95e743f7193ac12de98a597f25b61b1..82ae84fdb68a0309deff45da4748058c19ad4a7a 100644 (file)
     mvn-settings: 'lispflowmapping-settings'
     mvn-goals: 'clean deploy -DrepoBuild'
     mvn-opts: '-Xmx2048m -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: lispflowmapping-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: lispflowmapping
+    project-name: lispflowmapping
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: lispflowmapping-view
index af6eb8c0ee73451afd5b3f45422244e5ae7e7545..244360c83a3893537fad44f4a817595d2965d328 100644 (file)
     # Used by the release job
     staging-profile-id: a674173c7b29d
 
+- project:
+    name: mdsal-6.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-jdk11
+      - odl-maven-verify-jobs
+
+    project: mdsal
+    project-name: mdsal
+    branch: 6.0.x
+    stream: 6.0.x
+
+    java-version: 'openjdk11'
+    mvn-settings: 'mdsal-settings'
+    mvn-version: mvn36
+    build-timeout: 90
+
+    archive-artifacts: >
+        **/*.prop
+        **/*.log
+        **/target/surefire-reports/*-output.txt
+        **/target/failsafe-reports/failsafe-summary.xml
+        **/hs_err_*.log
+        **/target/feature/feature.xml
+
+    # Used by the release job
+    staging-profile-id: a674173c7b29d
+
 - project:
     name: mdsal-5.0.x
     jobs:
     project: 'mdsal'
     project-name: 'mdsal'
     branch: 'master'
-    build-node: centos7-builder-8c-8g
     java-version: 'openjdk11'
     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-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: mdsal
+    project-name: mdsal
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: mdsal-view
index bb532eb00b7a0ab983a0c9be96e9046a7589e4d5..6e19ad099a180359e542b570b9747f389932f992 100644 (file)
     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-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: nemo
+    project-name: nemo
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: nemo-view
index 8b83aebe96e76d1b2a452a5a57542b5ac1a8285f..0e0352f2e30f92dd054a54abbb45ad822070bca8 100644 (file)
@@ -28,7 +28,7 @@
           scope: 'only'
 
     # no mininet required
-    tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190614-042302.610
+    tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20200701-170158.227
 
     # Features to install
     install-features: 'odl-netconf-callhome-ssh,odl-restconf'
index 47b6c614d11be75563d548ed0ddce19dcee7e766..14cff7d78c41de2e90c47e39666a51f6f8d43d23 100644 (file)
@@ -22,6 +22,7 @@
       - core:
           csit-list: >
                 netconf-csit-1node-gate-userfeatures-all-{stream},
+                netconf-csit-1node-gate-userfeatures-rfc8040-all-{stream},
                 netconf-csit-1node-gate-callhome-only-{stream}
 
       - netvirt:
index 02f2ffbdc2f3552b0cfe4a10a99f8ce86cd1f244..bc82b82130eadfd618ab410b6b3a01385175aa88 100644 (file)
@@ -13,6 +13,8 @@
       - userfeatures-rfc8040:
           robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:False -v USE_RFC8040:True'
       - gate-userfeatures
+      - gate-userfeatures-rfc8040:
+          robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:False -v USE_RFC8040:True'
 
     # Project branches
     stream:
@@ -29,7 +31,7 @@
       - all:
           scope: 'all'
 
-    tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190614-042302.610
+    tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20200701-170158.227
 
     # Features to install
     install-features: >
index 89da37c727117c8d969345f46b1cebea6eb6ae95..5a79625e235e89ca5b825e7ca450f54377e73317 100644 (file)
     mvn-goals: 'clean deploy -Pintegrationtests'
     mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
     build-timeout: 90
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+
+- project:
+    name: netconf-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: netconf
+    project-name: netconf
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: netconf-view
index 80d00fb7a758bf357aeda917d491890a455676ef..cd5bbd9c5c526982e3991d81df0a92423a1c2a2d 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration-aluminium
+    name: netvirt-csit-hwvtep-openstack-integration-aluminium-rocky
     jobs:
       - inttest-csit-hwvtep-openstack-custom
 
     enable-openstack-services: 'placement-api,l2gw-plugin'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: odl-highcpu-8
+    odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20190521-223726.040
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200801-180146.111
     os-cmb-cnt: 0
     os-ctl-cnt: 1
     os-cmp-cnt: 2
           install-features: 'odl-jolokia,odl-netvirt-openstack'
 
     functionality:
-      - upstream-stateful
+      - upstream-stateful:
+          schedule: '{schedule-daily}'
       - gate-stateful
 
     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}'
+          openstack_system_image: '{openstack_rocky_system_image}'
+          openstack_system2_image: '{openstack_rocky_system_image}'
 
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration-magnesium
+    name: netvirt-csit-hwvtep-openstack-integration-aluminium-stein
+    jobs:
+      - inttest-csit-hwvtep-openstack-custom
+
+    project: 'netvirt'
+    stream: 'aluminium'
+    branch: 'master'
+    jre: 'openjdk11'
+    testplan: '{project}-{topology}-l2gw-openstack.txt'
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'placement-api,l2gw-plugin'
+    enable-openstack-compute-services: 'placement-client'
+    security-group-mode: 'stateful'
+    odl_system_flavor: odl-highcpu-2
+    openstack_system_flavor: odl-highcpu-8
+    openstack_system2_flavor: odl-highcpu-4
+    tools_system_count: 2
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200801-180146.111
+    os-cmb-cnt: 0
+    os-ctl-cnt: 1
+    os-cmp-cnt: 2
+
+    # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
+    enable-networking-l2gw: 'yes'
+
+    topology:
+      - 1node:
+          openstack_system2_count: 2
+          odl_system_count: 1
+          enable-haproxy: 'no'
+          install-features: 'odl-netvirt-openstack'
+      - 3node:
+          openstack_system2_count: 3
+          odl_system_count: 3
+          enable-haproxy: 'yes'
+          install-features: 'odl-jolokia,odl-netvirt-openstack'
+
+    functionality:
+      - upstream-stateful:
+          schedule: '{schedule-daily}'
+      - gate-stateful
+
+    openstack:
+      - 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}'
+
+
+- project:
+    name: netvirt-csit-hwvtep-openstack-integration-magnesium-rocky
     jobs:
       - inttest-csit-hwvtep-openstack-custom
 
     enable-openstack-services: 'placement-api,l2gw-plugin'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: odl-highcpu-8
+    odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20190521-223726.040
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200801-180146.111
     os-cmb-cnt: 0
     os-ctl-cnt: 1
     os-cmp-cnt: 2
           install-features: 'odl-jolokia,odl-netvirt-openstack'
 
     functionality:
-      - upstream-stateful
+      - upstream-stateful:
+          schedule: '{schedule-weekly}'
       - gate-stateful
 
     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}'
+          openstack_system_image: '{openstack_rocky_system_image}'
+          openstack_system2_image: '{openstack_rocky_system_image}'
+          schedule: '{schedule-daily}'
 
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration-sodium
+    name: netvirt-csit-hwvtep-openstack-integration-magnesium-stein
+    jobs:
+      - inttest-csit-hwvtep-openstack-custom
+
+    project: 'netvirt'
+    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'
+    enable-openstack-compute-services: 'placement-client'
+    security-group-mode: 'stateful'
+    odl_system_flavor: odl-highcpu-2
+    openstack_system_flavor: odl-highcpu-8
+    openstack_system2_flavor: odl-highcpu-4
+    tools_system_count: 2
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200801-180146.111
+    os-cmb-cnt: 0
+    os-ctl-cnt: 1
+    os-cmp-cnt: 2
+
+    # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
+    enable-networking-l2gw: 'yes'
+
+    topology:
+      - 1node:
+          openstack_system2_count: 2
+          odl_system_count: 1
+          enable-haproxy: 'no'
+          install-features: 'odl-netvirt-openstack'
+      - 3node:
+          openstack_system2_count: 3
+          odl_system_count: 3
+          enable-haproxy: 'yes'
+          install-features: 'odl-jolokia,odl-netvirt-openstack'
+
+    functionality:
+      - upstream-stateful:
+          schedule: '{schedule-weekly}'
+      - gate-stateful
+
+    openstack:
+      - 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}'
+          schedule: '{schedule-weekly}'
+
+
+- project:
+    name: netvirt-csit-hwvtep-openstack-integration-sodium-rocky
     jobs:
       - inttest-csit-hwvtep-openstack-custom
 
     enable-openstack-services: 'placement-api,l2gw-plugin'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: odl-highcpu-8
+    odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20190521-223726.040
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200801-180146.111
     os-cmb-cnt: 0
     os-ctl-cnt: 1
     os-cmp-cnt: 2
           install-features: 'odl-jolokia,odl-netvirt-openstack'
 
     functionality:
-      - upstream-stateful
+      - upstream-stateful:
+          schedule: '{schedule-weekly}'
       - gate-stateful
 
     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}'
+          openstack_system_image: '{openstack_rocky_system_image}'
+          openstack_system2_image: '{openstack_rocky_system_image}'
+          schedule: '{schedule-weekly}'
+
index 9dbe3bbccc9b84587316146bb0572d2cdd630446..524c4d5443ba88f2382c87ea38087372cb31fb7d 100644 (file)
@@ -1,6 +1,56 @@
 ---
 - project:
-    name: netvirt-csit-upgrade-openstack-integration
+    name: netvirt-csit-upgrade-openstack-integration-rocky
+    jobs:
+      - inttest-csit-openstack-custom
+
+    project: 'netvirt'
+
+    stream:
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
+      - sodium:
+          branch: 'stable/sodium'
+
+    testplan: '{project}-{topology}-openstack-upgrade.txt'
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'placement-api,l2gw-plugin'
+    enable-openstack-compute-services: 'placement-client'
+    security-group-mode: 'stateful'
+    group-add-mod-enabled: 'true'
+    odl_system_flavor: odl-highcpu-2
+    openstack_system_flavor: odl-highcpu-8
+    openstack_system2_flavor: odl-highcpu-4
+    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-openstack'
+
+    functionality:
+      - upgrade:
+          schedule: '{schedule-weekly}'
+      - upgrade-snat-conntrack:
+          odl-snat-mode: 'conntrack'
+          schedule: '{schedule-weekly}'
+
+    openstack:
+      - rocky:
+          openstack-branch: 'stable/rocky'
+          odl-ml2-branch: 'stable/rocky'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          openstack_system_image: '{openstack_rocky_system_image}'
+          openstack_system2_image: '{openstack_rocky_system_image}'
+
+
+- project:
+    name: netvirt-csit-upgrade-openstack-integration-rocky-aluminium
     jobs:
       - inttest-csit-openstack-custom
 
       - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+
+    testplan: '{project}-{topology}-openstack-upgrade.txt'
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'placement-api,l2gw-plugin'
+    enable-openstack-compute-services: 'placement-client'
+    security-group-mode: 'stateful'
+    group-add-mod-enabled: 'true'
+    odl_system_flavor: odl-highcpu-2
+    openstack_system_flavor: odl-highcpu-8
+    openstack_system2_flavor: odl-highcpu-4
+    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-openstack'
+
+    functionality:
+      - upgrade:
+          schedule: '{schedule-daily}'
+      - upgrade-snat-conntrack:
+          odl-snat-mode: 'conntrack'
+          schedule: '{schedule-daily}'
+
+    openstack:
+      - rocky:
+          openstack-branch: 'stable/rocky'
+          odl-ml2-branch: 'stable/rocky'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          openstack_system_image: '{openstack_rocky_system_image}'
+          openstack_system2_image: '{openstack_rocky_system_image}'
+
+- project:
+    name: netvirt-csit-upgrade-openstack-integration-stein
+    jobs:
+      - inttest-csit-openstack-custom
+
+    project: 'netvirt'
+
+    stream:
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'
-      - sodium:
-          branch: 'stable/sodium'
 
     testplan: '{project}-{topology}-openstack-upgrade.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,l2gw-plugin'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: odl-highcpu-8
+    group-add-mod-enabled: 'true'
+    odl_system_flavor: odl-highcpu-2
+    openstack_system_flavor: odl-highcpu-8
+    openstack_system2_flavor: odl-highcpu-4
+    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-openstack'
+
+    functionality:
+      - upgrade:
+          schedule: '{schedule-weekly}'
+      - upgrade-snat-conntrack:
+          odl-snat-mode: 'conntrack'
+          schedule: '{schedule-weekly}'
+
+    openstack:
+      - 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}'
+
+- project:
+    name: netvirt-csit-upgrade-openstack-integration-stein-aluminium
+    jobs:
+      - inttest-csit-openstack-custom
+
+    project: 'netvirt'
+
+    stream:
+      - aluminium:
+          branch: 'master'
+          jre: 'openjdk11'
+
+    testplan: '{project}-{topology}-openstack-upgrade.txt'
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'placement-api,l2gw-plugin'
+    enable-openstack-compute-services: 'placement-client'
+    security-group-mode: 'stateful'
+    group-add-mod-enabled: 'true'
+    odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     os-cmb-cnt: 0
           install-features: 'odl-netvirt-openstack'
 
     functionality:
-      - upgrade
+      - upgrade:
+          schedule: '{schedule-daily}'
       - upgrade-snat-conntrack:
           odl-snat-mode: 'conntrack'
+          schedule: '{schedule-daily}'
 
     openstack:
-      - queens:
-          openstack-branch: 'stable/queens'
-          odl-ml2-branch: 'stable/queens'
+      - stein:
+          openstack-branch: 'stable/stein'
+          odl-ml2-branch: 'stable/stein'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_queens_system_image}'
-          openstack_system2_image: '{openstack_queens_system_image}'
+          openstack_system_image: '{openstack_stein_system_image}'
+          openstack_system2_image: '{openstack_stein_system_image}'
index 3a39137567d124ef14e40983d667e5b7e149226e..1803640852848a3d1759c6ec669a027a923e3b47 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: netvirt-csit-openstack-integration-aluminium
+    name: netvirt-csit-openstack-integration-aluminium-rocky
     jobs:
       - inttest-csit-openstack-custom
 
@@ -13,7 +13,7 @@
     enable-openstack-services: 'placement-api,tempest'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: odl-highcpu-8
+    odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     tools_system_count: 0
           odl-snat-mode: 'conntrack'
 
     openstack:
-      - queens:
-          openstack-branch: 'stable/queens'
-          odl-ml2-branch: 'stable/queens'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_queens_system_image}'
-          openstack_system2_image: '{openstack_queens_system_image}'
       - rocky:
           openstack-branch: 'stable/rocky'
           odl-ml2-branch: 'stable/rocky'
           openstack_system2_image: '{openstack_rocky_system_image}'
 
 - project:
-    name: netvirt-csit-openstack-integration-magnesium
+    name: netvirt-csit-openstack-integration-aluminium-stein
+    jobs:
+      - inttest-csit-openstack-custom
+
+    project: 'netvirt'
+    stream: 'aluminium'
+    branch: 'master'
+    jre: 'openjdk11'
+    testplan: '{project}-{topology}-openstack.txt'
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'placement-api,tempest'
+    enable-openstack-compute-services: 'placement-client'
+    security-group-mode: 'stateful'
+    odl_system_flavor: odl-highcpu-2
+    openstack_system_flavor: odl-highcpu-8
+    openstack_system2_flavor: odl-highcpu-4
+    tools_system_count: 0
+    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-openstack'
+          robot-options: '-v FAIL_ON_EXCEPTIONS:True'
+      - 3node:
+          openstack_system2_count: 3
+          odl_system_count: 3
+          enable-haproxy: 'yes'
+          install-features: 'odl-jolokia,odl-netvirt-openstack'
+
+    functionality:
+      - upstream-stateful
+      - upstream-stateful-itm-direct-tunnels:
+          enable-itm-direct-tunnels: 'true'
+      - upstream-stateful-snat-conntrack:
+          odl-snat-mode: 'conntrack'
+      - gate-stateful
+      - gate-stateful-itm-direct-tunnels:
+          enable-itm-direct-tunnels: 'true'
+      - gate-stateful-snat-conntrack:
+          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-weekly}'
+          tools_system_count: 3
+          enable-gre-type-driver: 'yes'
+      - tempest-stateful:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+          schedule: '{schedule-daily}'
+      - tempest-stateful-snat-conntrack:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+          odl-snat-mode: 'conntrack'
+          schedule: '{schedule-daily}'
+      - gate-tempest-stateful:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+      - gate-tempest-stateful-snat-conntrack:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+          odl-snat-mode: 'conntrack'
+
+    openstack:
+      - 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}'
+
+
+- project:
+    name: netvirt-csit-openstack-integration-magnesium-rocky
     jobs:
       - inttest-csit-openstack-custom
 
     enable-openstack-services: 'placement-api,tempest'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: odl-highcpu-8
+    odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     tools_system_count: 0
           odl-snat-mode: 'conntrack'
 
     openstack:
-      - queens:
-          openstack-branch: 'stable/queens'
-          odl-ml2-branch: 'stable/queens'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_queens_system_image}'
-          openstack_system2_image: '{openstack_queens_system_image}'
       - rocky:
           openstack-branch: 'stable/rocky'
           odl-ml2-branch: 'stable/rocky'
           openstack_system2_image: '{openstack_rocky_system_image}'
 
 - project:
-    name: netvirt-csit-openstack-integration-sodium
+    name: netvirt-csit-openstack-integration-magnesium-stein
+    jobs:
+      - inttest-csit-openstack-custom
+
+    project: 'netvirt'
+    stream: 'magnesium'
+    branch: 'stable/magnesium'
+    jre: 'openjdk11'
+    testplan: '{project}-{topology}-openstack.txt'
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'placement-api,tempest'
+    enable-openstack-compute-services: 'placement-client'
+    security-group-mode: 'stateful'
+    odl_system_flavor: odl-highcpu-2
+    openstack_system_flavor: odl-highcpu-8
+    openstack_system2_flavor: odl-highcpu-4
+    tools_system_count: 0
+    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-openstack'
+          robot-options: '-v FAIL_ON_EXCEPTIONS:True'
+      - 3node:
+          openstack_system2_count: 3
+          odl_system_count: 3
+          enable-haproxy: 'yes'
+          install-features: 'odl-jolokia,odl-netvirt-openstack'
+
+    functionality:
+      - upstream-stateful:
+          schedule: '{schedule-weekly}'
+      - upstream-stateful-itm-direct-tunnels:
+          enable-itm-direct-tunnels: 'true'
+          schedule: '{schedule-weekly}'
+      - upstream-stateful-snat-conntrack:
+          odl-snat-mode: 'conntrack'
+          schedule: '{schedule-weekly}'
+      - gate-stateful
+      - gate-stateful-itm-direct-tunnels:
+          enable-itm-direct-tunnels: 'true'
+      - gate-stateful-snat-conntrack:
+          odl-snat-mode: 'conntrack'
+      - gate-minimal-cluster:
+          testplan: '{project}-{topology}-minimal-openstack.txt'
+      - dcgw:
+          testplan: '{project}-{topology}-dcgw-openstack.txt'
+          tools_system_count: 3
+          schedule: '{schedule-weekly}'
+          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-weekly}'
+          tools_system_count: 3
+          enable-gre-type-driver: 'yes'
+      - tempest-stateful:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+          schedule: '{schedule-daily}'
+      - tempest-stateful-snat-conntrack:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+          odl-snat-mode: 'conntrack'
+          schedule: '{schedule-daily}'
+      - gate-tempest-stateful:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+      - gate-tempest-stateful-snat-conntrack:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+          odl-snat-mode: 'conntrack'
+
+    openstack:
+      - 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}'
+
+- project:
+    name: netvirt-csit-openstack-integration-sodium-queens
     jobs:
       - inttest-csit-openstack-custom
 
     enable-openstack-services: 'placement-api,tempest'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: odl-highcpu-8
+    odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     tools_system_count: 0
           install-features: 'odl-jolokia,odl-netvirt-openstack'
 
     functionality:
-      - upstream-stateful
+      - upstream-stateful:
+          schedule: '{schedule-weekly}'
       - upstream-stateful-itm-direct-tunnels:
           enable-itm-direct-tunnels: 'true'
+          schedule: '{schedule-weekly}'
       - upstream-stateful-snat-conntrack:
           odl-snat-mode: 'conntrack'
+          schedule: '{schedule-weekly}'
       - gate-stateful
       - gate-stateful-itm-direct-tunnels:
           enable-itm-direct-tunnels: 'true'
+          schedule: '{schedule-weekly}'
       - gate-stateful-snat-conntrack:
           odl-snat-mode: 'conntrack'
       - gate-minimal-cluster:
           testplan: '{project}-{topology}-minimal-openstack.txt'
       - dcgw:
           testplan: '{project}-{topology}-dcgw-openstack.txt'
+          schedule: '{schedule-weekly}'
           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.
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
           openstack_system_image: '{openstack_queens_system_image}'
           openstack_system2_image: '{openstack_queens_system_image}'
+          schedule: '{schedule-weekly}'
+
+- project:
+    name: netvirt-csit-openstack-integration-sodium-rocky
+    jobs:
+      - inttest-csit-openstack-custom
+
+    project: 'netvirt'
+    stream: 'sodium'
+    branch: 'stable/sodium'
+    testplan: '{project}-{topology}-openstack.txt'
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'placement-api,tempest'
+    enable-openstack-compute-services: 'placement-client'
+    security-group-mode: 'stateful'
+    odl_system_flavor: odl-highcpu-2
+    openstack_system_flavor: odl-highcpu-8
+    openstack_system2_flavor: odl-highcpu-4
+    tools_system_count: 0
+    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-openstack'
+          robot-options: '-v FAIL_ON_EXCEPTIONS:True'
+      - 3node:
+          openstack_system2_count: 3
+          odl_system_count: 3
+          enable-haproxy: 'yes'
+          install-features: 'odl-jolokia,odl-netvirt-openstack'
+
+    functionality:
+      - upstream-stateful:
+          schedule: '{schedule-weekly}'
+      - upstream-stateful-itm-direct-tunnels:
+          enable-itm-direct-tunnels: 'true'
+          schedule: '{schedule-weekly}'
+      - upstream-stateful-snat-conntrack:
+          odl-snat-mode: 'conntrack'
+          schedule: '{schedule-weekly}'
+      - gate-stateful
+      - gate-stateful-itm-direct-tunnels:
+          enable-itm-direct-tunnels: 'true'
+      - gate-stateful-snat-conntrack:
+          odl-snat-mode: 'conntrack'
+      - gate-minimal-cluster:
+          testplan: '{project}-{topology}-minimal-openstack.txt'
+      - dcgw:
+          testplan: '{project}-{topology}-dcgw-openstack.txt'
+          schedule: '{schedule-weekly}'
+          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-weekly}'
+          tools_system_count: 3
+          enable-gre-type-driver: 'yes'
+      - tempest-stateful:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+          schedule: '{schedule-daily}'
+      - tempest-stateful-snat-conntrack:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+          odl-snat-mode: 'conntrack'
+          schedule: '{schedule-daily}'
+      - gate-tempest-stateful:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+      - gate-tempest-stateful-snat-conntrack:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+          odl-snat-mode: 'conntrack'
+
+    openstack:
       - rocky:
           openstack-branch: 'stable/rocky'
           odl-ml2-branch: 'stable/rocky'
           openstack_system2_image: '{openstack_rocky_system_image}'
 
 - project:
-    name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration
+    name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-queens
     jobs:
       - inttest-csit-openstack-custom
 
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'n-cpu,placement-api,tempest'
     security-group-mode: 'stateful'
-    odl_system_flavor: odl-highcpu-8
+    odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     os-cmb-cnt: 1
     os-ctl-cnt: 0
     os-cmp-cnt: 0
 
     stream:
-      - aluminium:
-          branch: 'master'
-          jre: 'openjdk11'
-      - magnesium:
-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
 
           install-features: 'odl-jolokia,odl-netvirt-openstack'
 
     functionality:
-      - upstream-stateful
+      - upstream-stateful:
+          schedule: '{schedule-weekly}'
       - upstream-stateful-itm-direct-tunnels:
           enable-itm-direct-tunnels: 'true'
+          schedule: '{schedule-weekly}'
       - upstream-stateful-snat-conntrack:
           odl-snat-mode: 'conntrack'
+          schedule: '{schedule-weekly}'
       - gate-stateful
       - gate-stateful-itm-direct-tunnels:
           enable-itm-direct-tunnels: 'true'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
           openstack_system_image: '{openstack_queens_system_image}'
           openstack_system2_image: '{openstack_queens_system_image}'
+          schedule: '{schedule-weekly}'
+
+- project:
+    name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-rocky
+    jobs:
+      - inttest-csit-openstack-custom
+
+    project: 'netvirt'
+    testplan: '{project}-{topology}-openstack.txt'
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'n-cpu,placement-api,tempest'
+    security-group-mode: 'stateful'
+    odl_system_flavor: odl-highcpu-2
+    openstack_system_flavor: odl-highcpu-8
+    os-cmb-cnt: 1
+    os-ctl-cnt: 0
+    os-cmp-cnt: 0
+
+    stream:
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
+      - sodium:
+          branch: 'stable/sodium'
+
+    topology:
+      - 1node:
+          openstack_system2_count: 0
+          odl_system_count: 1
+          enable-haproxy: 'no'
+          install-features: 'odl-netvirt-openstack'
+          robot-options: '-v FAIL_ON_EXCEPTIONS:True'
+      - 3node:
+          openstack_system2_count: 1
+          odl_system_count: 3
+          enable-haproxy: 'yes'
+          install-features: 'odl-jolokia,odl-netvirt-openstack'
+
+    functionality:
+      - upstream-stateful:
+          schedule: '{schedule-weekly}'
+      - upstream-stateful-itm-direct-tunnels:
+          enable-itm-direct-tunnels: 'true'
+          schedule: '{schedule-weekly}'
+      - upstream-stateful-snat-conntrack:
+          odl-snat-mode: 'conntrack'
+          schedule: '{schedule-weekly}'
+      - gate-stateful
+      - gate-stateful-itm-direct-tunnels:
+          enable-itm-direct-tunnels: 'true'
+      - gate-stateful-snat-conntrack:
+          odl-snat-mode: 'conntrack'
+      - gate-minimal-cluster:
+          testplan: '{project}-{topology}-minimal-openstack.txt'
+      # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
+      - gate-tdd-wip:
+          testplan: '{project}-{topology}-tdd-wip-openstack.txt'
+          schedule: ''
+      - tempest-stateful:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+          schedule: '{schedule-daily}'
+      - tempest-stateful-snat-conntrack:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+          odl-snat-mode: 'conntrack'
+          schedule: '{schedule-daily}'
+      - gate-tempest-stateful:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+      - gate-tempest-stateful-snat-conntrack:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+          odl-snat-mode: 'conntrack'
+
+    openstack:
       - rocky:
           openstack-branch: 'stable/rocky'
           odl-ml2-branch: 'stable/rocky'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
           openstack_system_image: '{openstack_rocky_system_image}'
           openstack_system2_image: '{openstack_rocky_system_image}'
+
+- project:
+    name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-stein
+    jobs:
+      - inttest-csit-openstack-custom
+
+    project: 'netvirt'
+    testplan: '{project}-{topology}-openstack.txt'
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'n-cpu,placement-api,tempest'
+    security-group-mode: 'stateful'
+    odl_system_flavor: odl-highcpu-2
+    openstack_system_flavor: odl-highcpu-8
+    os-cmb-cnt: 1
+    os-ctl-cnt: 0
+    os-cmp-cnt: 0
+
+    stream:
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
+
+    topology:
+      - 1node:
+          openstack_system2_count: 0
+          odl_system_count: 1
+          enable-haproxy: 'no'
+          install-features: 'odl-netvirt-openstack'
+          robot-options: '-v FAIL_ON_EXCEPTIONS:True'
+      - 3node:
+          openstack_system2_count: 1
+          odl_system_count: 3
+          enable-haproxy: 'yes'
+          install-features: 'odl-jolokia,odl-netvirt-openstack'
+
+    functionality:
+      - upstream-stateful:
+          schedule: '{schedule-weekly}'
+      - upstream-stateful-itm-direct-tunnels:
+          enable-itm-direct-tunnels: 'true'
+          schedule: '{schedule-weekly}'
+      - upstream-stateful-snat-conntrack:
+          odl-snat-mode: 'conntrack'
+          schedule: '{schedule-weekly}'
+      - gate-stateful
+      - gate-stateful-itm-direct-tunnels:
+          enable-itm-direct-tunnels: 'true'
+      - gate-stateful-snat-conntrack:
+          odl-snat-mode: 'conntrack'
+      - gate-minimal-cluster:
+          testplan: '{project}-{topology}-minimal-openstack.txt'
+      # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
+      - gate-tdd-wip:
+          testplan: '{project}-{topology}-tdd-wip-openstack.txt'
+          schedule: ''
+      - tempest-stateful:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+          schedule: '{schedule-daily}'
+      - tempest-stateful-snat-conntrack:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+          odl-snat-mode: 'conntrack'
+          schedule: '{schedule-daily}'
+      - gate-tempest-stateful:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+      - gate-tempest-stateful-snat-conntrack:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+          odl-snat-mode: 'conntrack'
+
+    openstack:
+      - 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}'
+
+
+- project:
+    name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-stein-aluminium
+    jobs:
+      - inttest-csit-openstack-custom
+
+    project: 'netvirt'
+    testplan: '{project}-{topology}-openstack.txt'
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'n-cpu,placement-api,tempest'
+    security-group-mode: 'stateful'
+    odl_system_flavor: odl-highcpu-2
+    openstack_system_flavor: odl-highcpu-8
+    os-cmb-cnt: 1
+    os-ctl-cnt: 0
+    os-cmp-cnt: 0
+
+    stream:
+      - aluminium:
+          branch: 'master'
+          jre: 'openjdk11'
+
+    topology:
+      - 1node:
+          openstack_system2_count: 0
+          odl_system_count: 1
+          enable-haproxy: 'no'
+          install-features: 'odl-netvirt-openstack'
+          robot-options: '-v FAIL_ON_EXCEPTIONS:True'
+      - 3node:
+          openstack_system2_count: 1
+          odl_system_count: 3
+          enable-haproxy: 'yes'
+          install-features: 'odl-jolokia,odl-netvirt-openstack'
+
+    functionality:
+      - upstream-stateful:
+          schedule: '{schedule-daily}'
+      - upstream-stateful-itm-direct-tunnels:
+          enable-itm-direct-tunnels: 'true'
+          schedule: '{schedule-daily}'
+      - upstream-stateful-snat-conntrack:
+          odl-snat-mode: 'conntrack'
+          schedule: '{schedule-daily}'
+      - gate-stateful
+      - gate-stateful-itm-direct-tunnels:
+          enable-itm-direct-tunnels: 'true'
+      - gate-stateful-snat-conntrack:
+          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'
+          schedule: '{schedule-daily}'
+      # 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: ''
+      - tempest-stateful:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+          schedule: '{schedule-daily}'
+      - tempest-stateful-snat-conntrack:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+          odl-snat-mode: 'conntrack'
+          schedule: '{schedule-daily}'
+      - gate-tempest-stateful:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+      - gate-tempest-stateful-snat-conntrack:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+          odl-snat-mode: 'conntrack'
+
+    openstack:
       - stein:
           openstack-branch: 'stable/stein'
           odl-ml2-branch: 'stable/stein'
index db1b70c2c417c3de0094fed95efc7880bf7a4fb2..be7f09c5f0907fdc18df622dc930d82015d6d375 100644 (file)
@@ -24,6 +24,8 @@
           build-node: centos7-builder-2c-8g
       - ubuntu1604:
           build-node: ubuntu1604-mininet-ovs-25-1c-4g
+      - ubuntu1804:
+          build-node: ubuntu1804-mininet-ovs-25-1c-4g
 
 - job-template:
     name: 'netvirt-thirdparty-quagga-{platform}'
index b745f5f9fc8a6c394ff2387aaab6a7ae5b9fa828..50499ed92b57b9f7622f7e348cd7b54723da3a09 100644 (file)
@@ -16,7 +16,7 @@
       - sodium:
           branch: 'stable/sodium'
 
-    os-branch: 'queens'
+    os-branch: 'rocky'
 
     jdk: 'openjdk8'
 
index f3932e81b45642b8e049cac21dcccd68c8c50891..c132094708e9dffd9981dac42e178f83434e50cf 100644 (file)
     java-version: 'openjdk11'
     mvn-settings: 'netvirt-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: netvirt-csit-view
     view-description: 'List of netvirt-csit jobs'
     view-regex: 'netvirt-csit(?!(.*gate)|(.*hwvtep)).*'
 
+- project:
+    name: netvirt
+    jobs:
+      - gerrit-info-yaml-verify
+    project: netvirt
+    project-name: netvirt-info
+    build-node: centos7-builder-2c-1g
+
 - project:
     name: netvirt-view
     views:
index dab038e5f3c876809644b65255c14a377a751f50..e64a81554a8888eff4c49dbfc167714400baf483 100644 (file)
     java-version: 'openjdk11'
     mvn-settings: 'neutron-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: neutron-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: neutron
+    project-name: neutron
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: neutron-view
diff --git a/jjb/odlguice/odlguice.yaml b/jjb/odlguice/odlguice.yaml
new file mode 100644 (file)
index 0000000..795a2ee
--- /dev/null
@@ -0,0 +1,36 @@
+---
+- project:
+    name: odlguice-aluminium
+    jobs:
+      - gerrit-release-merge
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: aluminium
+    project: 'odlguice'
+    project-name: 'odlguice'
+    build-node: centos7-builder-2c-2g
+    build-timeout: 120
+    branch: 'master'
+    java-version: 'openjdk11'
+    mvn-settings: 'odlguice-settings'
+    mvn-opts: '-Xmx2048m'
+    email-upstream: '[app-dev]'
+
+    # Used by the release job
+    staging-profile-id: 44ce7d1aad49e
+
+- project:
+    name: odlguice-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: odlguice
+    project-name: odlguice
+    branch: master
+    build-node: centos7-builder-2c-1g
+
+- project:
+    name: odlguice-view
+    views:
+      - project-view
+    project-name: odlguice
index 46cd584d476d36bcbc812f9d8b39bb8341e745f9..cd3d3f8c640f738170bf4f86565bc3f59b5b2e33 100644 (file)
@@ -1,25 +1,33 @@
 ---
 - project:
-    name: odlmicro
+    name: odlmicro-aluminium
     jobs:
       - gerrit-release-merge
-      - gerrit-tox-verify
-
-    stream:
-      - aluminium:
-          branch: 'master'
-      - magnesium:
-          branch: 'stable/magnesium'
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
 
+    stream: aluminium
     project: odlmicro
-    project-name: odlmicro
+    project-name: 'odlmicro'
+    branch: 'master'
+    java-version: 'openjdk11'
     build-node: centos7-builder-2c-2g
     build-timeout: 60
     mvn-settings: 'odlmicro-settings'
+    mvn-opts: '-Xmx2048m'
 
     # Used by the release job
     staging-profile-id: 44ce67428fd0d
 
+- project:
+    name: odlmicro-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: odlmicro
+    project-name: odlmicro
+    branch: master
+    build-node: centos7-builder-2c-1g
+
 - project:
     name: odlmicro-view
     views:
index 65d658bbc0e6305fc58e790d0c8495ab2dcb53aa..b2ecd102e52749d9072c8c47117f3de9f80d5cb4 100644 (file)
     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-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: odlparent
+    project-name: odlparent
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: odlparent-view
diff --git a/jjb/odlsaf/odlsaf.yaml b/jjb/odlsaf/odlsaf.yaml
new file mode 100644 (file)
index 0000000..eea06da
--- /dev/null
@@ -0,0 +1,36 @@
+---
+- project:
+    name: odlsaf-aluminium
+    jobs:
+      - gerrit-release-merge
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: aluminium
+    project: 'odlsaf'
+    project-name: 'odlsaf'
+    build-node: centos7-builder-2c-2g
+    build-timeout: 120
+    branch: 'master'
+    java-version: 'openjdk11'
+    mvn-settings: 'odlsaf-settings'
+    mvn-opts: '-Xmx2048m'
+    email-upstream: '[app-dev]'
+
+    # Used by the release job
+    staging-profile-id: 2802f0e38ee665
+
+- project:
+    name: odlsaf-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: odlsaf
+    project-name: odlsaf
+    branch: master
+    build-node: centos7-builder-2c-1g
+
+- project:
+    name: odlsaf-view
+    views:
+      - project-view
+    project-name: odlsaf
index ca1c3f774e5290e0dfdcdad4bfd4e8bcb10494ac..2a9b7e9e686982e357f3b7350c6f623883dad089 100644 (file)
     build-timeout: 60
     mvn-settings: 'odltools-settings'
 
+- project:
+    name: odltools-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: odltools
+    project-name: odltools
+    branch: master
+    build-node: centos7-builder-2c-1g
+
 - project:
     name: odltools-view
     views:
index a4abe3060d1b05ad00a64b2dbaf9a967400d4ed3..33d38c7ea2bcbc4406c73903511e9df32744e15d 100644 (file)
     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-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: of-config
+    project-name: of-config
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: of-config-view
diff --git a/jjb/openci/create-ape.sh b/jjb/openci/create-ape.sh
deleted file mode 100755 (executable)
index eb3c343..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-# SPDX-license-identifier: Apache-2.0
-##############################################################################
-# Copyright (c) 2018 Ericsson AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-set -o errexit
-set -o nounset
-set -o pipefail
-
-# workaround for https://github.com/pypa/virtualenv/issues/1029
-export PS1=${PS1:-}
-
-# This script creates ArtifactPublishedEvent (APE)
-
-git clone https://gitlab.openci.io/openci/prototypes.git
-cd prototypes/federated-cicd
-virtualenv openci_publish
-cd openci_publish
-# shellcheck disable=SC1091
-source bin/activate
-python setup.py install
-
-# generate event body
-cat <<EOF > ./json_body.txt
-{
-    "type": "$PUBLISH_EVENT_TYPE",
-    "id": "$(uuidgen)",
-    "time": "$(date -u +%Y-%m-%d_%H:%M:%SUTC)",
-    "buildUrl": "$BUILD_URL",
-    "branch": "master",
-    "origin": "$PUBLISH_EVENT_ORIGIN",
-    "artifactLocation": "$ARTIFACT_LOCATION",
-    "confidenceLevel": "$CONFIDENCE_LEVEL"
-}
-EOF
-
-echo "Constructed $PUBLISH_EVENT_TYPE"
-echo "--------------------------------------------"
-cat  ./json_body.txt
-echo "--------------------------------------------"
-
-python openci_publish -H 129.192.69.55 -U "${ACTIVEMQ_USER}" -p "${ACTIVEMQ_PASSWORD}" -n openci.prototype -B ./json_body.txt
-
-deactivate
diff --git a/jjb/openci/openci-odl-daily-jobs.yaml b/jjb/openci/openci-odl-daily-jobs.yaml
deleted file mode 100644 (file)
index 8cb06fe..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
----
-- project:
-    name: openci-odl
-
-    project: '{name}'
-
-    stream:
-      - master:
-          branch: '{stream}'
-          gs-pathname: ''
-          disabled: false
-
-    jobs:
-      - 'openci-odl-autorelease-daily-{stream}'
-      - 'openci-odl-promote-daily-{stream}'
-
-# This job gets triggered manually for the demo purposes.
-#
-# In prototype, either what this job does needs to be integrated to
-# ODL autorelease job or triggered by the upstream autorelease job.
-- job-template:
-    name: 'openci-odl-autorelease-daily-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    concurrent: false
-
-    build-node: centos7-builder-2c-2g
-
-    parameters:
-      - string:
-          name: PUBLISH_EVENT_TYPE
-          default: ArtifactPublishedEvent
-          description: 'The type of the event this job publishes'
-      - string:
-          name: PUBLISH_EVENT_ORIGIN
-          default: ODL
-          description: 'Originating community'
-      - string:
-          name: ARTIFACT_LOCATION
-          default: https://url/to/artifact/on/odl/nexus/$BUILD_NUMBER
-          description: 'The location of the artifact on ODL Nexus'
-      - string:
-          name: CONFIDENCE_LEVEL
-          default: "'autorelease': 'SUCCESS'"
-          description: 'The confidence level the published artifact gained'
-
-    wrappers:
-      - credentials-binding:
-          - username-password-separated:
-              credential-id: openci-connect-activemq
-              username: ACTIVEMQ_USER
-              password: ACTIVEMQ_PASSWORD
-      - workspace-cleanup
-
-    builders:
-      # this build step in the job executes create-ape.sh to construct the
-      # ArtifactPublishedEvent (ape) and publishes it using the python utility
-      - shell:
-          !include-raw-escape: ./create-ape.sh
-
-# This job gets triggered by a ConfidenceLevelModifiedEvent published
-# by OPNFV jobs so ODL can promote the autorelease artifact even further.
-#
-# This job is created for the demo purposes and might not be there for
-# the prototype.
-- job-template:
-    name: 'openci-odl-promote-daily-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    concurrent: false
-
-    build-node: centos7-builder-2c-2g
-
-    triggers:
-      - jms-messaging:
-          provider-name: openci.activemq
-          selector: >
-            JMSType = 'ConfidenceLevelModifiedEvent' and
-            JMSOrigin = 'OPNFV' and
-            JMSScenario = 'os-odl-nofeature-ha'
-
-    builders:
-      - shell: |
-          #!/bin/bash
-
-          echo
-          echo "Triggered by $type"
-          echo "----------------------------------"
-          echo $CI_MESSAGE
-          echo "----------------------------------"
-          echo " Promoted ODL Autorelease artifact as release candidate!"
-
-- project:
-    name: openci-odl-view
-    views:
-      - project-view
-    project-name: openci-odl
index 3fca0825abe306784b053e12d4c044546be0e5c5..78ea0e48411b6c9eb9be8ea86115d06cb2d76bd0 100644 (file)
@@ -25,7 +25,7 @@
 
     # Job images
     tools_system_count: 2
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest'
index be28da8d5be220a7957dc2dc66c110f1c14ff554..8b561ce744ec86580b1bf4e07248973c9633e4d3 100644 (file)
@@ -26,7 +26,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-drop-test'
index 27007e3d08ebffbab57bbe6186a3a1e4fe519c20..0402ba372e98e89d8bcee8740662ef231d786775 100644 (file)
@@ -28,7 +28,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-app-bulk-o-matic'
index ff8f0e119700c1115002150313aa37a907bf3169..25dec7c05108477d72eccb436f6f7e4d01065ede 100644 (file)
@@ -28,7 +28,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229'
 
     # Features to install
     install-features: >
index 2e25311f6d1595cb139f10b4d646925f8446f1f8..77c16256821631810f4a61cfbd80f9a2ad55dd61 100644 (file)
@@ -28,7 +28,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229'
 
     # Features to install
     install-features: >
index b595352b1ce39b1d30f86e3136744833d76f24da..e30af69f468483ae4812a7abd5889906169f35ee 100644 (file)
       - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+          install: 'all'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'
+          install: 'all'
       - sodium:
           branch: 'stable/sodium'
-
-    install:
-      - all:
-          scope: 'all'
+          install: 'all'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229'
 
     # Features to install
     install-features: >
index 6fe25d0fddacfb80cfec2fe12d056ede3a66e185..5b2cb7e5d1e29b641166936da61200979ad7cd1a 100644 (file)
@@ -30,7 +30,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229'
 
     # Features to install
     install-features: >
index c690cc11c48dc8dd796d5b94d99872f3695b7cfc..7c344d5fea8880090c0cdf638f6e9e419497fe31 100644 (file)
@@ -28,7 +28,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229'
 
     # Features to install
     install-features: >
index da81f9e39e3dce47720c203b50bd83186e927415..84262cb005f2fcf0119888978865f570f52895ce 100644 (file)
@@ -28,7 +28,8 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    odl_system_flavor: 'odl-standard-4'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest'
index 4c3fdfdb28eac7f158094de5c9f55703873f5db9..d814d36c33b2deb0756d635cb181923a66624f5b 100644 (file)
@@ -27,7 +27,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229'
 
     # Features to install
     install-features: >
index 2f15c4062d8ac93f4e5bb5c56744eee92dc960ff..ad11f1526ae303b672d731ca0231a23a0506d88a 100644 (file)
@@ -26,7 +26,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229'
 
     # Features to install
     install-features: >
index 54a71fbf33a087dc8b282358a28ed74e3d70b9aa..ef5e744ff969cd3a3c5ffc33daff786f0caf6dd9 100644 (file)
@@ -26,7 +26,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229'
 
     # Features to install
     install-features: >
index 74a5ef9fce4820250832f6d2fb75b72fd8c6eff6..066510af2a5cb0f3354fbee0d10f9c4687dbd7d4 100644 (file)
@@ -28,7 +28,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229'
 
     # Features to install
     install-features: >
index d6e473db8eec1b11358b5b816e1c18d0c4733c42..afd677a1c3b38d7a0a782aee946e78c93eb34ec6 100644 (file)
     mvn-settings: 'openflowplugin-settings'
     mvn-goals: 'clean deploy javadoc:aggregate'
     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: openflowplugin-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: openflowplugin
+    project-name: openflowplugin
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: openflowplugin-view
index b5cc790e3894c7078e379f03285148645efbab30..d273f3953d41c43b9442427cceff58b6f2d5fe18 100644 (file)
           email-prefix: '[opflex]'
       - lf-infra-publish
 
+- project:
+    name: opflex-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: opflex
+    project-name: opflex
+    branch: master
+    build-node: centos7-builder-2c-1g
+
 - project:
     name: opflex-view
     views:
index 139dcc56ed5dd6e98113a13166a68babe330fee3..af2ec28f0f198968a32101e1a1a6a0e5a739a593 100644 (file)
     # Used by the release job
     staging-profile-id: a68b188166958
 
+- project:
+    name: ovsdb-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: ovsdb
+    project-name: ovsdb
+    branch: master
+    build-node: centos7-builder-2c-1g
+
 - project:
     name: ovsdb-view
     views:
index 1d5d28b650b8cca345f550c51e843a5ff6839616..ae8f46da7af418168f19c3ce83c280177a27dd73 100644 (file)
     branch: 'master'
     mvn-settings: 'p4plugin-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: p4plugin-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: p4plugin
+    project-name: p4plugin
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: p4plugin-view
index 17b19f6ca3396f7d781e815f70b445a74ae5eb71..72b2d6a912f63243e78427d31af5d99bf8a0855d 100644 (file)
     publishers:
       - lf-infra-publish
 
+- project:
+    name: packaging-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: packaging
+    project-name: packaging
+    branch: master
+    build-node: centos7-builder-2c-1g
+
 - project:
     name: packaging-view
     views:
index 4508aec638deb701f26af4bcfe350ca2279b4382..5d9f5fabc1760e312c739dc3e149753d102501bf 100644 (file)
     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-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: packetcable
+    project-name: packetcable
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: packetcable-view
index 7b4ebc16e4c43ef314a3ee8059036fb9ac720228..f77719b9bf027430d1a3fbdc1d08c29411cee062 100644 (file)
     java-version: openjdk8
     mvn-settings: plastic-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: plastic-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: plastic
+    project-name: plastic
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: plastic-view
index 69d329963a08fb169042b7831bd07263f978167d..b2a332e6181d5d001b30a8780e9c140a5ab38e2a 100644 (file)
@@ -22,6 +22,7 @@
       - gerrit-tox-verify
       # Automation for docs and jobs
       - 'builder-update-image-list'
+      - gerrit-info-yaml-verify
 
     # The following values are only specified here
     # so that code blocks look similar to other projects.
@@ -32,7 +33,7 @@
     build-node: centos7-builder-2c-2g
     archive-artifacts: '**/*.log'
     build-timeout: 30
-    jjb-version: 2.9.1
+    jjb-version: 3.5.0
 
 - project:
     name: builder-openstack
index a2c44a170b3186cd25ebbc6f2ca8906162582d5e..eaee6cf0a8d29790c74120540fa2dcd2b746a3eb 100644 (file)
@@ -22,7 +22,9 @@
     build-timeout: 90
     cron: '00 H 1 * *'
 
-    platforms: centos-7
+    platforms:
+      - centos-7
+      - centos-8
     templates: builder
     update-cloud-image: true
 
 
     platforms:
       - ubuntu-16.04
-      - ubuntu-18.04:
-          disable-job: true
+      - ubuntu-18.04
     templates: mininet-ovs-2.5
     update-cloud-image: true
 
 
     platforms:
       - ubuntu-16.04
-      - ubuntu-18.04:
-          disable-job: true
+      - ubuntu-18.04
     templates: mininet-ovs-2.6
     update-cloud-image: true
 
 
     platforms:
       - ubuntu-16.04
-      - ubuntu-18.04:
-          disable-job: true
+      - ubuntu-18.04
     templates: mininet-ovs-2.8
     update-cloud-image: true
 
index 2a87a1f7684873cb07285c6785f13267a776e53d..0a9cbf91d7e82cff9fc45805bdc274cfae1f8858 100644 (file)
     java-version: 'openjdk11'
     mvn-settings: 'serviceutils-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: serviceutils-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: serviceutils
+    project-name: serviceutils
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: serviceutils-view
index ed7f35edeefece9870cef50e0e9e4515a1cf96e6..2e46db2a40acf44527a10a92c5edb610362c3523 100644 (file)
     java-version: 'openjdk11'
     mvn-settings: 'sfc-settings'
     mvn-opts: '-Xmx2048m -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: sfc-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: sfc
+    project-name: sfc
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: sfc-view
index cbca6396b75fbb1b9e31ca4cced975ac41888150..7193d27c3a3eac3652212b700b97b25cf59a568e 100644 (file)
     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-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: snmp
+    project-name: snmp
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: snmp-view
index 358f7ead75e8c15070a472a3a967ea7aac777d79..9ad5b64de1936b02b1bfb88ebaab9f91d16d587c 100644 (file)
     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-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: snmp4sdn
+    project-name: snmp4sdn
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: snmp4sdn-view
index a19648c5216ad8b65cb15d1b43870a7364b03d46..ba2b58e15e5e64f202ecea7707a09b9d3db2666c 100644 (file)
     java-version: 'openjdk11'
     mvn-settings: 'sxp-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: sxp-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: sxp
+    project-name: sxp
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: sxp-view
index e52de623fdfb95591ceb7cbe2e0723f87cfff373..00533d7f8d00063d22a45de85ff52deb7a873270 100644 (file)
     mvn-settings: 'telemetry-settings'
     mvn-goals: 'clean install'
     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: telemetry-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: telemetry
+    project-name: telemetry
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: telemetry-view
index 762559292b35eca85f8a0c9c6201d3d9145ca8c1..ec52b9fafe9589b546d03267f8ae93b4edddf620 100644 (file)
@@ -9,7 +9,7 @@
           rtd-token: 6f37ba63226bdcc6c823ee455e62237cf68813fd
       - gerrit-tox-verify:
           build-timeout: 120
-          build-node: centos7-builder-8c-8g
+          build-node: centos7-builder-4c-16g
       - gerrit-release-merge
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
@@ -37,7 +37,7 @@
           rtd-token: 6f37ba63226bdcc6c823ee455e62237cf68813fd
       - gerrit-tox-verify:
           build-timeout: 120
-          build-node: centos7-builder-8c-8g
+          build-node: centos7-builder-4c-16g
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
@@ -64,7 +64,7 @@
           rtd-token: 6f37ba63226bdcc6c823ee455e62237cf68813fd
       - gerrit-tox-verify:
           build-timeout: 120
-          build-node: centos7-builder-8c-8g
+          build-node: centos7-builder-4c-16g
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
     java-version: 'openjdk11'
     mvn-settings: 'transportpce-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: transportpce-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: transportpce
+    project-name: transportpce
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: transportpce-view
index d822df341a6451b641f3c01dadbf0d16d0cea451..7d44c4ea5ea5581433c0bce5d56bda1011651e5b 100644 (file)
     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-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: tsdr
+    project-name: tsdr
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: tsdr-view
index 8c59a989ac6d7ddef4fa74466c1ad90b28e47a33..1c3d3507780cb10ed351f22b5ef8cef2a9895f4f 100644 (file)
     project: 'unimgr'
     project-name: 'unimgr'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'unimgr-settings'
     mvn-opts: '-Xmx1024m'
-    dependencies: 'ovsdb-merge-{stream}'
-    email-upstream: '[unimgr] [ovsdb]'
+    dependencies: >
+        odlparent-merge-{stream},
+        yangtools-merge-{stream},
+        controller-merge-{stream},
+        mdsal-merge-{stream}
+    email-upstream: '[unimgr] [odlparent] [yangtools] [controller] [mdsal]'
     build-node: centos7-builder-4c-16g
 
     # Used by the release job
@@ -39,6 +44,7 @@
     project: 'unimgr'
     project-name: 'unimgr'
     branch: 'stable/magnesium'
+    java-version: 'openjdk11'
     mvn-settings: 'unimgr-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'ovsdb-merge-{stream}'
@@ -80,6 +86,7 @@
     project: 'unimgr'
     project-name: 'unimgr'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'unimgr-settings'
     mvn-opts: '-Xmx1024m'
     sonarcloud: true
     sonarcloud-api-token: '{sonarcloud_api_token}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
+- project:
+    name: unimgr-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: unimgr
+    project-name: unimgr
+    branch: master
+    build-node: centos7-builder-2c-1g
+
 - project:
     name: unimgr-view
     views:
index 0f12b8a2eaaeba898fc7da919bc3d63655fec00e..9a93d7571a1bb7f00ba399506cd9ddd5f287c391 100644 (file)
     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-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: usc
+    project-name: usc
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: usc-view
index 422729ebb75fba3b65bd109b8d5f17d3bb124447..d02900bbab7eed7d8ed977d21ec2f17f568fc659 100644 (file)
     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-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: yangtools
+    project-name: yangtools
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: yangtools-view
index da5d5cf92fafcdc0f31a76d2955e8ac9c327c100..a34a25187d428d6f5c9c6a19bb2b63b6c2688320 160000 (submodule)
@@ -1 +1 @@
-Subproject commit da5d5cf92fafcdc0f31a76d2955e8ac9c327c100
+Subproject commit a34a25187d428d6f5c9c6a19bb2b63b6c2688320
index 149060c537d6f77d025bfa36ee244fdcca9372da..9bae2959a100325529a6b01ffa88bb02ff4e83b0 100644 (file)
@@ -15,9 +15,6 @@
   pre_tasks:
     - include_role: name=lfit.system-update
 
-  roles:
-    - lfit.mono-install
-
   tasks:
     - name: Install Cassandra Server
       block:
index dbd77846599b87864d2ea72b9fbbbca854253a34..06dc8c011a323c4a7babdbfd809357dfc45962b2 100644 (file)
       apt: name=vlan state=present
       become: true
 
+    - name: Install CSIT dependencies
+      apt:
+        name:
+          - git-review
+          - python-chardet
+          - python-ndg-httpsclient
+          - python-requests
+          - python-urllib3
+        state: present
+      become: true
+
   post_tasks:
     - name: System Reseal
       script: ../common-packer/provision/system-reseal.sh
diff --git a/scripts/.gitignore b/scripts/.gitignore
deleted file mode 100644 (file)
index c5ec4a4..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-# Python
-__pycache__/
-*.pyc
-
-# ODL Signer
-.sign-artifacts
-gpg-signatures
diff --git a/tox.ini b/tox.ini
index 87e40692f98cb2e0cd0aadde0ca4c4170a48022e..bf47e3e0e3f52880c82deef646e48781f9de6af3 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -20,7 +20,7 @@ commands = sphinx-build -b html -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs
 
 [testenv:jenkins-jobs]
 deps =
-    jenkins-job-builder=={env:JJB_VERSION:2.9.1}
+    jenkins-job-builder=={env:JJB_VERSION:3.5.0}
 commands =
     jenkins-jobs {posargs:--help}
 
@@ -32,7 +32,8 @@ basepython = python3
 deps = pre-commit
 commands =
     pre-commit install --hook-type commit-msg
-    pre-commit run --all-files
+    pre-commit run --all-files --show-diff-on-failure
+    pre-commit run gitlint --hook-stage commit-msg --commit-msg-filename .git/COMMIT_EDITMSG
 
 [testenv:prefix]
 commands = python {toxinidir}/check_prefix.py