Merge "Skip SFT during mdsal-sonar"
authorThanh Ha (zxiiro) <zxiiro@gmail.com>
Fri, 29 Mar 2019 15:57:07 +0000 (15:57 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 29 Mar 2019 15:57:07 +0000 (15:57 +0000)
224 files changed:
docs/cloud-images.rst
global-jjb
jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg
jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg
jjb/aaa/aaa-csit-authn.yaml
jjb/aaa/aaa-csit-keystone.yaml [deleted file]
jjb/aaa/aaa-csit-tls.yaml [deleted file]
jjb/aaa/aaa-patch-test.yaml
jjb/aaa/aaa.yaml
jjb/alto/alto-csit-setup.yaml
jjb/alto/alto.yaml
jjb/ansible/ansible.yaml
jjb/archetypes/archetypes.yaml
jjb/autorelease/autorelease-projects.yaml
jjb/autorelease/autorelease-templates.yaml
jjb/autorelease/autorelease-version-management.yaml
jjb/autorelease/branch-cut.sh
jjb/autorelease/update-autorelease-projects-views.sh
jjb/autorelease/validate-autorelease-neon.yaml
jjb/autorelease/validate-autorelease-sodium.yaml [moved from jjb/autorelease/validate-autorelease-oxygen.yaml with 52% similarity]
jjb/autorelease/version-bump.sh
jjb/autorelease/view-autorelease-oxygen.yaml [deleted file]
jjb/autorelease/view-autorelease-sodium.yaml [new file with mode: 0644]
jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
jjb/bgpcep/bgpcep-csit-throughpcep.yaml
jjb/bgpcep/bgpcep-csit-userfeatures.yaml
jjb/bgpcep/bgpcep-patch-test.yaml
jjb/bgpcep/bgpcep.yaml
jjb/bier/bier-csit-basic.yaml
jjb/bier/bier.yaml
jjb/capwap/capwap-csit-ac.yaml [deleted file]
jjb/capwap/capwap.yaml [deleted file]
jjb/cardinal/cardinal.yaml [deleted file]
jjb/centinel/centinel-csit-basic.yaml [deleted file]
jjb/centinel/centinel.yaml [deleted file]
jjb/coe/coe-csit.yaml
jjb/coe/coe-patch-test.yaml
jjb/coe/coe.yaml
jjb/controller/controller-csit-akka1.yaml
jjb/controller/controller-csit-clustering.yaml
jjb/controller/controller-csit-cs-chasing-leader.yaml
jjb/controller/controller-csit-cs-partnheal.yaml
jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
jjb/controller/controller-csit-dnb-noloss.yaml
jjb/controller/controller-csit-drb-partnheal.yaml
jjb/controller/controller-csit-drb-precedence.yaml
jjb/controller/controller-csit-dsbenchmark-cluster.yaml
jjb/controller/controller-csit-dsbenchmark.yaml
jjb/controller/controller-csit-rest-cars-perf.yaml
jjb/controller/controller-csit-rest-clust-cars-perf.yaml
jjb/controller/controller-patch-test.yaml
jjb/controller/controller.yaml
jjb/coretutorials/coretutorials.yaml [deleted file]
jjb/daexim/daexim-csit-basic.yaml
jjb/daexim/daexim-csit-clustering-basic.yaml
jjb/daexim/daexim.yaml
jjb/defaults.yaml
jjb/didm/didm-csit-discovery.yaml [deleted file]
jjb/didm/didm.yaml [deleted file]
jjb/dlux/dlux.yaml
jjb/dluxapps/dluxapps-csit-yangman.yaml
jjb/dluxapps/dluxapps.yaml
jjb/docs/docs-rtd.yaml
jjb/eman/eman.yaml [deleted file]
jjb/faas/faas.yaml [deleted file]
jjb/federation/federation.yaml [deleted file]
jjb/genius/genius-csit-genius.yaml
jjb/genius/genius-patch-test.yaml
jjb/genius/genius.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
jjb/groupbasedpolicy/groupbasedpolicy.yaml
jjb/honeycomb/vbd/vbd.yaml
jjb/infrautils/infrautils-patch-test.yaml
jjb/infrautils/infrautils.yaml
jjb/integration/csit-jobs-fluorine.lst
jjb/integration/csit-jobs-neon.lst
jjb/integration/csit-jobs-oxygen.lst [deleted file]
jjb/integration/csit-jobs-sodium.lst [new file with mode: 0644]
jjb/integration/distribution/distribution-check-bootup.sh
jjb/integration/distribution/distribution-csit-userfeatures.yaml
jjb/integration/distribution/distribution-jobs.yaml
jjb/integration/distribution/distribution-templates.yaml
jjb/integration/integration-compare-distributions.sh
jjb/integration/integration-deploy-openstack-run-test.sh
jjb/integration/integration-install-robotframework.sh
jjb/integration/integration-macros-heat.yaml [new file with mode: 0644]
jjb/integration/integration-macros.yaml
jjb/integration/integration-set-variables.sh
jjb/integration/integration-templates.yaml
jjb/integration/integration-test-jobs.yaml
jjb/integration/multipatch-distribution.sh
jjb/iotdm/iotdm.yaml [deleted file]
jjb/jsonrpc/jsonrpc-csit-basic.yaml
jjb/jsonrpc/jsonrpc.yaml
jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
jjb/l2switch/l2switch-csit-scalability.yaml
jjb/l2switch/l2switch-csit-switch.yaml
jjb/l2switch/l2switch-patch-test.yaml
jjb/l2switch/l2switch.yaml
jjb/lacp/lacp-csit-lacp.yaml [deleted file]
jjb/lacp/lacp.yaml [deleted file]
jjb/lf-infra/lf-infra-jobs.yaml
jjb/lf-infra/zzz-test-release.yaml [new file with mode: 0644]
jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
jjb/lispflowmapping/lispflowmapping.yaml
jjb/mdsal/mdsal-csit-bindingv1.yaml
jjb/mdsal/mdsal-patch-test.yaml
jjb/mdsal/mdsal.yaml
jjb/natapp/natapp.yaml [deleted file]
jjb/nemo/nemo-csit-engine.yaml
jjb/nemo/nemo.yaml
jjb/netconf/netconf-clustering-scale.yaml
jjb/netconf/netconf-clustering.yaml
jjb/netconf/netconf-csit-callhome.yaml
jjb/netconf/netconf-patch-test.yaml
jjb/netconf/netconf-scale.yaml
jjb/netconf/netconf-userfeatures.yaml
jjb/netconf/netconf.yaml
jjb/netide/netide.yaml [deleted file]
jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
jjb/netvirt/netvirt-csit-multi-apex.yaml
jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
jjb/netvirt/netvirt-csit-multi-openstack.yaml
jjb/netvirt/netvirt-job-reports.yaml
jjb/netvirt/netvirt-patch-test.yaml
jjb/netvirt/netvirt.yaml
jjb/neutron/neutron-patch-test.yaml
jjb/neutron/neutron.yaml
jjb/next/next.yaml [deleted file]
jjb/nic/nic.yaml [deleted file]
jjb/ocpplugin/ocpplugin.yaml [deleted file]
jjb/odlparent/odlparent-patch-test.yaml
jjb/odlparent/odlparent.yaml
jjb/odltools/odltools-csit.yaml
jjb/odltools/odltools-patch-test.yaml
jjb/odltools/odltools.yaml
jjb/of-config/of-config.yaml
jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
jjb/openflowplugin/openflowplugin-csit-cbench.yaml
jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
jjb/openflowplugin/openflowplugin-csit-clustering.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
jjb/openflowplugin/openflowplugin-csit-longevity.yaml
jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
jjb/openflowplugin/openflowplugin-csit-sanity.yaml
jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
jjb/openflowplugin/openflowplugin-csit-scale.yaml
jjb/openflowplugin/openflowplugin-patch-test.yaml
jjb/openflowplugin/openflowplugin.yaml
jjb/opflex/opflex-custom.yaml
jjb/opflex/opflex-thirdparty-dependencies.yaml
jjb/opflex/opflex.yaml
jjb/ovil/ovil.yaml [deleted file]
jjb/ovsdb/ovsdb-csit-clustering.yaml
jjb/ovsdb/ovsdb-csit-southbound.yaml
jjb/ovsdb/ovsdb-full-integration.yaml
jjb/ovsdb/ovsdb-patch-test.yaml
jjb/ovsdb/ovsdb.yaml
jjb/p4plugin/p4plugin.yaml
jjb/packaging/build-rpm-snap.sh
jjb/packaging/packaging-puppet.yaml
jjb/packaging/packaging.yaml
jjb/packaging/test-ansible-deb-custom-config.sh
jjb/packaging/test-ansible-deb-default-config.sh
jjb/packaging/test-ansible-rpm-custom-config.sh
jjb/packaging/test-ansible-rpm-default-config.sh
jjb/packaging/test-puppet.sh
jjb/packaging/test-rpm-docker.sh
jjb/packetcable/packetcable-csit-pcmm.yaml
jjb/packetcable/packetcable.yaml
jjb/releng-jobs.yaml
jjb/releng-templates-java.yaml
jjb/releng-views.yaml
jjb/sdninterfaceapp/sdninterfaceapp.yaml [deleted file]
jjb/serviceutils/serviceutils-patch-test.yaml
jjb/serviceutils/serviceutils.yaml
jjb/sfc/sfc-csit-full-deploy.yaml
jjb/sfc/sfc-csit-rest-basic.yaml
jjb/sfc/sfc-patch-test.yaml
jjb/sfc/sfc-python.yaml
jjb/sfc/sfc.yaml
jjb/snbi/snbi.yaml [deleted file]
jjb/snmp/snmp.yaml
jjb/snmp4sdn/snmp4sdn.yaml
jjb/sxp/sxp-csit-basic.yaml
jjb/sxp/sxp-csit-binding-origin.yaml
jjb/sxp/sxp-csit-cluster-binding.yaml [moved from jjb/sxp/sxp-csit-cluster-routing.yaml with 63% similarity]
jjb/sxp/sxp-csit-clustering.yaml
jjb/sxp/sxp-csit-filtering.yaml
jjb/sxp/sxp-csit-performance.yaml
jjb/sxp/sxp-csit-topology.yaml
jjb/sxp/sxp.yaml
jjb/systemmetrics/systemmetrics.yaml [deleted file]
jjb/telemetry/telemetry-csit-basic.yaml [moved from jjb/iotdm/iotdm-csit-basic.yaml with 66% similarity]
jjb/telemetry/telemetry.yaml
jjb/transportpce/transportpce.yaml
jjb/tsdr/tsdr-csit-cassandra.yaml
jjb/tsdr/tsdr-csit-elasticsearch.yaml
jjb/tsdr/tsdr-csit-hbase.yaml
jjb/tsdr/tsdr-csit-hsqldb.yaml
jjb/tsdr/tsdr.yaml
jjb/ttp/ttp.yaml [deleted file]
jjb/unimgr/unimgr.yaml
jjb/usc/usc-csit-tcp.yaml
jjb/usc/usc.yaml
jjb/usecplugin/usecplugin.yaml [deleted file]
jjb/yangtools/yangtools-csit-system.yaml
jjb/yangtools/yangtools-patch-test.yaml
jjb/yangtools/yangtools.yaml
packer/provision/kubernetes.yaml
packer/provision/local-builder.yaml
tox.ini

index 4c3268cb0b659d3ef2a5cee78d230f52eba058ef..092c1d10a77efdd09360f4359e85db3b6d6fd6fb 100644 (file)
@@ -31,9 +31,12 @@ Following are the list of published images available to be used with Jenkins job
 * ZZCI - Ubuntu 16.04 - gbp - 20180723-235534.431
 * ZZCI - Ubuntu 16.04 - kubernetes - 20180527-1344
 * ZZCI - Ubuntu 16.04 - kubernetes - 20180723-235526.580
+* ZZCI - Ubuntu 16.04 - kubernetes - 20190206-080347.936
+* ZZCI - Ubuntu 16.04 - kubernetes - 20190211-225526.126
 * ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
 * ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20180723-235543.682
 * ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514
+* ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366
 * ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
 * ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20180723-235543.774
 * ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20181029-223513.438
index f3adcad3c56090f92c8185e94957df4893db5ea1..24a51c7182b868b57317f820dd8222f55274bc4d 160000 (submodule)
@@ -1 +1 @@
-Subproject commit f3adcad3c56090f92c8185e94957df4893db5ea1
+Subproject commit 24a51c7182b868b57317f820dd8222f55274bc4d
index 0cbb7e0aff413faf86d7ea3395f4f4f5d83482b6..007b17aa7418701c551163b5bbc72d3e9f8218ff 100644 (file)
@@ -1,3 +1,3 @@
 IMAGE_NAME=ZZCI - CentOS 7 - robot - 20180601-2050
 HARDWARE_ID=odl-standard-2
-INSTANCE_CAP=20
+INSTANCE_CAP=25
index c3eab9e1eafbffdadf437f4eb7eda992b9ffa103..5c435bfa13d70aecd438b5f4ff1b853df22bf8d3 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366
 HARDWARE_ID=odl-standard-1
index 8d328842cf906a2be04e5f9c5acb88bcd482e58d..8404aec2bb81b6c399bb8f66dfc739e34e69205b 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - all:
diff --git a/jjb/aaa/aaa-csit-keystone.yaml b/jjb/aaa/aaa-csit-keystone.yaml
deleted file mode 100644 (file)
index 614ef04..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
----
-- project:
-    name: aaa-csit-keystone
-    jobs:
-      - inttest-csit-1node
-      - inttest-csit-verify-1node
-
-    # The project name
-    project: 'aaa'
-
-    # The functionality under test
-    functionality: 'keystone'
-
-    # Project branches
-    stream:
-      - neon:
-          branch: 'master'
-      - fluorine:
-          branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: 'odl-restconf-all'
-
-    tools_system_count: '1'
-    tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - CentOS 7 - docker - 20180723-235456.035'
-
-    # Robot custom options
-    robot-options: ''
diff --git a/jjb/aaa/aaa-csit-tls.yaml b/jjb/aaa/aaa-csit-tls.yaml
deleted file mode 100644 (file)
index fc0c7a9..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
----
-- project:
-    name: aaa-csit-tls
-    jobs:
-      - inttest-csit-1node
-
-    # The project name
-    project: 'aaa'
-
-    # The functionality under test
-    functionality: 'tls'
-
-    # Project branches
-    stream:
-      - neon:
-          branch: 'master'
-      - fluorine:
-          branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-
-    install:
-      - only:
-          scope: 'only'
-
-    # Features to install
-    install-features: odl-ovsdb-southbound-impl-rest
-
-    # Robot custom options
-    robot-options: ''
-
-    # mininet image
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514
index 06f0b3224df15dd51f7c1d47612e15c92775a53e..b873069078f44029a2a3f67b1c54289385166531 100644 (file)
@@ -7,15 +7,15 @@
     project: 'aaa'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
+          os-branch: 'queens'
       - fluorine:
           branch: 'stable/fluorine'
           os-branch: 'queens'
-      - oxygen:
-          branch: 'stable/oxygen'
-          os-branch: 'queens'
 
     feature:
       - authn:
index 7284ed1988c230664000acf7a765e426b4231a74..5cd894b9abd9bcab2109ef9a8edc9bc971ebaf23 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: aaa-neon
+    name: aaa-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
@@ -10,7 +10,7 @@
           rtd-token: 621132230e1307d38f4aaf27e669d7dfdf98532f
       - odl-maven-jobs
 
-    stream: neon
+    stream: sodium
     project: 'aaa'
     project-name: 'aaa'
     branch: 'master'
@@ -23,7 +23,7 @@
     staging-profile-id: 9318cf3c82c33
 
 - project:
-    name: aaa-fluorine
+    name: aaa-neon
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
           rtd-token: 621132230e1307d38f4aaf27e669d7dfdf98532f
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'aaa'
     project-name: 'aaa'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     mvn-settings: 'aaa-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     staging-profile-id: 9318cf3c82c33
 
 - project:
-    name: aaa-oxygen
+    name: aaa-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: aaa
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-aaa/47615/
+          rtd-token: 621132230e1307d38f4aaf27e669d7dfdf98532f
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'aaa'
     project-name: 'aaa'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     mvn-settings: 'aaa-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
index ef5c322acfaa0ffa1d0913ce7f5d02ec8bce5d94..ee913d8da6f5b9278d48e8bfebdfabdabc917bfb 100644 (file)
     # The functionality under test
     functionality: 'setup'
 
+    disable-job: true
+
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - all:
index bde65374976126bafbe24f0718023f3025e4d5d9..bab58b8d080bfd29820fcf0499890283bb973637 100644 (file)
@@ -1,10 +1,10 @@
 ---
 - project:
-    name: alto-neon
+    name: alto-sodium
     jobs:
       - odl-maven-jobs
 
-    stream: neon
+    stream: sodium
     project: 'alto'
     project-name: 'alto'
     branch: 'master'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'l2switch-merge-{stream}'
     email-upstream: '[alto] [l2switch]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 931eabae9693c
 
 - project:
-    name: alto-fluorine
+    name: alto-neon
     jobs:
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'alto'
     project-name: 'alto'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'alto-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'l2switch-merge-{stream}'
     email-upstream: '[alto] [l2switch]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 931eabae9693c
 
 - project:
-    name: alto-oxygen
+    name: alto-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'alto'
     project-name: 'alto'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'alto-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'l2switch-merge-{stream}'
     email-upstream: '[alto] [l2switch]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 931eabae9693c
@@ -65,6 +67,7 @@
     build-node: centos7-builder-2c-8g
     mvn-settings: 'alto-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    disable-job: true
 
 - project:
     name: alto-view
index 0295d49eb937685b1db440532a9f4fd2402e4b94..157305b8bfca59ee026ddfdeb492949c8a6ea945 100644 (file)
@@ -8,8 +8,10 @@
       - odl-maven-jobs
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
 
index b9a9761215044ce3f932877d849dacc86e2ddf94..2d8d34e3393cdc2f89ee12bfcfb56d9fe58a4e8e 100644 (file)
@@ -1,4 +1,28 @@
 ---
+- project:
+    name: archetypes-sodium
+    jobs:
+      - gerrit-maven-clm
+      - '{project-name}-merge-{stream}':
+          build-timeout: 180
+          cron: '@daily'
+          mvn-goals: clean install -V -Dmaven.compile.fork=true
+      - gerrit-maven-stage
+      - gerrit-maven-verify
+      - gerrit-maven-verify-dependencies:
+          build-timeout: 180
+
+    stream: sodium
+    project: 'archetypes'
+    project-name: 'archetypes'
+    branch: 'master'
+    mvn-settings: 'archetypes-settings'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
+    email-upstream: '[archetypes] [odlparent] [yangtools] [controller] [mdsal]'
+
+    # Used by the release job
+    staging-profile-id: d88dcfe6ce48d
+
 - project:
     name: archetypes-neon
     jobs:
@@ -15,7 +39,7 @@
     stream: neon
     project: 'archetypes'
     project-name: 'archetypes'
-    branch: 'master'
+    branch: 'stable/neon'
     mvn-settings: 'archetypes-settings'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
     email-upstream: '[archetypes] [odlparent] [yangtools] [controller] [mdsal]'
@@ -36,6 +60,7 @@
       - gerrit-maven-verify-dependencies:
           build-timeout: 180
 
+    disable-job: 'true'
     stream: fluorine
     project: 'archetypes'
     project-name: 'archetypes'
index afafe62d7e29b3240160f3cc6ea249dcf04a1740..d60c8cbd750de9a889f743392b0ac025b2a3e3cf 100644 (file)
@@ -4,31 +4,25 @@
     jobs:
       - autorelease-branch-cut
       - 'autorelease-generate-release-notes-{stream}'
-      - 'autorelease-release-{stream}':
-          build-node: centos7-autorelease-8c-32g
+      - '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}':
-          build-node: centos7-autorelease-8c-32g
+          build-node: centos7-autorelease-4c-16g
       - '{project-name}-validate-autorelease-{stream}'
       - gerrit-tox-verify
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+          integration-test: sodium
+      - neon:
+          branch: 'stable/neon'
           integration-test: neon
-          extra-mvn-opts: -P!karaf -Pignore-lispflowmapping-integrationtest -Dsft.heap.max=4g
-              -Dskip.karaf.featureTest=true
       - fluorine:
           branch: 'stable/fluorine'
           integration-test: fluorine
-          extra-mvn-opts: -P!karaf -Pignore-lispflowmapping-integrationtest -Dsft.heap.max=4g
-              -Dskip.karaf.featureTest=true
-      - oxygen:
-          branch: 'stable/oxygen'
-          integration-test: oxygen
-          extra-mvn-opts: -P!karaf -Pignore-lispflowmapping-integrationtest -Dsft.heap.max=4g
-              -Dskip.karaf.featureTest=true
 
     project: releng/autorelease
     project-name: autorelease
         **/target/feature/feature.xml
     staging-profile-id: 425e43800fea70
     # TODO: **/*.hprof is too large, compress with xz first
+    mvn-params: >
+        -Pintegrationtests,repoBuild
+        -P!karaf
+        -Pignore-lispflowmapping-integrationtest
+        -Dcheckstyle.skip=true
+        -Dskip.karaf.featureTest=true
+        -Dsft.heap.max=4g
+    java-version: openjdk8
+
+
+- project:
+    name: autorelease-projects-openjdk11
+    jobs:
+      - 'autorelease-release-{stream}-{mvn-version}-{java-version}':
+          build-node: centos7-autorelease-4c-16g
+
+    stream:
+      - sodium:
+          branch: 'master'
+          integration-test: sodium
+          java-version: openjdk11
+
+    project: releng/autorelease
+    project-name: autorelease
+    build-node: centos7-builder-2c-8g
+    # Before adding more here, beware of https://jira.linuxfoundation.org/browse/RELENG-280
+    archive-artifacts: >
+        **/*.prop
+        **/*.log
+        **/target/surefire-reports/*-output.txt
+        **/target/failsafe-reports/failsafe-summary.xml
+        **/hs_err_*.log
+        **/target/feature/feature.xml
+    staging-profile-id: 425e43800fea70
+    # TODO: **/*.hprof is too large, compress with xz first
+    mvn-params: >
+        -Pintegrationtests,repoBuild
+        -P!karaf
+        -Pignore-lispflowmapping-integrationtest
+        -Dcheckstyle.skip=true
+        -Dskip.karaf.featureTest=true
+        -Dsft.heap.max=4g
+    java-version: openjdk8
 
 - project:
     name: autorelease-view
index a17b29adc5cb40ab436b00d27218239081d53ae9..20f0a74b60fa4cf7f2787c2633a6b5ccefa63102 100644 (file)
@@ -53,7 +53,7 @@
       - lf-infra-publish
 
 - job-template:
-    name: 'autorelease-release-{stream}'
+    name: 'autorelease-release-{stream}-{mvn-version}-{java-version}'
 
     ######################
     # Default parameters #
 
     build-node: '{build-node}'
     cron: 'H 0 * * *'
-    java-version: openjdk8
+    java-version: '{java-version}'
     mvn-global-settings: global-settings
+    mvn-goals: clean deploy
+    mvn-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+    mvn-params: ''
     mvn-settings: autorelease-settings
     mvn-version: mvn35
-    extra-mvn-opts: ''
+    sign-artifacts: true
+    mvn-central: true
+    ossrh-profile-id: 6386ebbbf3a563
+    disable-job: 'false'
 
     #####################
     # Job Configuration #
 
     project-type: freestyle
     node: '{build-node}'
-    jdk: '{java-version}'
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
           build-days-to-keep: 30
 
     parameters:
-      - maven-exec:
-          maven-version: '{mvn-version}'
       - lf-infra-parameters:
           project: '{project}'
           stream: '{stream}'
           branch: '{branch}'
           lftools-version: '{lftools-version}'
+      - lf-infra-maven-parameters:
+          mvn-opts: '{mvn-opts}'
+          mvn-params: '{mvn-params}'
+          mvn-version: '{mvn-version}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
       - autorelease-release-tag:
           release-tag: '{stream}'
-      - string:
-          name: EXTRA_MVN_OPTS
-          default: '{extra-mvn-opts}'
-          description: |
-              Additional optional Maven Options to pass to the Maven Goals
-              parameter.
-
-              Examples:
-              -Dskip.karaf.featureTest=true  # To disable karaf SingleFeatureTests
-              --fail-never   # NEVER fail the build, regardless of project result
-              --fail-at-end  # Only fail the build afterwards; allow all non-impacted builds to continue
       - string:
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
       - lf-provide-maven-settings:
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
-      - lf-infra-create-netrc:
-          server-id: '{mvn-staging-id}'
       - autorelease-generate-release-patches
       - autorelease-generate-artifact-versions
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - autorelease-distribute-taglist
       - distribute-build-url:
           path: 'integration/distribution/$KARAF_ARTIFACT/src/main/assembly'
       # Keep the patches compatible with that ideal, but apply an edit
       # to enable building in a single maven reactor afterwards.
       - autorelease-fix-relative-paths
-      - maven-target:
-          maven-version: '{mvn-version}'
-          pom: 'pom.xml'
-          goals: |
-              clean deploy
-              $EXTRA_MVN_OPTS
-              -Pintegrationtests,repoBuild
-              -Dcheckstyle.skip=true
-              -DaltDeploymentRepository=staging::default::file:"$WORKSPACE"/m2repo
-              {opendaylight-infra-mvn-opts}
-          java-opts:
-            - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: '{mvn-global-settings}'
-          global-settings-type: cfp
-      - lf-maven-stage
+      - lf-maven-build:
+          mvn-goals: '{mvn-goals}'
+      - lf-sigul-sign-dir:
+          sign-artifacts: '{sign-artifacts}'
+          sign-dir: '$WORKSPACE/m2repo'
+          sign-mode: serial
+      - lf-maven-stage:
+          mvn-global-settings: '{mvn-global-settings}'
+          mvn-settings: '{mvn-settings}'
+          mvn-staging-id: '{mvn-staging-id}'
+      - lf-maven-central:
+          mvn-central: '{mvn-central}'
+          mvn-global-settings: '{mvn-global-settings}'
+          mvn-settings: '{mvn-settings}'
+          ossrh-profile-id: '{ossrh-profile-id}'
       - autorelease-get-integration-test-variables
       - autorelease-maven-sources:
           opendaylight-infra-mvn-opts: '{opendaylight-infra-mvn-opts}'
     ######################
 
     cron: 'H 0 * * *'
+    disable-job: 'false'
 
     #####################
     # Job configuration #
 
     project-type: freestyle
     node: centos7-builder-2c-2g
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
     ######################
 
     cron: '@weekly'
+    disable-job: 'false'
 
     #####################
     # Job configuration #
 
     project-type: freestyle
     node: centos7-builder-2c-1g
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
     mvn-global-settings: global-settings
     mvn-settings: autorelease-settings
     mvn-version: mvn35
+    disable-job: 'false'
 
     #####################
     # Job configuration #
 
     project-type: freestyle
     node: '{build-node}'
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
     ######################
     # Default parameters #
     ######################
+    disable-job: 'false'
 
     gerrit_merge_triggers:
       - comment-added-contains-event:
 
     project-type: freestyle
     node: centos7-builder-2c-8g
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
           name: RELEASE
           description: |
               Release to generate release notes for.
-              Eg. Oxygen-SR1, Fluorine-SR2...
+              Eg. Neon-SR1, Fluorine-SR2...
     scm:
       - lf-infra-gerrit-scm:
           git-url: '$GIT_URL/$GERRIT_PROJECT'
     mvn-global-settings: global-settings
     mvn-settings: autorelease-settings
     mvn-version: mvn35
+    disable-job: 'false'
 
     #####################
     # Job Configuration #
     #####################
 
-    disabled: false
     project-type: freestyle
     # Note: This NEEDS to be hardcoded as projects should NOT be allowed to
     #       override the build node.
     node: centos7-builder-2c-8g
     concurrent: true
     jdk: '{java-version}'
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
index 20b96a4343088dbd7a0f8d9f72cd903956116f68..9b1203b71c38a586e22898836e290dbee1aa245c 100644 (file)
@@ -11,9 +11,9 @@
     build-node: centos7-builder-2c-8g
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
index 6d74e78cf3b683e29244b9769e9cecae9d5fa7b7..29e065ea3c3f76a86781d92e920e0609f531155b 100644 (file)
@@ -34,7 +34,9 @@ if [ -z "$RELEASE" ]; then
     exit 1
 fi
 
-git config gitreview.username jenkins-releng
+# Setup Gerrit remote to ensure Change-Id gets set on commit.
+git config --global --add gitreview.username "jenkins-$SILO"
+git remote -v
 git submodule foreach git review -s
 git review -s
 
@@ -63,7 +65,7 @@ if [ "$DRY_RUN" = false ]
 then
     echo "Pushing stable/${RELEASE,,} branches to Gerrit"
     git submodule foreach git push gerrit "stable/${RELEASE,,}"
-    git push gerrit "stable/$RELEASE"
+    git push gerrit "stable/${RELEASE,,}"
 fi
 # --- End create new maintenance branch
 
index 8e8cf21471dafaf628033ec144ec431409492074..e34bb6d55b35f1e17ec99ef89f47fc5989d466b5 100755 (executable)
@@ -54,7 +54,7 @@ EOF
 
 for module in "${modules[@]}"; do
     echo "Include project:$module to autorelease view"
-    echo "      - '$module-maven-merge-${STREAM}'" >> "$VIEWS_AR_YAML_FILE"
+    echo "      - '$module-merge-${STREAM}'" >> "$VIEWS_AR_YAML_FILE"
 done
 echo "    <<: *releng_autorelease_view_common_${STREAM}" >> "$VIEWS_AR_YAML_FILE"
 
index 9a31828a3a6d142e636949c6ed307f9f842db014..3085dec94ad75486378d4f10d2e1ca7ff7a22635 100644 (file)
@@ -5,7 +5,7 @@
     jobs:
       - '{project-name}-validate-autorelease-{stream}'
     stream: neon
-    branch: master
+    branch: stable/neon
     project-name:
       - aaa:
           project: aaa
similarity index 52%
rename from jjb/autorelease/validate-autorelease-oxygen.yaml
rename to jjb/autorelease/validate-autorelease-sodium.yaml
index 06bad80366063d4328e0d198b5a1513bf415edd4..5c9137d8677ea6844dc5935555e8c20f7dfc9abb 100644 (file)
@@ -1,77 +1,41 @@
 ---
 # Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job
 - project:
-    name: autorelease-validate-oxygen
+    name: autorelease-validate-sodium
     jobs:
       - '{project-name}-validate-autorelease-{stream}'
-    stream: oxygen
-    branch: stable/oxygen
+    stream: sodium
+    branch: master
     project-name:
       - aaa:
           project: aaa
-      - alto:
-          project: alto
       - bgpcep:
           project: bgpcep
-      - bier:
-          project: bier
       - controller:
           project: controller
       - coe:
           project: coe
       - daexim:
           project: daexim
-      - dlux:
-          project: dlux
-      - dluxapps:
-          project: dluxapps
       - genius:
           project: genius
-      - groupbasedpolicy:
-          project: groupbasedpolicy
-      - honeycomb-vbd:
-          project: honeycomb/vbd
       - infrautils:
           project: infrautils
       - integration-distribution:
           project: integration/distribution
-      - jsonrpc:
-          project: jsonrpc
-      - l2switch:
-          project: l2switch
       - lispflowmapping:
           project: lispflowmapping
-      - mdsal:
-          project: mdsal
-      - nemo:
-          project: nemo
       - netconf:
           project: netconf
       - netvirt:
           project: netvirt
       - neutron:
           project: neutron
-      - of-config:
-          project: of-config
       - openflowplugin:
           project: openflowplugin
       - ovsdb:
           project: ovsdb
-      - p4plugin:
-          project: p4plugin
-      - packetcable:
-          project: packetcable
       - serviceutils:
           project: serviceutils
       - sfc:
           project: sfc
-      - snmp:
-          project: snmp
-      - snmp4sdn:
-          project: snmp4sdn
-      - sxp:
-          project: sxp
-      - tsdr:
-          project: tsdr
-      - usc:
-          project: usc
index a4844be2662f65a8e58b5c2d57b148db39c97b8e..23d062f4fbc1157d355bd3f25c5d3437432ce2d0 100644 (file)
@@ -43,8 +43,7 @@ if [ "$BRANCH_CUT" = "false" ]; then
     done
 fi
 
-
-# Setup Gerrit remove to ensure Change-Id gets set on commit.
+# Setup Gerrit remote to ensure Change-Id gets set on commit.
 git config --global --add gitreview.username "jenkins-$SILO"
 git review -s
 git remote -v
diff --git a/jjb/autorelease/view-autorelease-oxygen.yaml b/jjb/autorelease/view-autorelease-oxygen.yaml
deleted file mode 100644 (file)
index 9138f0e..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
----
-# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job
-- releng_view: &releng_autorelease_view_common_oxygen
-    name: releng-view-autorelease-oxygen
-    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-Oxygen
-    description: 'List of Oxygen Merge jobs for Autorelease'
-    job-name:
-      - 'aaa-maven-merge-oxygen'
-      - 'alto-maven-merge-oxygen'
-      - 'bgpcep-maven-merge-oxygen'
-      - 'bier-maven-merge-oxygen'
-      - 'controller-maven-merge-oxygen'
-      - 'coe-maven-merge-oxygen'
-      - 'daexim-maven-merge-oxygen'
-      - 'dlux-maven-merge-oxygen'
-      - 'dluxapps-maven-merge-oxygen'
-      - 'genius-maven-merge-oxygen'
-      - 'groupbasedpolicy-maven-merge-oxygen'
-      - 'honeycomb/vbd-maven-merge-oxygen'
-      - 'infrautils-maven-merge-oxygen'
-      - 'integration/distribution-maven-merge-oxygen'
-      - 'jsonrpc-maven-merge-oxygen'
-      - 'l2switch-maven-merge-oxygen'
-      - 'lispflowmapping-maven-merge-oxygen'
-      - 'mdsal-maven-merge-oxygen'
-      - 'nemo-maven-merge-oxygen'
-      - 'netconf-maven-merge-oxygen'
-      - 'netvirt-maven-merge-oxygen'
-      - 'neutron-maven-merge-oxygen'
-      - 'of-config-maven-merge-oxygen'
-      - 'openflowplugin-maven-merge-oxygen'
-      - 'ovsdb-maven-merge-oxygen'
-      - 'p4plugin-maven-merge-oxygen'
-      - 'packetcable-maven-merge-oxygen'
-      - 'serviceutils-maven-merge-oxygen'
-      - 'sfc-maven-merge-oxygen'
-      - 'snmp-maven-merge-oxygen'
-      - 'snmp4sdn-maven-merge-oxygen'
-      - 'sxp-maven-merge-oxygen'
-      - 'tsdr-maven-merge-oxygen'
-      - 'usc-maven-merge-oxygen'
-    <<: *releng_autorelease_view_common_oxygen
diff --git a/jjb/autorelease/view-autorelease-sodium.yaml b/jjb/autorelease/view-autorelease-sodium.yaml
new file mode 100644 (file)
index 0000000..1117630
--- /dev/null
@@ -0,0 +1,41 @@
+---
+# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job
+- releng_view: &releng_autorelease_view_common_sodium
+    name: releng-view-autorelease-sodium
+    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-Sodium
+    description: 'List of Sodium Merge jobs for Autorelease'
+    job-name:
+      - 'aaa-maven-merge-sodium'
+      - 'bgpcep-maven-merge-sodium'
+      - 'controller-maven-merge-sodium'
+      - 'coe-maven-merge-sodium'
+      - 'daexim-maven-merge-sodium'
+      - 'genius-maven-merge-sodium'
+      - 'infrautils-maven-merge-sodium'
+      - 'integration/distribution-maven-merge-sodium'
+      - 'lispflowmapping-maven-merge-sodium'
+      - 'netconf-maven-merge-sodium'
+      - 'netvirt-maven-merge-sodium'
+      - 'neutron-maven-merge-sodium'
+      - 'openflowplugin-maven-merge-sodium'
+      - 'ovsdb-maven-merge-sodium'
+      - 'serviceutils-maven-merge-sodium'
+      - 'sfc-maven-merge-sodium'
+    <<: *releng_autorelease_view_common_sodium
index 7347ea018976bc677bfc8c29c26ec5ce788d2608..2a6b8cc6ccaab8b5cc0d378ef30b17bc66a28704 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - all:
index 31794be641cde9ee810b5f90d6f4d1983315f139..01fa4f6689858e16f04ca3e182e1667645cf745d 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - all:
index b6f0ca61dab511d6dc0a12ff224c8cfe4c59f9cb..bbfa54b5531fc0c74eb12b16dac09c6b04a439e7 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index 84e5bb2a603d317f20b132e4b25d06ac362a8b69..41bc854b92420f73d33ad38752592e1569d455bf 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index c8902b46ba191342973358e3423a74453e2948b1..222032dff5c35e4458fc6b2515b469dbdd0dbc24 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - all:
index 534b08f25b4e6a101d88d25b967590e5cbff00f0..cb07e4a3dba4f05a0886615b8a5543ec8c883504 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - all:
index 40e58d612ae23af1fc2febc2b8297b20128b7692..ed80862a4f56d911d9b956ff0a378afc566d1808 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - all:
index 2405fe4bd5969eb25aa03658aad74e543d2fe089..36ef21235050e4692faf192b62637ff94db8ec5b 100644 (file)
@@ -9,12 +9,12 @@
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     feature:
       - bgp:
index 82b640e10104fce4d6efbb4db0615a25eac42bb2..94f5515089f6a6689909c6e7ccc98167f6bbd866 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: bgpcep-neon
+    name: bgpcep-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -11,7 +11,7 @@
           rtd-token: dbe9d1aabbe8812a26b428908f6613c28e3191fc
       - odl-maven-jobs
 
-    stream: neon
+    stream: sodium
     project: 'bgpcep'
     project-name: 'bgpcep'
     build-node: centos7-builder-8c-8g
@@ -30,7 +30,7 @@
     staging-profile-id: 9427a05049030
 
 - project:
-    name: bgpcep-fluorine
+    name: bgpcep-neon
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
           rtd-token: dbe9d1aabbe8812a26b428908f6613c28e3191fc
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'bgpcep'
     project-name: 'bgpcep'
     build-node: centos7-builder-8c-8g
     build-timeout: 120
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     mvn-settings: 'bgpcep-settings'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m'
     dependencies: >
         odlparent-merge-{stream},
         yangtools-merge-{stream},
         controller-merge-{stream},
-        mdsal-merge-{stream},
+        mdsal-merge-{stream}
     email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal]'
 
     # Used by the release job
     staging-profile-id: 9427a05049030
 
 - project:
-    name: bgpcep-oxygen
+    name: bgpcep-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: bgpcep
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-bgpcep/47576/
+          rtd-token: dbe9d1aabbe8812a26b428908f6613c28e3191fc
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'bgpcep'
     project-name: 'bgpcep'
     build-node: centos7-builder-8c-8g
     build-timeout: 120
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     mvn-settings: 'bgpcep-settings'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m'
     dependencies: >
         odlparent-merge-{stream},
         yangtools-merge-{stream},
         controller-merge-{stream},
-        mdsal-merge-{stream}
+        mdsal-merge-{stream},
     email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal]'
 
     # Used by the release job
index dc38606699874d43a08207f3bb817b1db153001f..ba7a52179e2c495c3bbca1704831022d527bfcd2 100644 (file)
@@ -7,21 +7,22 @@
 
     # The project name
     project: 'bier'
+    disable-job: true
 
     # The functionality under test
     functionality: 'basic'
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
-    verify-stream: 'oxygen'
-    verify-branch: 'stable/oxygen'
+    verify-stream: 'fluorine'
+    verify-branch: 'stable/fluorine'
     verify-karaf-version: 'karaf4'
 
     install:
index bbebe4c86fc43af4aed1c8831cf10cbbf09eb048..fc3e31d9ba51421bdbf43bd23566bde116dbba43 100644 (file)
@@ -1,10 +1,10 @@
 ---
 - project:
-    name: bier-neon
+    name: bier-sodium
     jobs:
       - odl-maven-jobs
 
-    stream: neon
+    stream: sodium
     project: 'bier'
     project-name: 'bier'
     branch: 'master'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[bier]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 942a8075b1f2a
 
 - project:
-    name: bier-fluorine
+    name: bier-neon
     jobs:
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'bier'
     project-name: 'bier'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     build-node: centos7-builder-2c-8g
     build-timeout: 90
     mvn-settings: 'bier-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[bier]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 942a8075b1f2a
 
 - project:
-    name: bier-oxygen
+    name: bier-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'bier'
     project-name: 'bier'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     build-node: centos7-builder-2c-8g
     build-timeout: 90
     mvn-settings: 'bier-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[bier]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 942a8075b1f2a
@@ -68,6 +70,7 @@
     build-node: centos7-builder-2c-8g
     mvn-settings: 'bier-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    disable-job: true
 
 - project:
     name: bier-view
diff --git a/jjb/capwap/capwap-csit-ac.yaml b/jjb/capwap/capwap-csit-ac.yaml
deleted file mode 100644 (file)
index 1e2c783..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
----
-- project:
-    name: capwap-csit-ac
-    jobs:
-      - inttest-csit-1node
-      - inttest-csit-verify-1node
-
-    # The project name
-    project: 'capwap'
-
-    # The functionality under test
-    functionality: 'ac'
-
-    # Project branches
-    stream:
-      - neon:
-          branch: 'master'
-      - fluorine:
-          branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: 'odl-capwap-ac-rest'
-
-    # Robot custom options
-    robot-options: ''
diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
deleted file mode 100644 (file)
index 55af0a8..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
----
-- project:
-    name: capwap-neon
-    jobs:
-      - odl-maven-jobs
-
-    stream: neon
-    project: 'capwap'
-    project-name: 'capwap'
-    branch: 'master'
-    mvn-settings: 'capwap-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[capwap]'
-
-    # Used by the release job
-    staging-profile-id: 96bd6b5bf86e3
-
-- project:
-    name: capwap-fluorine
-    jobs:
-      - odl-maven-jobs
-
-    stream: fluorine
-    project: 'capwap'
-    project-name: 'capwap'
-    branch: 'stable/fluorine'
-    mvn-settings: 'capwap-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[capwap]'
-
-    # Used by the release job
-    staging-profile-id: 96bd6b5bf86e3
-
-- project:
-    name: capwap-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'capwap'
-    project-name: 'capwap'
-    branch: 'stable/oxygen'
-    mvn-settings: 'capwap-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[capwap]'
-
-    # Used by the release job
-    staging-profile-id: 96bd6b5bf86e3
-
-- project:
-    name: capwap
-    jobs:
-      - gerrit-maven-sonar
-
-    project: 'capwap'
-    project-name: 'capwap'
-    branch: master
-    mvn-settings: 'capwap-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-
-- project:
-    name: capwap-view
-    views:
-      - project-view
-    project-name: capwap
diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml
deleted file mode 100644 (file)
index 24fad7f..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
----
-- project:
-    name: cardinal-neon
-    jobs:
-      - odl-maven-jobs
-
-    stream: neon
-    project: 'cardinal'
-    project-name: 'cardinal'
-    branch: 'master'
-    mvn-settings: 'cardinal-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'
-    email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]'
-
-    # Used by the release job
-    staging-profile-id: 96be20348f0f2
-
-- project:
-    name: cardinal-fluorine
-    jobs:
-      - odl-maven-jobs
-
-    stream: fluorine
-    project: 'cardinal'
-    project-name: 'cardinal'
-    branch: 'stable/fluorine'
-    mvn-settings: 'cardinal-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'
-    email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]'
-
-    # Used by the release job
-    staging-profile-id: 96be20348f0f2
-
-- project:
-    name: cardinal-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'cardinal'
-    project-name: 'cardinal'
-    branch: 'stable/oxygen'
-    mvn-settings: 'cardinal-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'
-    email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]'
-
-    # Used by the release job
-    staging-profile-id: 96be20348f0f2
-
-- project:
-    name: cardinal-sonar
-    jobs:
-      - gerrit-maven-sonar
-
-    project: 'cardinal'
-    project-name: 'cardinal'
-    branch: 'master'
-    mvn-settings: 'cardinal-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: cardinal-view
-    views:
-      - project-view
-    project-name: cardinal
diff --git a/jjb/centinel/centinel-csit-basic.yaml b/jjb/centinel/centinel-csit-basic.yaml
deleted file mode 100644 (file)
index 71988d3..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
----
-- project:
-    name: centinel-csit-basic
-    jobs:
-      - inttest-csit-1node
-      - inttest-csit-verify-1node
-
-    # The project name
-    project: 'centinel'
-
-    # The functionality under test
-    functionality: 'basic'
-
-    # Project branches
-    stream:
-      - neon:
-          branch: 'master'
-      - fluorine:
-          branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: 'odl-restconf'
-
-    # Robot custom options
-    robot-options: ''
diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml
deleted file mode 100644 (file)
index fc12a57..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
----
-- project:
-    name: centinel-neon
-    jobs:
-      - odl-maven-jobs
-
-    stream: neon
-    project: 'centinel'
-    project-name: 'centinel'
-    branch: 'master'
-    mvn-settings: 'centinel-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[centinel]'
-
-    # Used by the release job
-    staging-profile-id: 96bf9b3fefd8a
-
-- project:
-    name: centinel-fluorine
-    jobs:
-      - odl-maven-jobs
-
-    stream: fluorine
-    project: 'centinel'
-    project-name: 'centinel'
-    branch: 'stable/fluorine'
-    mvn-settings: 'centinel-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[centinel]'
-
-    # Used by the release job
-    staging-profile-id: 96bf9b3fefd8a
-
-- project:
-    name: centinel-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'centinel'
-    project-name: 'centinel'
-    branch: 'stable/oxygen'
-    mvn-settings: 'centinel-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[centinel]'
-
-    # Used by the release job
-    staging-profile-id: 96bf9b3fefd8a
-
-- project:
-    name: centinel-sonar
-    jobs:
-      - gerrit-maven-sonar
-
-    project: 'centinel'
-    project-name: 'centinel'
-    branch: master
-    mvn-settings: 'centinel-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: centinel-view
-    views:
-      - project-view
-    project-name: centinel
index 7f6b1205e8063dff02cee158b4b9da56bf5be2dd..d5f3ad426030d74fe8aebb9f1b9b56c63a72dfef 100644 (file)
@@ -8,15 +8,15 @@
     install-features: 'odl-netvirt-coe'
     testplan: '{project}-container-networking.txt'
     tools_system_count: 5
-    tools_system_image: ZZCI - Ubuntu 16.04 - kubernetes - 20180723-235526.580
+    tools_system_image: ZZCI - Ubuntu 16.04 - kubernetes - 20190211-225526.126
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index c22ec726c7f9175cb68356f2fcabd37ebd97658b..11672aeb94c98ff989e993d3ddfd92a751d32989 100644 (file)
@@ -7,12 +7,12 @@
     project: 'coe'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     jdk: 'openjdk8'
 
index 8b01c9e56ca5c8b2082bb95ccd5d44cf8eec1bfa..4621f57cd02052bb210356d0ff68573e052c1362 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: coe-neon
+    name: coe-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
@@ -12,7 +12,7 @@
 
     project: 'coe'
     project-name: 'coe'
-    stream: neon
+    stream: sodium
     branch: 'master'
     mvn-settings: 'coe-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -24,7 +24,7 @@
     staging-profile-id: 96c0be46aac33
 
 - project:
-    name: coe-fluorine
+    name: coe-neon
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
@@ -36,8 +36,8 @@
 
     project: 'coe'
     project-name: 'coe'
-    stream: fluorine
-    branch: 'stable/fluorine'
+    stream: neon
+    branch: 'stable/neon'
     mvn-settings: 'coe-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -48,7 +48,7 @@
     staging-profile-id: 96c0be46aac33
 
 - project:
-    name: coe-oxygen
+    name: coe-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
@@ -60,8 +60,8 @@
 
     project: 'coe'
     project-name: 'coe'
-    stream: oxygen
-    branch: 'stable/oxygen'
+    stream: fluorine
+    branch: 'stable/fluorine'
     mvn-settings: 'coe-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
index 2b655baa6582b70bd6912cca0b55da38bfdd7de7..e47fa75302dc3d0f60675cb867b7143a1dc9399c 100644 (file)
     functionality: 'akka1'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - all:
index e0c41376e93c3d9b44697d2b8e0152a8a9f456cf..f5531d4cf984016ce4760c3c389f4a205e6f6464 100644 (file)
@@ -3,7 +3,6 @@
     name: controller-csit-clustering
     jobs:
       - inttest-csit-3node
-      - inttest-csit-verify-3node
 
     project: 'controller'
     functionality:
       - 'clustering-tell'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - all:
index 7397512ac038a9d542e7a00139c4caf456176a8c..c6751a3f2a84573f793e0a541cfe62b3140bfd3e 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index db10859a7bd9748b58d3084dcc977a41832646f5..ce92ead15b56d12681ab033d7ecd2f3fb11b2e7b 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index 250ce7da19cc298d378ab615a5592c326ecfe6f9..5bb582fe04e34a7496baa4d1d25b158f26cc8e21 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index 0aefef94dd6d8eb48f184c6fd5e9eb8044a3abcd..ef0ecc07ca9cd3c0d50f83dd97dffec8d147c418 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index 1239d74f6667f80c6e320cf37a7a065172072a58..b8bd04743bf41a92d34c9e87a001bc30b6bb8853 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index 6f95f90c47b96fb2948bb08d4483d1fe1b3344b2..4f2aad082810eac1ef1f87a9f0b6e5dce928925e 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index 9f14470e84f77e6d69956dc4f4582182aca12f2d..de95463be12b906bca67b1840dce799fe2a1021d 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - all:
@@ -29,7 +29,7 @@
         odl-mdsal-benchmark
 
     # Robot custom options
-    robot-options: '--exclude singlenode_setup'
+    robot-options: '--exclude singlenode_setup -v WARMUPS:1 -v RUNS:3'
 
     # ODL system image to use
     # The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough.
index b54e60c4ae0c3491e7d7c7c967172c385d89f6d4..16e29821f4e5b2c5617d385ef4e2a77f9c847684 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - all:
index a631e6282d62aa4fef3e040c35a9241d158c0ddf..d78dbdbad03fb989e9594d825b35d3cf3038ccc2 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - all:
index a1546a218aa08daacc23b88c97db1d725b2bd4b2..89fe12dc156a46e7acd48a819b0be48b28ae9215 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index a0890e13056d2ec6fe9a62a63611ebca40fbcc39..d9ea876b7d67432257005a2469c1e864d346785b 100644 (file)
@@ -7,15 +7,15 @@
     project: 'controller'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
+          os-branch: 'queens'
       - fluorine:
           branch: 'stable/fluorine'
           os-branch: 'queens'
-      - oxygen:
-          branch: 'stable/oxygen'
-          os-branch: 'queens'
 
     jdk: 'openjdk8'
 
index 0a16ec99ad9883c675f10003098d23aa6223f1a9..2115e9bbe726a97508ab162cca1b4c5ecfe1f2e7 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: controller-neon
+    name: controller-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -11,7 +11,7 @@
           rtd-token: b8440116c823a80c0fb0479eb7448a9196e6932f
       - odl-maven-jobs
 
-    stream: neon
+    stream: sodium
     project: 'controller'
     project-name: 'controller'
     branch: 'master'
@@ -27,7 +27,7 @@
     staging-profile-id: 96c1c9177efdd
 
 - project:
-    name: controller-fluorine
+    name: controller-neon
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
           rtd-token: b8440116c823a80c0fb0479eb7448a9196e6932f
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'controller'
     project-name: 'controller'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     mvn-settings: 'controller-settings'
     mvn-goals: 'clean deploy -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
     staging-profile-id: 96c1c9177efdd
 
 - project:
-    name: controller-oxygen
+    name: controller-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: controller
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-controller/48288/
+          rtd-token: b8440116c823a80c0fb0479eb7448a9196e6932f
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'controller'
     project-name: 'controller'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     mvn-settings: 'controller-settings'
     mvn-goals: 'clean deploy -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
deleted file mode 100644 (file)
index 98897a1..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
----
-- project:
-    name: coretutorials-neon
-    jobs:
-      - odl-maven-jobs
-
-    stream: neon
-    project: 'coretutorials'
-    project-name: 'coretutorials'
-    branch: 'master'
-    mvn-settings: 'coretutorials-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[coretutorials]'
-    build-timeout: 120
-
-    # Used by the release job
-    staging-profile-id: 96cd299563ec6
-
-- project:
-    name: coretutorials-fluorine
-    jobs:
-      - odl-maven-jobs
-
-    stream: fluorine
-    project: 'coretutorials'
-    project-name: 'coretutorials'
-    branch: 'stable/fluorine'
-    mvn-settings: 'coretutorials-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[coretutorials]'
-    build-timeout: 120
-
-    # Used by the release job
-    staging-profile-id: 96cd299563ec6
-
-- project:
-    name: coretutorials-oxygen
-    jobs:
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'coretutorials'
-    project-name: 'coretutorials'
-    branch: 'stable/oxygen'
-    mvn-settings: 'coretutorials-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[coretutorials]'
-    build-timeout: 120
-
-    # Used by the release job
-    staging-profile-id: 96cd299563ec6
-
-- project:
-    name: coretutorials-sonar
-    jobs:
-      - gerrit-maven-sonar
-
-    project: 'coretutorials'
-    project-name: 'coretutorials'
-    branch: master
-    mvn-settings: 'coretutorials-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    build-timeout: 120
-
-- project:
-    name: coretutorials-view
-    views:
-      - project-view
-    project-name: coretutorials
index 731844dea318efb09327c0648ef03025425f452e..e84f71cc5339c20001ca2ddf742b421fc533f2c4 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index bf041892ca6dbe24596ac07db4fb0a74a85ac0ff..6eb81685de50f7abb61be8d2db5654b07beb3343 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index 99057ec6fb5dc56681ef72d5f0b3f420b3c72890..c62c4b7943f9b301a764c91e2de93cd025eae969 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: daexim-neon
+    name: daexim-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
@@ -12,7 +12,7 @@
 
     project: 'daexim'
     project-name: 'daexim'
-    stream: neon
+    stream: sodium
     branch: 'master'
     mvn-settings: 'daexim-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -23,7 +23,7 @@
     staging-profile-id: 96e4dade34bd7
 
 - project:
-    name: daexim-fluorine
+    name: daexim-neon
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
@@ -35,8 +35,8 @@
 
     project: 'daexim'
     project-name: 'daexim'
-    stream: fluorine
-    branch: 'stable/fluorine'
+    stream: neon
+    branch: 'stable/neon'
     mvn-settings: 'daexim-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     staging-profile-id: 96e4dade34bd7
 
 - project:
-    name: daexim-oxygen
+    name: daexim-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: daexim
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
+          rtd-token: 76284f12638574f131cdccdf257d852d07c195fc
       - odl-maven-jobs
 
     project: 'daexim'
     project-name: 'daexim'
-    stream: oxygen
-    branch: 'stable/oxygen'
+    stream: fluorine
+    branch: 'stable/fluorine'
     mvn-settings: 'daexim-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
index 8f91a7f7b4ff7e733724e2f3d5ff98041c85aa01..95df192e1adf077704dee6b86ddd8050dd4f57eb 100644 (file)
     # CSIT images configuration
     openstack_queens_system_image: ZZCI - CentOS 7 - devstack-queens - 20181101-190143.891
     openstack_pike_system_image: ZZCI - CentOS 7 - devstack-pike - 20171208-1649
-    stack-template: csit-2-instance-type.yaml
-    docker_system_count: 1
-    docker_system_flavor: odl-standard-1
-    docker_system_image: ZZCI - CentOS 7 - docker - 20180723-235456.035
-    odl_system_count: 1
-    odl_system_flavor: odl-highcpu-4
-    odl_system_image: ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956
-    openstack_system_count: 1
-    openstack_system_flavor: odl-standard-4
-    openstack_system_image: ZZCI - CentOS 7 - devstack - 20180911-204116.460
-    openstack_system2_count: 0
-    openstack_system2_flavor: odl-standard-1
-    openstack_system2_image: ZZCI - CentOS 7 - devstack - 20180911-204116.460
-    tools_system_count: 1
-    tools_system_flavor: odl-highcpu-2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514
 
     # Default Robot framework options
     robot-options: ''
 
     # Data for csit-verify jobs
     # Branch for "last" version detection
-    verify-branch: stable/oxygen
+    verify-branch: stable/fluorine
     # Value for ODL_STREAM
-    verify-stream: oxygen
+    verify-stream: fluorine
     verify-karaf-version: karaf4
     verify-jdkversion: openjdk8
 
     10-exclude-value: ''
 
     # Manual CSIT job lists used by sanity or periodic in nature.
+    csit-high-frequency-list-sodium: >
+        netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-sodium
     csit-high-frequency-list-neon: >
         netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon
     csit-high-frequency-list-fluorine: >
         netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-fluorine
-    csit-high-frequency-list-oxygen: >
-        netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-oxygen
+    csit-sanity-list-sodium: >
+        openflowplugin-csit-1node-sanity-only-sodium,
+        distribution-sanity-sodium
     csit-sanity-list-neon: >
         openflowplugin-csit-1node-sanity-only-neon,
         distribution-sanity-neon
     csit-sanity-list-fluorine: >
         openflowplugin-csit-1node-sanity-only-fluorine,
         distribution-sanity-fluorine
-    csit-sanity-list-oxygen: >
-        openflowplugin-csit-1node-sanity-only-oxygen,
-        distribution-sanity-oxygen
+    csit-weekly-list-sodium: >
+        controller-csit-1node-notifications-longevity-only-sodium,
+        controller-csit-3node-drb-partnheal-longevity-only-sodium,
+        controller-csit-3node-drb-precedence-longevity-only-sodium,
+        controller-csit-3node-ddb-expl-lead-movement-longevity-only-sodium,
+        bgpcep-csit-3node-bgpclustering-longevity-only-sodium,
+        distribution-deploy-sodium,
+        distribution-offline-sodium,
+        openflowplugin-csit-1node-longevity-only-sodium
     csit-weekly-list-neon: >
         controller-csit-1node-notifications-longevity-only-neon,
         controller-csit-3node-drb-partnheal-longevity-only-neon,
         distribution-deploy-fluorine,
         distribution-offline-fluorine,
         openflowplugin-csit-1node-longevity-only-fluorine
-    csit-weekly-list-oxygen: >
-        controller-csit-1node-notifications-longevity-only-oxygen,
-        controller-csit-3node-drb-partnheal-longevity-only-oxygen,
-        controller-csit-3node-drb-precedence-longevity-only-oxygen,
-        controller-csit-3node-ddb-expl-lead-movement-longevity-only-oxygen,
-        bgpcep-csit-3node-bgpclustering-longevity-only-oxygen,
-        distribution-deploy-oxygen,
-        distribution-offline-oxygen,
-        openflowplugin-csit-1node-longevity-only-oxygen
diff --git a/jjb/didm/didm-csit-discovery.yaml b/jjb/didm/didm-csit-discovery.yaml
deleted file mode 100644 (file)
index 2c630ac..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
----
-- project:
-    name: didm-csit-discovery
-    jobs:
-      - inttest-csit-1node
-      - inttest-csit-verify-1node
-
-    # The project name
-    project: 'didm'
-
-    # The functionality under test
-    functionality: 'discovery'
-
-    # Project branches
-    stream:
-      - neon:
-          branch: 'master'
-      - fluorine:
-          branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-
-    install:
-      - only:
-          scope: 'only'
-
-    # Features to install
-    install-features: 'odl-restconf,odl-didm-all'
-
-    # Robot custom options
-    robot-options: ''
diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml
deleted file mode 100644 (file)
index baf62c4..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
----
-- project:
-    name: didm-neon
-    jobs:
-      - odl-maven-jobs
-
-    stream: neon
-    project: 'didm'
-    project-name: 'didm'
-    branch: 'master'
-    mvn-settings: 'didm-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[didm]'
-
-    # Used by the release job
-    staging-profile-id: 96e6338c870f5
-
-- project:
-    name: didm-fluorine
-    jobs:
-      - odl-maven-jobs
-
-    stream: fluorine
-    project: 'didm'
-    project-name: 'didm'
-    branch: 'stable/fluorine'
-    mvn-settings: 'didm-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[didm]'
-
-    # Used by the release job
-    staging-profile-id: 96e6338c870f5
-
-- project:
-    name: didm-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'didm'
-    project-name: 'didm'
-    branch: 'stable/oxygen'
-    mvn-settings: 'didm-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[didm]'
-
-    # Used by the release job
-    staging-profile-id: 96e6338c870f5
-
-- project:
-    name: didm-sonar
-    jobs:
-      - gerrit-maven-sonar
-    project: 'didm'
-    project-name: 'didm'
-    branch: 'master'
-    mvn-settings: 'didm-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: didm-view
-    views:
-      - project-view
-    project-name: didm
index d3aa75ecfa05e85b56152f9f50f3074b74e89201..fd9b0d9ee257bd50a0236edd3a8c080d97026ee0 100644 (file)
@@ -1,10 +1,10 @@
 ---
 - project:
-    name: dlux-neon
+    name: dlux-sodium
     jobs:
       - odl-maven-jobs
 
-    stream: neon
+    stream: sodium
     project: 'dlux'
     project-name: 'dlux'
     branch: 'master'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[dlux] [odlparent]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96e6a0327484f
 
 - project:
-    name: dlux-fluorine
+    name: dlux-neon
     jobs:
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'dlux'
     project-name: 'dlux'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     mvn-settings: 'dlux-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[dlux] [odlparent]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96e6a0327484f
 
 - project:
-    name: dlux-oxygen
+    name: dlux-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'dlux'
     project-name: 'dlux'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     mvn-settings: 'dlux-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[dlux] [odlparent]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96e6a0327484f
@@ -60,6 +62,7 @@
     branch: 'master'
     mvn-settings: 'dlux-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    disable-job: true
 
 - project:
     name: dlux-view
index 65f5c6f85880dbb7566e835b4f51f6c450422316..8fa8dd24eb44ec2c6f15fc669b398fd35410ad8e 100644 (file)
@@ -7,18 +7,19 @@
 
     # The project name
     project: 'dluxapps'
+    disable-job: true
 
     # The functionality under test
     functionality: 'yangman'
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - all:
index 14e23e2dfd65002e687655620fc21a40f56802bd..a478078d727abfd146d9dfb37035e71d192bba41 100644 (file)
@@ -1,55 +1,57 @@
 ---
 - project:
-    name: dluxapps-neon
+    name: dluxapps-sodium
     jobs:
       - odl-maven-jobs
 
     project: 'dluxapps'
     project-name: 'dluxapps'
-    stream: neon
+    stream: sodium
     branch: 'master'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'dluxapps-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96e6fb1e65bf9
 
 - project:
-    name: dluxapps-fluorine
+    name: dluxapps-neon
     jobs:
       - odl-maven-jobs
 
     project: 'dluxapps'
     project-name: 'dluxapps'
-    stream: fluorine
-    branch: 'stable/fluorine'
+    stream: neon
+    branch: 'stable/neon'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'dluxapps-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96e6fb1e65bf9
 
 - project:
-    name: dluxapps-oxygen
+    name: dluxapps-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     project: 'dluxapps'
     project-name: 'dluxapps'
-    stream: oxygen
-    branch: 'stable/oxygen'
+    stream: fluorine
+    branch: 'stable/fluorine'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'dluxapps-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96e6fb1e65bf9
index 53ed32f95cd24cd7fe9bb056a4e57c57951e1ad5..dcaeb7bfd980ffab5759c7a903419f6560f7fd58 100644 (file)
@@ -6,12 +6,12 @@
       - gerrit-tox-verify
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     project: docs
     project-name: docs
diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml
deleted file mode 100644 (file)
index be113bb..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
----
-- project:
-    name: eman-neon
-    jobs:
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: neon
-    project: 'eman'
-    project-name: 'eman'
-    branch: 'master'
-    mvn-settings: 'eman-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[eman]'
-    build-node: centos7-builder-4c-16g
-
-    # Used by the release job
-    staging-profile-id: 96e9352979521
-
-- project:
-    name: eman-fluorine
-    jobs:
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: fluorine
-    project: 'eman'
-    project-name: 'eman'
-    branch: 'stable/fluorine'
-    mvn-settings: 'eman-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[eman]'
-    build-node: centos7-builder-4c-16g
-
-    # Used by the release job
-    staging-profile-id: 96e9352979521
-
-- project:
-    name: eman-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'eman'
-    project-name: 'eman'
-    branch: 'stable/oxygen'
-    mvn-settings: 'eman-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[eman]'
-    build-node: centos7-builder-4c-16g
-
-    # Used by the release job
-    staging-profile-id: 96e9352979521
-
-- project:
-    name: eman-sonar
-    jobs:
-      - gerrit-maven-sonar
-    project: 'eman'
-    project-name: 'eman'
-    branch: 'master'
-    mvn-settings: 'eman-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: eman-view
-    views:
-      - project-view
-    project-name: eman
diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml
deleted file mode 100644 (file)
index 1cc73c3..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
----
-- project:
-    name: faas-neon
-    jobs:
-      - odl-maven-jobs
-
-    stream: neon
-    project: 'faas'
-    project-name: 'faas'
-    branch: 'master'
-    mvn-settings: 'faas-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[faas]'
-
-    # Used by the release job
-    staging-profile-id: 96f5ac591d858
-
-- project:
-    name: faas-fluorine
-    jobs:
-      - odl-maven-jobs
-
-    stream: fluorine
-    project: 'faas'
-    project-name: 'faas'
-    branch: 'stable/fluorine'
-    mvn-settings: 'faas-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[faas]'
-
-    # Used by the release job
-    staging-profile-id: 96f5ac591d858
-
-- project:
-    name: faas-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'faas'
-    project-name: 'faas'
-    branch: 'stable/oxygen'
-    mvn-settings: 'faas-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[faas]'
-
-    # Used by the release job
-    staging-profile-id: 96f5ac591d858
-
-- project:
-    name: faas-sonar
-    jobs:
-      - gerrit-maven-sonar
-    project: 'faas'
-    project-name: 'faas'
-    branch: 'master'
-    mvn-settings: 'faas-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: faas-view
-    views:
-      - project-view
-    project-name: faas
diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml
deleted file mode 100644 (file)
index 1769fe8..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
----
-- project:
-    name: federation-neon
-    jobs:
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    project: 'federation'
-    project-name: 'federation'
-    stream: neon
-    branch: 'master'
-    mvn-settings: 'federation-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[federation] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: 96f78c7a40a24
-
-- project:
-    name: federation-fluorine
-    jobs:
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    project: 'federation'
-    project-name: 'federation'
-    stream: fluorine
-    branch: 'stable/fluorine'
-    mvn-settings: 'federation-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[federation] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: 96f78c7a40a24
-
-- project:
-    name: federation-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    project: 'federation'
-    project-name: 'federation'
-    stream: oxygen
-    branch: 'stable/oxygen'
-    mvn-settings: 'federation-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[federation] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: 96f78c7a40a24
-
-- project:
-    name: federation-sonar
-    jobs:
-      - gerrit-maven-sonar
-
-    project: 'federation'
-    project-name: 'federation'
-    branch: 'master'
-    mvn-settings: 'federation-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: federation-view
-    views:
-      - project-view
-    project-name: federation
index 46315bb4b09d9bdde34ed71345342177d91a1428..1c3fe7def58692fac530d84ebfc5faa467e14bcc 100644 (file)
     testplan: '{project}-{functionality}.txt'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
@@ -46,8 +46,8 @@
       - fluorine:
           branch: 'master'
 
-    verify-stream: 'oxygen'
-    verify-branch: 'stable/oxygen'
+    verify-stream: 'neon'
+    verify-branch: 'stable/neon'
     verify-karaf-version: 'karaf4'
 
     install:
index 77067e5cb78b551cdb949ffa7448bca760d84fa1..716664463ad465ab34f8e84c30b42f7bf4bc92d6 100644 (file)
@@ -7,15 +7,15 @@
     project: 'genius'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
+          os-branch: 'queens'
       - fluorine:
           branch: 'stable/fluorine'
           os-branch: 'queens'
-      - oxygen:
-          branch: 'stable/oxygen'
-          os-branch: 'queens'
 
     jdk: 'openjdk8'
 
index 4036ef22cef63f6121736caa746a13d2946decf2..2e75ccf3be848a85288942ad47ecf9fa858a427e 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: genius-neon
+    name: genius-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
           rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f
       - odl-maven-jobs
 
-    stream: neon
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
+    stream: sodium
     project: 'genius'
     project-name: 'genius'
     branch: 'master'
@@ -31,7 +34,7 @@
     staging-profile-id: 96fb4b6d9d1ee
 
 - project:
-    name: genius-fluorine
+    name: genius-neon
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
           rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f
       - odl-maven-jobs
 
-    stream: fluorine
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
+    stream: neon
     project: 'genius'
     project-name: 'genius'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'genius-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -62,7 +68,7 @@
     staging-profile-id: 96fb4b6d9d1ee
 
 - project:
-    name: genius-oxygen
+    name: genius-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
           rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'genius'
     project-name: 'genius'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'genius-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 732faf41eecfd4210190392bb47318bfba7dbefd..26e52ffb9c3e381cb647981b1f3f1d925c088752 100644 (file)
@@ -6,6 +6,7 @@
 
     # The project name
     project: 'groupbasedpolicy'
+    disable-job: true
 
     topology:
       - 1node:
     functionality: 'openstack'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
           install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
       - fluorine:
           branch: 'stable/fluorine'
           install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
-      - oxygen:
-          branch: 'stable/oxygen'
-          install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
 
     openstack:
       - pike:
index 5589adb53cc981946f1fd51c3888ebac10c95ae8..90e9866ffe689bb04a89dda67e8df7c08cc9575f 100644 (file)
@@ -6,18 +6,19 @@
 
     # The project name
     project: 'groupbasedpolicy'
+    disable-job: true
 
     # The functionality under test
     functionality: '3-node'
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - all:
index 5779e1a1dfc34ba75b1864d9ed73bc71b067ec50..c955dbccf8be2feaa9b5c03ecd5bb019e7270ee4 100644 (file)
@@ -7,18 +7,19 @@
 
     # The project name
     project: 'groupbasedpolicy'
+    disable-job: true
 
     # The functionality under test
     functionality: '6node'
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - all:
index 10dbc33ad7b23f1340b857c0d09d888d60f4b681..6202a755beef6cd1d00b2e8ec4abca92b94e93e4 100644 (file)
@@ -7,18 +7,19 @@
 
     # The project name
     project: 'groupbasedpolicy'
+    disable-job: true
 
     # The functionality under test
     functionality: 'clustering'
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - all:
index 6a826d4746648029e82bda1b61eb9981c18b7d78..c80c65d248a34710465cc25aebbfd52877d1923c 100644 (file)
@@ -5,18 +5,19 @@
       - inttest-csit-1node
     # The project name
     project: 'groupbasedpolicy'
+    disable-job: true
 
     # The functionality under test
     functionality: 'sxp'
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index 25cbca1dc9b00f088e6d585210da657e3825ebaf..36b12ad69b7741a6b4fc2f3b7235d66c8605a304 100644 (file)
@@ -1,10 +1,10 @@
 ---
 - project:
-    name: groupbasedpolicy-neon
+    name: groupbasedpolicy-sodium
     jobs:
       - odl-maven-jobs
 
-    stream: neon
+    stream: sodium
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'master'
         sfc-merge-{stream},
         ovsdb-merge-{stream}
     email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96fbb93f95a76
 
 - project:
-    name: groupbasedpolicy-fluorine
+    name: groupbasedpolicy-neon
     jobs:
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean deploy findbugs:findbugs'
         sfc-merge-{stream},
         ovsdb-merge-{stream}
     email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96fbb93f95a76
 
 - project:
-    name: groupbasedpolicy-oxygen
+    name: groupbasedpolicy-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean deploy findbugs:findbugs'
@@ -71,6 +72,7 @@
         sfc-merge-{stream},
         ovsdb-merge-{stream}
     email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96fbb93f95a76
@@ -86,6 +88,7 @@
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean deploy findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    disable-job: true
 
 - project:
     name: groupbasedpolicy-view
index 659a5765527f5d883be8afeced29d28d5c32fbee..e3d869d73abc1eb435859d39d1bdbbaa3c5f0ca5 100644 (file)
@@ -1,10 +1,10 @@
 ---
 - project:
-    name: vbd-neon
+    name: vbd-sodium
     jobs:
       - odl-maven-jobs
 
-    stream: neon
+    stream: sodium
     project: 'honeycomb/vbd'
     project-name: 'vbd'
     branch: 'master'
     staging-profile-id: 96fc362c36862
 
 - project:
-    name: vbd-fluorine
+    name: vbd-neon
     jobs:
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'honeycomb/vbd'
     project-name: 'vbd'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     mvn-settings: 'honeycomb-vbd-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     staging-profile-id: 96fc362c36862
 
 - project:
-    name: vbd-oxygen
+    name: vbd-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'honeycomb/vbd'
     project-name: 'vbd'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     mvn-settings: 'honeycomb-vbd-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
index b584fff798d72c56743f40865683a0e6d113176b..f49c2d6c1cfb1dcb13c7f5cb7770612761fe51f7 100644 (file)
@@ -7,15 +7,15 @@
     project: 'infrautils'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
+          os-branch: 'queens'
       - fluorine:
           branch: 'stable/fluorine'
           os-branch: 'queens'
-      - oxygen:
-          branch: 'stable/oxygen'
-          os-branch: 'queens'
 
     jdk: 'openjdk8'
 
index 563eb54f694c76975d65e6893f9b79035c5ae694..c391f02a022f826a6388a51d26fecd32c36a254d 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: infrautils-neon
+    name: infrautils-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -12,7 +12,7 @@
           rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9
       - odl-maven-jobs
 
-    stream: neon
+    stream: sodium
     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'master'
@@ -25,7 +25,7 @@
     staging-profile-id: 96fca0367756c
 
 - project:
-    name: infrautils-fluorine
+    name: infrautils-neon
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
           rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'infrautils'
     project-name: 'infrautils'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     mvn-settings: 'infrautils-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
@@ -50,7 +50,7 @@
     staging-profile-id: 96fca0367756c
 
 - project:
-    name: infrautils-oxygen
+    name: infrautils-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
           rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'infrautils'
     project-name: 'infrautils'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     mvn-settings: 'infrautils-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
index e422a5b08dc84474a97474ac6867b8a6ea7cfe23..37a2200e59e19859eeb63dfe9dbc7a59bd144ad8 100644 (file)
@@ -1,5 +1,4 @@
 aaa-csit-1node-authn-all-fluorine,
-aaa-csit-1node-tls-only-fluorine,
 bgpcep-csit-1node-bgp-ingest-all-fluorine,
 bgpcep-csit-1node-bgp-ingest-mixed-all-fluorine,
 bgpcep-csit-1node-throughpcep-all-fluorine,
index 61a08907cb78fe51bc1f07f95502c60aeb268aa3..a003f9afa00b85035534a181bc088dccc0d188ea 100644 (file)
@@ -1,5 +1,4 @@
 aaa-csit-1node-authn-all-neon,
-aaa-csit-1node-tls-only-neon,
 bgpcep-csit-1node-bgp-ingest-all-neon,
 bgpcep-csit-1node-bgp-ingest-mixed-all-neon,
 bgpcep-csit-1node-throughpcep-all-neon,
@@ -60,4 +59,5 @@ ovsdb-csit-1node-upstream-southbound-all-neon,
 ovsdb-csit-3node-upstream-clustering-only-neon,
 sfc-csit-3node-docker-full-deploy-all-neon,
 sfc-csit-3node-rest-basic-all-neon,
+telemetry-csit-1node-basic-all-neon,
 yangtools-csit-1node-system-only-neon,
diff --git a/jjb/integration/csit-jobs-oxygen.lst b/jjb/integration/csit-jobs-oxygen.lst
deleted file mode 100644 (file)
index f6a99cd..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-aaa-csit-1node-authn-all-oxygen,
-aaa-csit-1node-tls-only-oxygen,
-alto-csit-1node-setup-all-oxygen,
-bgpcep-csit-1node-bgp-ingest-all-oxygen,
-bgpcep-csit-1node-bgp-ingest-mixed-all-oxygen,
-bgpcep-csit-1node-throughpcep-all-oxygen,
-bgpcep-csit-1node-userfeatures-all-oxygen,
-bgpcep-csit-3node-bgpclustering-all-oxygen,
-bgpcep-csit-3node-bgpclustering-ha-only-oxygen,
-bier-csit-1node-basic-all-oxygen,
-coe-csit-1node-container-networking-only-oxygen,
-controller-csit-1node-akka1-all-oxygen,
-controller-csit-1node-benchmark-all-oxygen,
-controller-csit-1node-rest-cars-perf-all-oxygen,
-controller-csit-3node-benchmark-all-oxygen,
-controller-csit-3node-clustering-ask-all-oxygen,
-controller-csit-3node-clustering-tell-all-oxygen,
-controller-csit-3node-rest-clust-cars-perf-ask-only-oxygen,
-controller-csit-3node-rest-clust-cars-perf-tell-only-oxygen,
-daexim-csit-1node-basic-only-oxygen,
-daexim-csit-3node-clustering-basic-only-oxygen,
-distribution-csit-1node-userfeatures-all-oxygen,
-distribution-csit-managed-oxygen,
-dluxapps-csit-1node-yangman-all-oxygen,
-genius-csit-1node-upstream-only-oxygen,
-genius-csit-3node-upstream-only-oxygen,
-groupbasedpolicy-csit-1node-3-node-all-oxygen,
-groupbasedpolicy-csit-1node-6node-all-oxygen,
-groupbasedpolicy-csit-1node-sxp-only-oxygen,
-groupbasedpolicy-csit-3node-clustering-all-oxygen,
-l2switch-csit-1node-host-scalability-daily-only-oxygen,
-l2switch-csit-1node-scalability-all-oxygen,
-l2switch-csit-1node-switch-all-oxygen,
-lispflowmapping-csit-1node-msmr-all-oxygen,
-lispflowmapping-csit-1node-performance-only-oxygen,
-lispflowmapping-csit-3node-msmr-all-oxygen,
-mdsal-csit-1node-bindingv1-only-oxygen,
-nemo-csit-1node-engine-all-oxygen,
-netconf-csit-1node-callhome-only-oxygen,
-netconf-csit-1node-scale-only-oxygen,
-netconf-csit-1node-userfeatures-all-oxygen,
-netconf-csit-3node-clustering-only-oxygen,
-netconf-csit-3node-clustering-scale-only-oxygen,
-netvirt-csit-1node-0cmb-1ctl-1cmp-openstack-queens-sfc-oxygen,
-netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-upstream-snat-conntrack-oxygen,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-oxygen,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-oxygen,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-oxygen,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-oxygen,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-snat-conntrack-oxygen,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-oxygen,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-oxygen,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-oxygen,
-netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-oxygen,
-netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-oxygen,
-openflowplugin-csit-1node-bundle-based-reconciliation-all-oxygen,
-openflowplugin-csit-1node-cbench-only-oxygen,
-openflowplugin-csit-1node-flow-services-all-oxygen,
-openflowplugin-csit-1node-perf-bulkomatic-only-oxygen,
-openflowplugin-csit-1node-perf-stats-collection-only-oxygen,
-openflowplugin-csit-1node-scale-link-only-oxygen,
-openflowplugin-csit-1node-scale-only-oxygen,
-openflowplugin-csit-1node-scale-switch-only-oxygen,
-openflowplugin-csit-3node-clustering-bulkomatic-only-oxygen,
-openflowplugin-csit-3node-clustering-only-oxygen,
-openflowplugin-csit-3node-clustering-perf-bulkomatic-only-oxygen,
-ovsdb-csit-1node-upstream-southbound-all-oxygen,
-ovsdb-csit-3node-upstream-clustering-only-oxygen,
-packetcable-csit-1node-pcmm-all-oxygen,
-sfc-csit-3node-docker-full-deploy-all-oxygen,
-sfc-csit-3node-rest-basic-all-oxygen,
-sxp-csit-1node-basic-all-oxygen,
-sxp-csit-1node-filtering-all-oxygen,
-sxp-csit-1node-performance-all-oxygen,
-sxp-csit-1node-topology-all-oxygen,
-sxp-csit-3node-clustering-all-oxygen,
-sxp-csit-3node-routing-all-oxygen,
-tsdr-csit-1node-cassandra-datastore-only-oxygen,
-tsdr-csit-1node-elasticsearch-datastore-only-oxygen,
-tsdr-csit-1node-hbase-datastore-all-oxygen,
-tsdr-csit-1node-hsqldb-datastore-all-oxygen,
-usc-csit-1node-tcp-all-oxygen,
-yangtools-csit-1node-system-only-oxygen,
diff --git a/jjb/integration/csit-jobs-sodium.lst b/jjb/integration/csit-jobs-sodium.lst
new file mode 100644 (file)
index 0000000..7b7e06b
--- /dev/null
@@ -0,0 +1,61 @@
+aaa-csit-1node-authn-all-sodium,
+bgpcep-csit-1node-bgp-ingest-all-sodium,
+bgpcep-csit-1node-bgp-ingest-mixed-all-sodium,
+bgpcep-csit-1node-throughpcep-all-sodium,
+bgpcep-csit-1node-userfeatures-all-sodium,
+bgpcep-csit-3node-bgpclustering-all-sodium,
+bgpcep-csit-3node-bgpclustering-ha-only-sodium,
+coe-csit-1node-container-networking-only-sodium,
+controller-csit-1node-akka1-all-sodium,
+controller-csit-1node-benchmark-all-sodium,
+controller-csit-1node-rest-cars-perf-all-sodium,
+controller-csit-3node-benchmark-all-sodium,
+controller-csit-3node-clustering-ask-all-sodium,
+controller-csit-3node-clustering-tell-all-sodium,
+controller-csit-3node-rest-clust-cars-perf-ask-only-sodium,
+controller-csit-3node-rest-clust-cars-perf-tell-only-sodium,
+daexim-csit-1node-basic-only-sodium,
+daexim-csit-3node-clustering-basic-only-sodium,
+distribution-csit-1node-userfeatures-all-sodium,
+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,
+mdsal-csit-1node-bindingv1-only-sodium,
+netconf-csit-1node-callhome-only-sodium,
+netconf-csit-1node-scale-only-sodium,
+netconf-csit-1node-userfeatures-all-sodium,
+netconf-csit-3node-clustering-only-sodium,
+netconf-csit-3node-clustering-scale-only-sodium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-upstream-snat-conntrack-sodium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-sfc-sodium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-snat-conntrack-sodium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-sodium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-sodium,
+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-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-snat-conntrack-sodium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-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,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-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,
+openflowplugin-csit-1node-perf-stats-collection-only-sodium,
+openflowplugin-csit-1node-scale-link-only-sodium,
+openflowplugin-csit-1node-scale-only-sodium,
+openflowplugin-csit-1node-scale-switch-only-sodium,
+openflowplugin-csit-3node-clustering-bulkomatic-only-sodium,
+openflowplugin-csit-3node-clustering-only-sodium,
+openflowplugin-csit-3node-clustering-perf-bulkomatic-only-sodium,
+ovsdb-csit-1node-upstream-southbound-all-sodium,
+ovsdb-csit-3node-upstream-clustering-only-sodium,
+sfc-csit-3node-docker-full-deploy-all-sodium,
+sfc-csit-3node-rest-basic-all-sodium,
+telemetry-csit-1node-basic-all-sodium,
+yangtools-csit-1node-system-only-sodium,
index 36bbfd705d6075366f51cfdc7768e4bf5199f073..6ab50cfb389161cf82ca817635beb5ce7ae02033 100644 (file)
@@ -55,7 +55,10 @@ cat "${MEMCONF}"
 echo "Listing all open ports on controller system"
 netstat -pnatu
 
-if [ "${JDKVERSION}" == 'openjdk8' ]; then
+if [ "$JDKVERSION" == 'openjdk11' ]; then
+    echo "Preparing for JRE Version 11"
+    JAVA_HOME="/opt/jdk-11"
+elif [ "${JDKVERSION}" == 'openjdk8' ]; then
     echo "Setting the JRE Version to 8"
     # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start.
     # sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.60-2.b27.el7_1.x86_64/jre/bin/java
index 1381e246b30d37cf4159e23d63d8fe4d29254567..8bb89d2a9ffafe0006d1c98ea5153c35192c35a7 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - all:
index 9c2b14ea3d82ec4900bcef974c97c13002196f74..3f7646034f2741660a9a36e5f837b208523d89e6 100644 (file)
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     email-upstream: '[int/dist]'
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           karaf-version: odl
           # Self-Managed projects repos and features:
           sm-repos: >
-              mvn:org.opendaylight.sxp/features-sxp//xml/features,
-              mvn:org.opendaylight.telemetry/features-telemetry//xml/features,
-              mvn:org.opendaylight.tsdr/features-tsdr//xml/features
+              mvn:org.opendaylight.telemetry/features-telemetry//xml/features
           sm-features: >
-              odl-sxp-routing,
               odl-telemetry-collector,
               odl-telemetry-configurator,
-              odl-telemetry-all,
-              odl-tsdr-core,
-              odl-tsdr-openflow-statistics-collector,
-              odl-tsdr-netflow-statistics-collector,
-              odl-tsdr-restconf-collector,
-              odl-tsdr-syslog-collector,
-              odl-tsdr-controller-metrics-collector,
-              odl-tsdr-cassandra,
-              odl-tsdr-hbase,
-              odl-tsdr-hsqldb,
-              odl-tsdr-elasticsearch
+              odl-telemetry-all
+      - neon:
+          branch: 'stable/neon'
+          karaf-version: odl
+          # Self-Managed projects repos and features:
+          sm-repos: >
+              mvn:org.opendaylight.transportpce/features-transportpce//xml/features
+          sm-features: >
+              odl-transportpce,
+              odl-transportpce-api,
+              odl-transportpce-ordmodels
       - fluorine:
           branch: 'stable/fluorine'
           karaf-version: odl
           # Self-Managed projects repos and features:
           sm-repos: >
-              mvn:org.opendaylight.sxp/features-sxp//xml/features,
-              mvn:org.opendaylight.transportpce/features-transportpce//xml/features,
+              mvn:org.opendaylight.transportpce/features-transportpce//xml/features
           sm-features: >
-              odl-sxp-routing,
               odl-transportpce,
               odl-transportpce-api,
               odl-transportpce-ordmodels,
               odl-transportpce-stubmodels
 
-      - oxygen:
-          branch: 'stable/oxygen'
-          karaf-version: karaf4
-
 - project:
     name: distribution-managed
     jobs:
@@ -82,7 +73,7 @@
     dist-pom: 'distribution/pom.xml'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           dependencies: >
               aaa-merge-{stream},
               ovsdb-merge-{stream},
               serviceutils-merge-{stream},
               sfc-merge-{stream}
-      - fluorine:
-          branch: 'stable/fluorine'
+      - neon:
+          branch: 'stable/neon'
           dependencies: >
               aaa-merge-{stream},
               bgpcep-merge-{stream},
               ovsdb-merge-{stream},
               serviceutils-merge-{stream},
               sfc-merge-{stream}
-
-      - oxygen:
-          branch: 'stable/oxygen'
+      - fluorine:
+          branch: 'stable/fluorine'
           dependencies: >
               aaa-merge-{stream},
-              alto-merge-{stream},
               bgpcep-merge-{stream},
-              bier-merge-{stream},
               coe-merge-{stream},
               controller-merge-{stream},
               daexim-merge-{stream},
-              dluxapps-merge-{stream},
-              dlux-merge-{stream},
-              faas-merge-{stream},
               genius-merge-{stream},
-              groupbasedpolicy-merge-{stream},
               infrautils-merge-{stream},
-              jsonrpc-merge-{stream},
-              l2switch-merge-{stream},
               lispflowmapping-merge-{stream},
               mdsal-merge-{stream},
-              nemo-merge-{stream},
               netconf-merge-{stream},
-              netvirt-merge-{stream},
+              netvirt-merge-{stream}
               neutron-merge-{stream},
-              of-config-merge-{stream},
               openflowplugin-merge-{stream},
               ovsdb-merge-{stream},
-              p4plugin-merge-{stream},
-              packetcable-merge-{stream},
               serviceutils-merge-{stream},
-              sfc-merge-{stream},
-              snmp4sdn-merge-{stream},
-              snmp-merge-{stream},
-              sxp-merge-{stream},
-              tsdr-merge-{stream},
-              usc-merge-{stream},
-              vbd-merge-{stream}
+              sfc-merge-{stream}
 
 - project:
     name: distribution-full
     dist-pom: 'distribution/opendaylight/pom.xml'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
-              sxp-merge-{stream},
-              telemetry-merge-{stream},
-              tsdr-merge-{stream},
-              unimgr-merge-{stream},
+              telemetry-merge-{stream}
+      - neon:
+          branch: 'stable/neon'
+          karaf-version: odl
+          dependencies: >
+              distribution-merge-managed-{stream},
+              transportpce-merge-{stream}
       - fluorine:
           branch: 'stable/fluorine'
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
-              snmp4sdn-merge-{stream},
-              sxp-merge-{stream},
-              transportpce-merge-{stream},
-              tsdr-merge-{stream},
-              unimgr-merge-{stream},
+              transportpce-merge-{stream}
 
 - project:
     name: distribution-release
       - gerrit-maven-stage:
           sign-artifacts: true
           mvn-central: true
-          ossrh-profile-id: 7edbe315063867
+          ossrh-profile-id: 6386ebbbf3a563
 
     project: 'integration/distribution'
     project-name: 'distribution'
     staging-profile-id: 2af042ed81d5e2
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
 
+      - neon:
+          branch: 'stable/neon'
+
       - fluorine:
           branch: 'stable/fluorine'
 
index 195bfc0c1cfa7d75715f55190399ad56ea454521..054d441c6961e42cec1a901e85b0ca15b5e13d53 100644 (file)
@@ -15,6 +15,7 @@
     # plus the change of block_on_csit to true, and this failure-threshold: 'UNSTABLE' will take
     # effect
     failure-threshold: 'UNSTABLE'
+    disable-job: false
 
     #####################
     # Job Configuration #
@@ -23,7 +24,7 @@
     # Operation: This job template builds a patch, creates a distribution containing
     #            the patch (making sure dependencies are specified),
     #            and performs the distribution deploy test.
-    disabled: false
+    disabled: '{disable-job}'
 
     project-type: freestyle
     node: 'centos7-builder-8c-8g'
 - job-template:
     name: 'distribution-verify-{type}-{stream}'
 
+    disable-job: 'false'
+
     project-type: freestyle
     node: centos7-builder-8c-8g
     concurrent: true
     jdk: '{java-version}'
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
     # separate lifecycle:
     #     https://issues.apache.org/jira/browse/MNG-5666
 
+    disable-job: false
+
     project-type: maven
     node: 'centos7-builder-8c-8g'
     jdk: '{java-version}'
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
     ######################
     # Default parameters #
     ######################
-
+    disable-job: false
     mvn-version: mvn35
 
     #####################
     #####################
 
     # Like a {project}-distribution-check, but few steps less as there is no upstream project involved.
-    disabled: false
+    disabled: '{disable-job}'
 
     project-type: freestyle
     node: 'centos7-builder-8c-8g'
     # Operation: This job deploys odl-integration-all.
     # This job works for just managed distro.
 
+    disable-job: false
+
     project-type: freestyle
     node: centos7-builder-4c-4g
     concurrent: false
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
index eb2df1c06e9e466483eb180ea91ea6655b15f91f..87ad52100927df5cef44ad2c5e9b2f6e0283d0eb 100644 (file)
@@ -47,9 +47,8 @@ NEW_DISTRO="$(find $WORKSPACE -name "${KARAF_ARTIFACT}*.zip")"
 NEW_DISTRO_BASENAME="$(basename "$NEW_DISTRO")"
 cp $NEW_DISTRO /tmp/
 cd /tmp/ || exit
-# get the name of the folder which will be extracted to
-EXTRACTED_FOLDER=$(unzip $NEW_DISTRO_BASENAME | grep 'creating:' | grep -v '/.' | cut -d' ' -f5-)
-mv $EXTRACTED_FOLDER distro_new
+unzip $NEW_DISTRO_BASENAME
+mv $BUNDLEFOLDER distro_new
 
 git clone https://git.opendaylight.org/gerrit/p/integration/test.git
 cd test/tools/distchanges || exit
index afc86d26eec2183ebba46f9237f7e62380f347ad..74e484acc0d1c5332dc312226341d078d01cc5d4 100644 (file)
@@ -852,6 +852,8 @@ for i in `seq 1 ${NUM_OPENSTACK_CONTROL_NODES}`; do
     fi
     fix_libvirt_python_build ${!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'"
     ssh ${!CONTROLIP} "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &"
     ssh ${!CONTROLIP} "ps -ef | grep stack.sh"
     ssh ${!CONTROLIP} "ls -lrt /opt/stack/devstack/nohup.out"
index 5c5a74e315dc6b974d9f2a7a09008be3442a709d..75e389d977f970af708eda7f4f26bc4d248e9565 100644 (file)
@@ -45,11 +45,6 @@ pip install --upgrade pyangbind
 # Module for iso8601 datetime format
 pip install --upgrade isodate
 
-# Modules for tornado and jsonpointer used by client libraries of IoTDM project
-# Note: Could be removed when client running on tools VM is used instead
-#       of client libraries only.
-pip install --upgrade tornado jsonpointer
-
 # Module for TemplatedRequests.robot library
 pip install --upgrade jmespath
 
diff --git a/jjb/integration/integration-macros-heat.yaml b/jjb/integration/integration-macros-heat.yaml
new file mode 100644 (file)
index 0000000..87cb7f3
--- /dev/null
@@ -0,0 +1,199 @@
+---
+################
+# Stack 2 Type #
+################
+
+# The parameter and builder macros are meant to be used together. Job templates
+# that want to use the Stack 2 Type must declare both the parameter and builder
+# component.
+
+- parameter:
+    name: integration-stack-2-type
+    parameters:
+      - string:
+          name: VM_0_COUNT
+          default: '{vm_0_count}'
+          description: 'Number of systems to spawn for vm 0'
+      - string:
+          name: VM_0_FLAVOR
+          default: '{vm_0_flavor}'
+          description: 'VM flavor to use for vm 0'
+      - string:
+          name: VM_0_IMAGE
+          default: '{vm_0_image}'
+          description: 'VM image to use for vm 0'
+      - string:
+          name: VM_1_COUNT
+          default: '{vm_1_count}'
+          description: 'Number of systems to spawn for vm 1'
+      - string:
+          name: VM_1_FLAVOR
+          default: '{vm_1_flavor}'
+          description: 'VM flavor to use for vm 1'
+      - string:
+          name: VM_1_IMAGE
+          default: '{vm_1_image}'
+          description: 'VM image to use for vm 1'
+
+- builder:
+    name: integration-stack-2-type
+    builders:
+      - lf-stack-create:
+          openstack-cloud: '{openstack-cloud}'
+          openstack-heat-template: '{openstack-heat-template}'
+          openstack-heat-template-dir: '{openstack-heat-template-dir}'
+          openstack-heat-parameters: |
+              vm_0_count: '$VM_0_COUNT'
+              vm_0_flavor: '$VM_0_FLAVOR'
+              vm_0_image: '$VM_0_IMAGE'
+              vm_1_count: '$VM_1_COUNT'
+              vm_1_flavor: '$VM_1_FLAVOR'
+              vm_1_image: '$VM_1_IMAGE'
+
+################
+# Stack 3 Type #
+################
+
+# The parameter and builder macros are meant to be used together. Job templates
+# that want to use the Stack 3 Type must declare both the parameter and builder
+# component.
+
+- parameter:
+    name: integration-stack-3-type
+    parameters:
+      - string:
+          name: VM_0_COUNT
+          default: '{vm_0_count}'
+          description: 'Number of systems to spawn for vm 0'
+      - string:
+          name: VM_0_FLAVOR
+          default: '{vm_0_flavor}'
+          description: 'VM flavor to use for vm 0'
+      - string:
+          name: VM_0_IMAGE
+          default: '{vm_0_image}'
+          description: 'VM image to use for vm 0'
+      - string:
+          name: VM_1_COUNT
+          default: '{vm_1_count}'
+          description: 'Number of systems to spawn for vm 1'
+      - string:
+          name: VM_1_FLAVOR
+          default: '{vm_1_flavor}'
+          description: 'VM flavor to use for vm 1'
+      - string:
+          name: VM_1_IMAGE
+          default: '{vm_1_image}'
+          description: 'VM image to use for vm 1'
+      - string:
+          name: VM_2_COUNT
+          default: '{vm_2_count}'
+          description: 'Number of systems to spawn for vm 2'
+      - string:
+          name: VM_2_FLAVOR
+          default: '{vm_2_flavor}'
+          description: 'VM flavor to use for vm 2'
+      - string:
+          name: VM_2_IMAGE
+          default: '{vm_2_image}'
+          description: 'VM image to use for vm 2'
+
+- builder:
+    name: integration-stack-3-type
+    builders:
+      - lf-stack-create:
+          openstack-cloud: '{openstack-cloud}'
+          openstack-heat-template: '{openstack-heat-template}'
+          openstack-heat-template-dir: '{openstack-heat-template-dir}'
+          openstack-heat-parameters: |
+              vm_0_count: '$VM_0_COUNT'
+              vm_0_flavor: '$VM_0_FLAVOR'
+              vm_0_image: '$VM_0_IMAGE'
+              vm_1_count: '$VM_1_COUNT'
+              vm_1_flavor: '$VM_1_FLAVOR'
+              vm_1_image: '$VM_1_IMAGE'
+              vm_2_count: '$VM_2_COUNT'
+              vm_2_flavor: '$VM_2_FLAVOR'
+              vm_2_image: '$VM_2_IMAGE'
+
+################
+# Stack 4 Type #
+################
+
+# The parameter and builder macros are meant to be used together. Job templates
+# that want to use the Stack 4 Type must declare both the parameter and builder
+# component.
+
+- parameter:
+    name: integration-stack-4-type
+    parameters:
+      - string:
+          name: VM_0_COUNT
+          default: '{vm_0_count}'
+          description: 'Number of systems to spawn for vm 0'
+      - string:
+          name: VM_0_FLAVOR
+          default: '{vm_0_flavor}'
+          description: 'VM flavor to use for vm 0'
+      - string:
+          name: VM_0_IMAGE
+          default: '{vm_0_image}'
+          description: 'VM image to use for vm 0'
+      - string:
+          name: VM_1_COUNT
+          default: '{vm_1_count}'
+          description: 'Number of systems to spawn for vm 1'
+      - string:
+          name: VM_1_FLAVOR
+          default: '{vm_1_flavor}'
+          description: 'VM flavor to use for vm 1'
+      - string:
+          name: VM_1_IMAGE
+          default: '{vm_1_image}'
+          description: 'VM image to use for vm 1'
+      - string:
+          name: VM_2_COUNT
+          default: '{vm_2_count}'
+          description: 'Number of systems to spawn for vm 2'
+      - string:
+          name: VM_2_FLAVOR
+          default: '{vm_2_flavor}'
+          description: 'VM flavor to use for vm 2'
+      - string:
+          name: VM_2_IMAGE
+          default: '{vm_2_image}'
+          description: 'VM image to use for vm 2'
+      - string:
+          name: VM_3_COUNT
+          default: '{vm_3_count}'
+          description: 'Number of systems to spawn for vm 3'
+      - string:
+          name: VM_3_FLAVOR
+          default: '{vm_3_flavor}'
+          description: 'VM flavor to use for vm 3'
+      - string:
+          name: VM_3_IMAGE
+          default: '{vm_3_image}'
+          description: 'VM image to use for vm 3'
+
+
+- builder:
+    name: integration-stack-4-type
+    builders:
+      - lf-stack-create:
+          openstack-cloud: '{openstack-cloud}'
+          openstack-heat-template: '{openstack-heat-template}'
+          openstack-heat-template-dir: '{openstack-heat-template-dir}'
+          openstack-heat-parameters: |
+              vm_0_count: '$VM_0_COUNT'
+              vm_0_flavor: '$VM_0_FLAVOR'
+              vm_0_image: '$VM_0_IMAGE'
+              vm_1_count: '$VM_1_COUNT'
+              vm_1_flavor: '$VM_1_FLAVOR'
+              vm_1_image: '$VM_1_IMAGE'
+              vm_2_count: '$VM_2_COUNT'
+              vm_2_flavor: '$VM_2_FLAVOR'
+              vm_2_image: '$VM_2_IMAGE'
+              vm_3_count: '$VM_3_COUNT'
+              vm_3_flavor: '$VM_3_FLAVOR'
+              vm_3_image: '$VM_3_IMAGE'
index b533504f12e72fa5de9816f4dc1e223a1d1e8168..b9e448a037128fde0800b03266154778bb5bc2a8 100644 (file)
 # Shell Scripts #
 #################
 
-# Macro: integration-infra-stack
-# Operation: Sets environment and then calls opendaylight-infra-stack to spin
-#            up csit lab using openstack-heat.
-# Used by: {project}-csit-* job templates
-
-- builder:
-    name: integration-infra-stack
-    builders:
-      - integration-cleanup-workspace
-      - shell: |
-          #!/bin/bash
-          # Setup openstack envirnoment file for use by
-          # the opendaylight-infra-stack macro
-          cat > $WORKSPACE/opendaylight-infra-environment.yaml << EOF
-          parameters:
-              vm_0_count: {vm_0_count}
-              vm_0_flavor: {vm_0_flavor}
-              vm_0_image: {vm_0_image}
-              vm_1_count: {vm_1_count}
-              vm_1_flavor: {vm_1_flavor}
-              vm_1_image: {vm_1_image}
-          EOF
-          echo "Contents of opendaylight-infra-environment.yaml ..."
-          cat $WORKSPACE/opendaylight-infra-environment.yaml
-      - opendaylight-infra-stack:
-          stack-template: '{stack-template}'
-
-# Macro: integration-infra-stack-3-type
-# Operation: Sets environment and then calls opendaylight-infra-stack to spin
-#            up csit lab using openstack-heat.
-# Used by: {project}-csit-* job templates
-
-- builder:
-    name: integration-infra-stack-3-type
-    builders:
-      - integration-cleanup-workspace
-      - shell: |
-          #!/bin/bash
-          # Setup openstack envirnoment file for use by
-          # the opendaylight-infra-stack macro
-          cat > $WORKSPACE/opendaylight-infra-environment.yaml << EOF
-          parameters:
-              vm_0_count: {vm_0_count}
-              vm_0_flavor: {vm_0_flavor}
-              vm_0_image: {vm_0_image}
-              vm_1_count: {vm_1_count}
-              vm_1_flavor: {vm_1_flavor}
-              vm_1_image: {vm_1_image}
-              vm_2_count: {vm_2_count}
-              vm_2_flavor: {vm_2_flavor}
-              vm_2_image: {vm_2_image}
-          EOF
-          echo "Contents of opendaylight-infra-environment.yaml ..."
-          cat $WORKSPACE/opendaylight-infra-environment.yaml
-      - opendaylight-infra-stack:
-          stack-template: 'csit-3-instance-type.yaml'
-
-# Macro: integration-apex-stack-3-type
-# Operation: Sets environment and then calls opendaylight-apex-stack to spin
-#            up csit lab using openstack-heat.
-# Used by: {project}-csit-* apex related job templates
-
-- builder:
-    name: integration-apex-stack-3-type
-    builders:
-      - integration-cleanup-workspace
-      - shell: |
-          #!/bin/bash
-          # Setup openstack envirnoment file for use by
-          # the opendaylight-infra-stack macro
-          cat > $WORKSPACE/opendaylight-infra-environment.yaml << EOF
-          parameters:
-              vm_0_count: {vm_0_count}
-              vm_0_flavor: {vm_0_flavor}
-              vm_0_image: {vm_0_image}
-              vm_1_count: {vm_1_count}
-              vm_1_flavor: {vm_1_flavor}
-              vm_1_image: {vm_1_image}
-              vm_2_count: {vm_2_count}
-              vm_2_flavor: {vm_2_flavor}
-              vm_2_image: {vm_2_image}
-          EOF
-          echo "Contents of opendaylight-infra-environment.yaml ..."
-          cat $WORKSPACE/opendaylight-infra-environment.yaml
-      - opendaylight-apex-stack:
-          stack-template: 'csit-apex-3-instance-type.yaml'
-
-# Macro: integration-infra-stack-4-type
-# Operation: Sets environment and then calls opendaylight-infra-stack to spin
-#            up csit lab using openstack-heat.
-# Used by: {project}-csit-* job templates
-
-- builder:
-    name: integration-infra-stack-4-type
-    builders:
-      - integration-cleanup-workspace
-      - shell: |
-          #!/bin/bash
-          # Setup openstack envirnoment file for use by
-          # the opendaylight-infra-stack macro
-          cat > $WORKSPACE/opendaylight-infra-environment.yaml << EOF
-          parameters:
-              vm_0_count: {vm_0_count}
-              vm_0_flavor: {vm_0_flavor}
-              vm_0_image: {vm_0_image}
-              vm_1_count: {vm_1_count}
-              vm_1_flavor: {vm_1_flavor}
-              vm_1_image: {vm_1_image}
-              vm_2_count: {vm_2_count}
-              vm_2_flavor: {vm_2_flavor}
-              vm_2_image: {vm_2_image}
-              vm_3_count: {vm_3_count}
-              vm_3_flavor: {vm_3_flavor}
-              vm_3_image: {vm_3_image}
-          EOF
-          echo "Contents of opendaylight-infra-environment.yaml ..."
-          cat $WORKSPACE/opendaylight-infra-environment.yaml
-      - opendaylight-infra-stack:
-          stack-template: 'csit-4-instance-type.yaml'
-
 # Macro: integration-get-apex-addresses
 # Operation: this macro gets the IP addresses of the dynamic vms from apex snapshots
 # Used by: {project}-csit-* apex related job templates
index 93cd0eb99537f42d0dc0843d20915cb8b354d765..afb76221d484f840834a04884cb278e1a0108c97 100644 (file)
@@ -1,3 +1,4 @@
+#!/bin/bash
 
 if [[ "$KARAF_VERSION" == "odl" ]]; then
     KARAF_ARTIFACT="opendaylight"
@@ -7,7 +8,10 @@ else
     KARAF_ARTIFACT="karaf"
 fi
 
-if [ "$JDKVERSION" == 'openjdk8' ]; then
+if [ "$JDKVERSION" == 'openjdk11' ]; then
+    echo "Preparing for JRE Version 11"
+    JAVA_HOME="/opt/jdk-11"
+elif [ "$JDKVERSION" == 'openjdk8' ]; then
     echo "Preparing for JRE Version 8"
     JAVA_HOME="/usr/lib/jvm/java-1.8.0"
 elif [ "$JDKVERSION" == 'openjdk7' ]; then
index 5d453e9df91db80c3a3fd22692d21ff20ff5402d..ef6157e41f7d94ec9d40d774dd90e38407c537cc 100644 (file)
     id: inttest-csit-verify-1node
     <<: *inttest_csit_common
 
+    #####################
+    # Default variables #
+    #####################
+
+    openstack-cloud: vex
+    openstack-heat-template: csit-2-instance-type.yaml
+    openstack-heat-template-dir: openstack-hot
+
+    odl_system_flavor: 'odl-highcpu-4'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
+    tools_system_count: 1
+    tools_system_flavor: 'odl-highcpu-2'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
+
+    #####################
+    # Job configuration #
+    #####################
+
     parameters:
       - integration-csit-parameters:
           archive-artifacts: '{archive-artifacts}'
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: 'True'
+      - integration-stack-2-type:
+          vm_0_count: 1
+          vm_0_flavor: '{odl_system_flavor}'
+          vm_0_image: '{odl_system_image}'
+          vm_1_count: '{tools_system_count}'
+          vm_1_flavor: '{tools_system_flavor}'
+          vm_1_image: '{tools_system_image}'
       - integration-distribution-branch:
           branch: '{verify-branch}'
       - integration-distribution-stream:
 
     builders:
       - lf-infra-pre-build
-      - integration-infra-stack:
-          stack-template: '{stack-template}'
-          vm_0_count: '1'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{tools_system_count}'
-          vm_1_flavor: '{tools_system_flavor}'
-          vm_1_image: '{tools_system_image}'
+      - integration-stack-2-type:
+          openstack-cloud: '{openstack-cloud}'
+          openstack-heat-template: '{openstack-heat-template}'
+          openstack-heat-template-dir: '{openstack-heat-template-dir}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
           robot_other_files: ''
           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
+      - lf-stack-delete:
+          openstack-cloud: '{openstack-cloud}'
       - lf-infra-publish
 
 
     # Default variables #
     #####################
 
-    # TODO: Add default variables here.
+    openstack-cloud: vex
+    openstack-heat-template: csit-2-instance-type.yaml
+    openstack-heat-template-dir: openstack-hot
+
+    odl_system_flavor: 'odl-highcpu-4'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
+    tools_system_count: 1
+    tools_system_flavor: 'odl-highcpu-2'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
 
     #####################
     # Job configuration #
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: 'True'
+      - integration-stack-2-type:
+          vm_0_count: 1
+          vm_0_flavor: '{odl_system_flavor}'
+          vm_0_image: '{odl_system_image}'
+          vm_1_count: '{tools_system_count}'
+          vm_1_flavor: '{tools_system_flavor}'
+          vm_1_image: '{tools_system_image}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
 
     builders:
       - lf-infra-pre-build
-      - integration-infra-stack:
-          stack-template: '{stack-template}'
-          vm_0_count: '1'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{tools_system_count}'
-          vm_1_flavor: '{tools_system_flavor}'
-          vm_1_image: '{tools_system_image}'
+      - integration-stack-2-type:
+          openstack-cloud: '{openstack-cloud}'
+          openstack-heat-template: '{openstack-heat-template}'
+          openstack-heat-template-dir: '{openstack-heat-template-dir}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
           robot_other_files: ''
           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
+      - lf-stack-delete:
+          openstack-cloud: '{openstack-cloud}'
       - lf-infra-publish
 
 - job-template:
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: 'True'
+      - integration-stack-2-type:
+          vm_0_count: 1
+          vm_0_flavor: '{odl_system_flavor}'
+          vm_0_image: '{odl_system_image}'
+          vm_1_count: '{tools_system_count}'
+          vm_1_flavor: '{tools_system_flavor}'
+          vm_1_image: '{tools_system_image}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
     # Default variables #
     #####################
 
-    # TODO: Add default variables here
+    openstack-cloud: vex
+    openstack-heat-template: csit-2-instance-type.yaml
+    openstack-heat-template-dir: openstack-hot
+
+    odl_system_flavor: 'odl-highcpu-4'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
+    tools_system_count: 1
+    tools_system_flavor: 'odl-highcpu-2'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
 
     #####################
     # Job Configuration #
           debug-map: '{debug-map}'
           install-features: 'odl-jolokia,{install-features}'
           use-features-boot: 'True'
+      - integration-stack-2-type:
+          vm_0_count: 3
+          vm_0_flavor: '{odl_system_flavor}'
+          vm_0_image: '{odl_system_image}'
+          vm_1_count: '{tools_system_count}'
+          vm_1_flavor: '{tools_system_flavor}'
+          vm_1_image: '{tools_system_image}'
       - integration-distribution-branch:
           branch: '{verify-branch}'
       - integration-distribution-stream:
 
     builders:
       - lf-infra-pre-build
-      - integration-infra-stack:
-          stack-template: '{stack-template}'
-          vm_0_count: '3'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{tools_system_count}'
-          vm_1_flavor: '{tools_system_flavor}'
-          vm_1_image: '{tools_system_image}'
+      - integration-stack-2-type:
+          openstack-cloud: '{openstack-cloud}'
+          openstack-heat-template: '{openstack-heat-template}'
+          openstack-heat-template-dir: '{openstack-heat-template-dir}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
           robot_other_files: ''
           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
+      - lf-stack-delete:
+          openstack-cloud: '{openstack-cloud}'
       - lf-infra-publish
 
 
     # Default variables #
     #####################
 
-    # TODO: Add default variables here
+    openstack-cloud: vex
+    openstack-heat-template: csit-2-instance-type.yaml
+    openstack-heat-template-dir: openstack-hot
+
+    odl_system_flavor: 'odl-highcpu-4'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
+    tools_system_count: 1
+    tools_system_flavor: 'odl-highcpu-2'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
 
     #####################
     # Job configuration #
           debug-map: '{debug-map}'
           install-features: 'odl-jolokia,{install-features}'
           use-features-boot: 'True'
+      - integration-stack-2-type:
+          vm_0_count: 3
+          vm_0_flavor: '{odl_system_flavor}'
+          vm_0_image: '{odl_system_image}'
+          vm_1_count: '{tools_system_count}'
+          vm_1_flavor: '{tools_system_flavor}'
+          vm_1_image: '{tools_system_image}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
 
     builders:
       - lf-infra-pre-build
-      - integration-infra-stack:
-          stack-template: '{stack-template}'
-          vm_0_count: '3'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{tools_system_count}'
-          vm_1_flavor: '{tools_system_flavor}'
-          vm_1_image: '{tools_system_image}'
+      - integration-stack-2-type:
+          openstack-cloud: '{openstack-cloud}'
+          openstack-heat-template: '{openstack-heat-template}'
+          openstack-heat-template-dir: '{openstack-heat-template-dir}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
           robot_other_files: ''
           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
+      - lf-stack-delete:
+          openstack-cloud: '{openstack-cloud}'
       - lf-infra-publish
 
 - job-template:
           debug-map: '{debug-map}'
           install-features: 'odl-jolokia,{install-features}'
           use-features-boot: 'True'
+      - integration-stack-2-type:
+          vm_0_count: 3
+          vm_0_flavor: '{odl_system_flavor}'
+          vm_0_image: '{odl_system_image}'
+          vm_1_count: '{tools_system_count}'
+          vm_1_flavor: '{tools_system_flavor}'
+          vm_1_image: '{tools_system_image}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
     # Default variables #
     #####################
 
-    # TODO: Add default variables here
+    openstack-cloud: vex
+    openstack-heat-template: csit-2-instance-type.yaml
+    openstack-heat-template-dir: openstack-hot
+
+    odl_system_count: 1
+    odl_system_flavor: 'odl-highcpu-4'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
+    docker_system_count: 1
+    docker_system_flavor: 'odl-standard-1'
+    docker_system_image: 'ZZCI - CentOS 7 - docker - 20180723-235456.035'
 
     #####################
     # Job Configuration #
           debug-map: '{debug-map}'
           install-features: 'odl-jolokia,{install-features}'
           use-features-boot: 'True'
+      - integration-stack-2-type:
+          vm_0_count: 3
+          vm_0_flavor: '{odl_system_flavor}'
+          vm_0_image: '{odl_system_image}'
+          vm_1_count: '{docker_system_count}'
+          vm_1_flavor: '{docker_system_flavor}'
+          vm_1_image: '{docker_system_image}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
 
     builders:
       - lf-infra-pre-build
-      - integration-infra-stack:
-          stack-template: '{stack-template}'
-          vm_0_count: '3'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{docker_system_count}'
-          vm_1_flavor: '{docker_system_flavor}'
-          vm_1_image: '{docker_system_image}'
+      - integration-stack-2-type:
+          openstack-cloud: '{openstack-cloud}'
+          openstack-heat-template: '{openstack-heat-template}'
+          openstack-heat-template-dir: '{openstack-heat-template-dir}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
           robot_other_files: ''
           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
+      - lf-stack-delete:
+          openstack-cloud: '{openstack-cloud}'
       - lf-infra-publish
 
 
     # Default variables #
     #####################
 
-    # TODO: Add default variables here
+    openstack-cloud: vex
+    openstack-heat-template: csit-4-instance-type.yaml
+    openstack-heat-template-dir: openstack-hot
+
+    odl_system_count: 1
+    odl_system_flavor: 'odl-highcpu-4'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
+    openstack_system_count: 1
+    openstack_system_flavor: 'odl-standard-4'
+    openstack_system_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
+    openstack_system2_count: 0
+    openstack_system2_flavor: 'odl-standard-1'
+    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
+    tools_system_count: 1
+    tools_system_flavor: 'odl-highcpu-2'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
 
     #####################
     # Job configuration #
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: '{use-features-boot}'
+      - integration-stack-4-type:
+          vm_0_count: '{odl_system_count}'
+          vm_0_flavor: '{odl_system_flavor}'
+          vm_0_image: '{odl_system_image}'
+          vm_1_count: '{openstack_system_count}'
+          vm_1_flavor: '{openstack_system_flavor}'
+          vm_1_image: '{openstack_system_image}'
+          vm_2_count: '{openstack_system2_count}'
+          vm_2_flavor: '{openstack_system2_flavor}'
+          vm_2_image: '{openstack_system2_image}'
+          vm_3_count: '{tools_system_count}'
+          vm_3_flavor: '{tools_system_flavor}'
+          vm_3_image: '{tools_system_image}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
 
     builders:
       - lf-infra-pre-build
-      - integration-infra-stack-4-type:
-          stack-template: '{stack-template}'
-          vm_0_count: '{odl_system_count}'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{openstack_system_count}'
-          vm_1_flavor: '{openstack_system_flavor}'
-          vm_1_image: '{openstack_system_image}'
-          vm_2_count: '{openstack_system2_count}'
-          vm_2_flavor: '{openstack_system2_flavor}'
-          vm_2_image: '{openstack_system2_image}'
-          vm_3_count: '{tools_system_count}'
-          vm_3_flavor: '{tools_system_flavor}'
-          vm_3_image: '{tools_system_image}'
+      - integration-stack-4-type:
+          openstack-cloud: '{openstack-cloud}'
+          openstack-heat-template: '{openstack-heat-template}'
+          openstack-heat-template-dir: '{openstack-heat-template-dir}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
             - tempest_results.html
           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
+      - lf-stack-delete:
+          openstack-cloud: '{openstack-cloud}'
       - lf-infra-publish
 
 - job-template:
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: '{use-features-boot}'
+      - integration-stack-4-type:
+          vm_0_count: '{odl_system_count}'
+          vm_0_flavor: '{odl_system_flavor}'
+          vm_0_image: '{odl_system_image}'
+          vm_1_count: '{openstack_system_count}'
+          vm_1_flavor: '{openstack_system_flavor}'
+          vm_1_image: '{openstack_system_image}'
+          vm_2_count: '{openstack_system2_count}'
+          vm_2_flavor: '{openstack_system2_flavor}'
+          vm_2_image: '{openstack_system2_image}'
+          vm_3_count: '{tools_system_count}'
+          vm_3_flavor: '{tools_system_flavor}'
+          vm_3_image: '{tools_system_image}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
     # Default variables #
     #####################
 
-    # TODO: Add default variables here
+    openstack-cloud: vex
+    openstack-heat-template: csit-4-instance-type.yaml
+    openstack-heat-template-dir: openstack-hot
+
+    odl_system_count: 1
+    odl_system_flavor: 'odl-highcpu-4'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
+    openstack_system_count: 1
+    openstack_system_flavor: 'odl-standard-4'
+    openstack_system_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
+    openstack_system2_count: 0
+    openstack_system2_flavor: 'odl-standard-1'
+    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
+    tools_system_count: 1
+    tools_system_flavor: 'odl-highcpu-2'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
 
     #####################
     # Job configuration #
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: '{use-features-boot}'
+      - integration-stack-4-type:
+          vm_0_count: '{odl_system_count}'
+          vm_0_flavor: '{odl_system_flavor}'
+          vm_0_image: '{odl_system_image}'
+          vm_1_count: '{openstack_system_count}'
+          vm_1_flavor: '{openstack_system_flavor}'
+          vm_1_image: '{openstack_system_image}'
+          vm_2_count: '{openstack_system2_count}'
+          vm_2_flavor: '{openstack_system2_flavor}'
+          vm_2_image: '{openstack_system2_image}'
+          vm_3_count: '{tools_system_count}'
+          vm_3_flavor: '{tools_system_flavor}'
+          vm_3_image: '{tools_system_image}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
 
     builders:
       - lf-infra-pre-build
-      - integration-infra-stack-4-type:
-          stack-template: '{stack-template}'
-          vm_0_count: '{odl_system_count}'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{openstack_system_count}'
-          vm_1_flavor: '{openstack_system_flavor}'
-          vm_1_image: '{openstack_system_image}'
-          vm_2_count: '{openstack_system2_count}'
-          vm_2_flavor: '{openstack_system2_flavor}'
-          vm_2_image: '{openstack_system2_image}'
-          vm_3_count: '{tools_system_count}'
-          vm_3_flavor: '{tools_system_flavor}'
-          vm_3_image: '{tools_system_image}'
+      - integration-stack-4-type:
+          openstack-cloud: '{openstack-cloud}'
+          openstack-heat-template: '{openstack-heat-template}'
+          openstack-heat-template-dir: '{openstack-heat-template-dir}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
             - tempest_results.html
           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
+      - lf-stack-delete:
+          openstack-cloud: '{openstack-cloud}'
       - lf-infra-publish
 
 - job-template:
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: '{use-features-boot}'
+      - integration-stack-4-type:
+          vm_0_count: '{odl_system_count}'
+          vm_0_flavor: '{odl_system_flavor}'
+          vm_0_image: '{odl_system_image}'
+          vm_1_count: '{openstack_system_count}'
+          vm_1_flavor: '{openstack_system_flavor}'
+          vm_1_image: '{openstack_system_image}'
+          vm_2_count: '{openstack_system2_count}'
+          vm_2_flavor: '{openstack_system2_flavor}'
+          vm_2_image: '{openstack_system2_image}'
+          vm_3_count: '{tools_system_count}'
+          vm_3_flavor: '{tools_system_flavor}'
+          vm_3_image: '{tools_system_image}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
               GERRIT_BRANCH=$GERRIT_BRANCH
-              GERRIT_PROJECT=GERRIT_PROJECT
+              GERRIT_PROJECT=$GERRIT_PROJECT
               GERRIT_REFSPEC=$GERRIT_REFSPEC
               KARAF_VERSION=$KARAF_VERSION
 
     # Default variables #
     #####################
 
-    # TODO: Add default variables here
+    openstack-cloud: vex
+    openstack-heat-template: csit-apex-3-instance-type.yaml
+    openstack-heat-template-dir: openstack-hot
 
     #####################
     # Job configuration #
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: '{use-features-boot}'
+      - integration-stack-3-type:
+          vm_0_count: '{apex_controller_count}'
+          vm_0_flavor: '{apex_controller_flavor}'
+          vm_0_image: '{apex_controller_image}'
+          vm_1_count: 1
+          vm_1_flavor: '{apex_compute_0_flavor}'
+          vm_1_image: '{apex_compute_0_image}'
+          vm_2_count: 1
+          vm_2_flavor: '{apex_compute_1_flavor}'
+          vm_2_image: '{apex_compute_1_image}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
 
     builders:
       - lf-infra-pre-build
-      - integration-apex-stack-3-type:
-          stack-template: '{stack-template}'
-          vm_0_count: '{apex_controller_count}'
-          vm_0_flavor: '{apex_controller_flavor}'
-          vm_0_image: '{apex_controller_image}'
-          vm_1_count: '1'
-          vm_1_flavor: '{apex_compute_0_flavor}'
-          vm_1_image: '{apex_compute_0_image}'
-          vm_2_count: '1'
-          vm_2_flavor: '{apex_compute_1_flavor}'
-          vm_2_image: '{apex_compute_1_image}'
+      - integration-stack-3-type:
+          openstack-cloud: '{openstack-cloud}'
+          openstack-heat-template: '{openstack-heat-template}'
+          openstack-heat-template-dir: '{openstack-heat-template-dir}'
       - integration-install-robotframework
       - integration-detect-variables
       - integration-install-common-functions
             - tempest_results.html
           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
+      - lf-stack-delete:
+          openstack-cloud: '{openstack-cloud}'
       - lf-infra-publish
 
 - job-template:
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: '{use-features-boot}'
+      - integration-stack-3-type:
+          vm_0_count: '{apex_controller_count}'
+          vm_0_flavor: '{apex_controller_flavor}'
+          vm_0_image: '{apex_controller_image}'
+          vm_1_count: 1
+          vm_1_flavor: '{apex_compute_0_flavor}'
+          vm_1_image: '{apex_compute_0_image}'
+          vm_2_count: 1
+          vm_2_flavor: '{apex_compute_1_flavor}'
+          vm_2_image: '{apex_compute_1_image}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
index 40475f69a85b6de2c82b215a08cc4141ff4d6710..fb2caf47ee1fc44da8d6ad3680057d26f194ae31 100644 (file)
 
     # CSIT Lists in defaults.yaml
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           mvn-version: 'mvn35'
-          csit-list: !include: csit-jobs-neon.lst
+          csit-list: !include: csit-jobs-sodium.lst
           build-order: >
               odlparent yangtools infrautils mdsal controller serviceutils aaa netconf
               daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt
               bgpcep integration/distribution
 
-      - fluorine:
-          branch: 'stable/fluorine'
+      - neon:
+          branch: 'stable/neon'
           mvn-version: 'mvn35'
-          csit-list: !include: csit-jobs-fluorine.lst
+          csit-list: !include: csit-jobs-neon.lst
           build-order: >
               odlparent yangtools infrautils mdsal controller serviceutils aaa netconf
               daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt
               bgpcep integration/distribution
 
-      - oxygen:
-          branch: 'stable/oxygen'
+      - fluorine:
+          branch: 'stable/fluorine'
           mvn-version: 'mvn35'
-          csit-list: !include: csit-jobs-oxygen.lst
+          csit-list: !include: csit-jobs-fluorine.lst
           build-order: >
               odlparent yangtools infrautils mdsal controller serviceutils aaa netconf
               daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt
 
     # CSIT Lists in defaults.yaml
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+          csit-blacklist: >
+              alto bier capwap centinel didm dluxapps groupbasedpolicy iotdm jsonrpc lacp
+              l2switch messaging4transport nemo netide nic ocpplugin of-config p4plugin packetcable
+              sdninterfaceapp sxp tsdr unimgr usc usecplugin vtn gate longevity sanity tdd tempest wip
+              aaa-csit-1node-keystone-all
+              netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
+              netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
+              netvirt-csit-3node-1cmb
+              last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used
+          csit-list: !include: csit-jobs-sodium.lst
+          csit-weekly-list: '{csit-weekly-list-sodium}'
+          csit-high-frequency-list: '{csit-high-frequency-list-sodium}'
+      - neon:
+          branch: 'stable/neon'
           csit-blacklist: >
               alto bier capwap centinel didm dluxapps groupbasedpolicy iotdm jsonrpc lacp
               l2switch messaging4transport nemo netide nic ocpplugin of-config p4plugin packetcable
           csit-list: !include: csit-jobs-fluorine.lst
           csit-weekly-list: '{csit-weekly-list-fluorine}'
           csit-high-frequency-list: '{csit-high-frequency-list-fluorine}'
-      - oxygen:
-          branch: 'stable/oxygen'
-          csit-blacklist: >
-              capwap centinel didm iotdm jsonrpc lacp messaging4transport netide nic
-              ocpplugin sdninterfaceapp unimgr usecplugin gate longevity sanity tdd tempest wip
-              aaa-csit-1node-keystone-all groupbasedpolicy-csit-1node-1cmb-0ctl-0cmp-openstack-pike-openstack
-              netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
-              netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
-              netvirt-csit-3node-1cmb
-              last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used
-          csit-list: !include: csit-jobs-oxygen.lst
-          csit-weekly-list: '{csit-weekly-list-oxygen}'
-          csit-high-frequency-list: '{csit-high-frequency-list-oxygen}'
 
 - project:
     name: integration-sanity
       - 'integration-sanity-test-{stream}'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           karaf-version: odl
+          csit-sanity-list: '{csit-sanity-list-sodium}'
+      - neon:
+          branch: 'stable/neon'
+          karaf-version: odl
           csit-sanity-list: '{csit-sanity-list-neon}'
       - fluorine:
           branch: 'stable/fluorine'
           karaf-version: odl
           csit-sanity-list: '{csit-sanity-list-fluorine}'
-      - oxygen:
-          branch: 'stable/oxygen'
-          karaf-version: karaf4
-          csit-sanity-list: '{csit-sanity-list-oxygen}'
 
 - job-template:
     name: 'integration-merge-dashboard'
           forbidden-files: ''
 
     builders:
+      - lf-infra-pre-build
       - config-file-provider:
           files:
             - file-id: odl-elastic-cloud
           karaf-version: '{karaf-version}'
 
     builders:
+      - lf-infra-pre-build
       - trigger-builds:
           - project: '{csit-list}'
             block: true
               BUNDLE_URL=$BUNDLE_URL
               KARAF_VERSION=$KARAF_VERSION
 
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: 1440
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
     publishers:
       - opendaylight-infra-generate-csit-status-report
       - email-notification:
       - timed: '{schedule-daily}'
 
     builders:
+      - lf-infra-pre-build
       - trigger-builds:
           - project: '{csit-sanity-list}'
             block: true
             notbuilt: true
 
     builders:
+      - lf-infra-pre-build
       - integration-rebase-gerrit-patch
       - wipe-org-opendaylight-repo
       - lf-provide-maven-settings:
                   branch-pattern: '**/{branch}'
 
     builders:
+      - lf-infra-pre-build
       - wipe-org-opendaylight-repo
       - lf-maven-install:
           mvn-version: '{mvn-version}'
       - timed: '{schedule-high-frequency}'
 
     builders:
+      - lf-infra-pre-build
       - trigger-builds:
           - project: '{csit-high-frequency-list}'
             block: true
           jobs: builder-jjb-merge
 
     builders:
+      - lf-infra-pre-build
       - shell: !include-raw-escape: update-csit-tests.sh
       - shell: |
           git status
index 82220dff32a0f00ae3a6737828296febf4a7a15a..9021af0655d6d7016a171ce0a7e7323d8d8bbde2 100755 (executable)
@@ -5,17 +5,22 @@ set -e
 # create a fresh empty place to build this custom distribution
 BUILD_DIR=${WORKSPACE}/patch_tester
 DISTRIBUTION_BRANCH_TO_BUILD=$DISTROBRANCH  #renaming variable for clarity
-MAVEN_OPTIONS="$(echo --show-version \
+MAVEN_OPTIONS="${MAVEN_PARAMS} \
+    --show-version \
     --batch-mode \
     -Djenkins \
     -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
     -Dmaven.repo.local=/tmp/r \
-    -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r)"
+    -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r"
 
 rm -rf $BUILD_DIR
 mkdir -p $BUILD_DIR
 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"
+cat pom.xml
+
 # Set up git committer name and email, needed for commit creation when cherry-picking.
 export EMAIL="sandbox@jenkins.opendaylight.org"
 export GIT_COMMITTER_NAME="Multipatch Job"
@@ -37,16 +42,26 @@ if ${BUILD_FAST}; then
 else
     fast_option=""
 fi
-# check if topic exists, e.g. topic=binding-tlc-rpc
-if [[ "${PATCHES_TO_BUILD}" == *topic* ]]; then
-    TOPIC="${PATCHES_TO_BUILD#*=}"
+# check if topic exists:
+# if topic=binding-rpc, then checkout first patch in binding-rpc topic (if it exists)
+# if topic:binding-rpc, then cherry-pick first patch in binding-rpc topic (if it exists)
+if [[ "${PATCHES_TO_BUILD}" == *"topic"* ]]; then
+    if [[ "${PATCHES_TO_BUILD}" == *"topic="* ]]; then
+        CHERRY_PICK="false"
+        TOPIC="${PATCHES_TO_BUILD#*=}"
+    elif [[ "${PATCHES_TO_BUILD}" == *"topic:"* ]]; then
+        CHERRY_PICK="true"
+        TOPIC="${PATCHES_TO_BUILD#*:}"
+    else
+        echo "ERROR: Topic has wrong format" && exit 1
+    fi
     echo "Create topic ${TOPIC} patch list"
     PATCHES_TO_BUILD=""
     read -ra PROJECT_LIST <<< "${BUILD_ORDER}"
     echo "List of projects to check patch in topic: ${PROJECT_LIST[*]}"
     for PROJECT in "${PROJECT_LIST[@]}"; do
         # get all patches number for a topic for a given project
-        IFS=$'\n' read -rd '' -a GERRIT_PATCH_LIST <<< "$(ssh -p 29418 jenkins-$SILO@git.opendaylight.org gerrit query status:open topic:${TOPIC} project:${PROJECT} \
+        IFS=$'\n' read -rd '' -a GERRIT_PATCH_LIST <<< "$(ssh -p 29418 jenkins-$SILO@git.opendaylight.org gerrit query status:open topic:${TOPIC} project:${PROJECT} 2> /dev/null \
         | grep 'number:' | awk '{{ print $2 }}')" || true
         # add project if it is the first with patches or it is not the first
         if [[ -z "${PATCHES_TO_BUILD}" && ! -z "${GERRIT_PATCH_LIST[*]}" ]]; then
@@ -71,11 +86,14 @@ if [[ "${PATCHES_TO_BUILD}" == *topic* ]]; then
             IFS=$'\n' SORT_REF=$(sort <<<"${REF_LIST[*]}") && unset IFS
             read -rd '' -a SORT_REF_LIST <<< "${SORT_REF[*]}" || true
             # add refspec to patches to build list
+            COUNT=0
             for PATCH in "${SORT_REF_LIST[@]}"; do
-                # if project is odlparent or yangtools, do not cherry-pick
-                if [[ "${PROJECT}" == "odlparent" || "${PROJECT}" == "yangtools" ]]; then
+                COUNT=$((COUNT+1))
+                if [ "${COUNT}" == "1" ] && [ "${CHERRY_PICK}" == "false" ]; then
+                    # checkout patch
                     PATCHES_TO_BUILD="${PATCHES_TO_BUILD}=${PATCH/*-/}"
                 else
+                    # cherry-pick is better than checkout patch
                     PATCHES_TO_BUILD="${PATCHES_TO_BUILD}:${PATCH/*-/}"
                 fi
             done
@@ -91,9 +109,10 @@ declare -a PROJECTS
 
 # For each patch:
 # 1. Clone the project.
-# 2. Optionally, checkout a specific (typically unmerged) Gerrit patch. If none,
-#   default to Integration/Distribution branch via {branch} JJB param.
-# 3. Also optionally, cherry-pick series of patches on top of the checkout.
+# 2. Checkout an specific (typically unmerged) Gerrit patch. If none,
+# use distribution pom.xml file to figure out right branch or tag to checkout.
+# In case of Gerrit patch in MRI project, adjust version for the stream.
+# 3. Optionally, cherry-pick series of patches on top of the checkout.
 #
 # Each patch is found in the ${PATCHES_TO_BUILD} variable as a comma separated
 # list of project[=checkout][:cherry-pick]* values. Examples:
@@ -109,33 +128,51 @@ declare -a PROJECTS
 distribution_status="not_included"
 for patch in "${PATCHES[@]}"
 do
-    echo "working on ${patch}"
-    # For patch=controller=61/29761/5:45/29645/6, this gives controller
+    echo "-- working on ${patch} --"
+    # For patch=controller=61/29761/5:45/29645/6, this gives controller.
     PROJECT="$(echo ${patch} | cut -d\: -f 1 | cut -d\= -f 1)"
     if [ "${PROJECT}" == "integration/distribution" ]; then
         distribution_status="included"
     fi
     PROJECT_SHORTNAME="${PROJECT##*/}"  # http://stackoverflow.com/a/3162500
     PROJECTS+=("${PROJECT_SHORTNAME}")
-    echo "cloning project ${PROJECT}"
+    echo "1. cloning project ${PROJECT}"
     git clone "https://git.opendaylight.org/gerrit/p/${PROJECT}"
     cd ${PROJECT_SHORTNAME}
-    # For patch = controller=61/29761/5:45/29645/6, this gives 61/29761/5
+    # For patch = controller=61/29761/5:45/29645/6, this gives 61/29761/5.
     CHECKOUT="$(echo ${patch} | cut -d\= -s -f 2 | cut -d\: -f 1)"
-    # If project has a patch, checkout patch, otherwise use distribution branch
+    # If there is a base patch for this project, checkout patch, otherwise use
+    # distribution pom.xml file to figure out right branch or tag to checkout.
     if [ "x${CHECKOUT}" != "x" ]; then
-        echo "checking out ${CHECKOUT}"
+        echo "2. checking out patch ${CHECKOUT}"
         # TODO: Make this script accept "29645/6" as a shorthand for "45/29645/6".
         git fetch "https://git.opendaylight.org/gerrit/${PROJECT}" "refs/changes/$CHECKOUT"
         git checkout FETCH_HEAD
-
+        # If the patch is for MRI project, adjust the MRI versions
+        if [ "${PROJECT}" == "odlparent" ] || [ "${PROJECT}" == "yangtools" ] || ([ "${PROJECT}" == "mdsal" ] && [ "${DISTROSTREAM}" != "fluorine" ]); 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 "*.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}" 2> /dev/null
+        fi
+        if [ "${PROJECT}" == "yangtools" ] || ([ "${PROJECT}" == "mdsal" ] && [ "${DISTROSTREAM}" != "fluorine" ]); 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 "*.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}" 2> /dev/null
+        fi
+        if [ "${PROJECT}" == "mdsal" ] && [ "${DISTROSTREAM}" != "fluorine" ]; 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 "*.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}" 2> /dev/null
+        fi
     else
-        # If project with no patch = yangtools, download master branch
-        if [ "${PROJECT}" == "yangtools" ]; then
-            echo "checking out master"
-            git checkout master
+        # If project with no patch is MRI, download release tag:
+        if [ "${PROJECT}" == "odlparent" ] || [ "${PROJECT}" == "yangtools" ] || ([ "${PROJECT}" == "mdsal" ] && [ "${DISTROSTREAM}" != "fluorine" ]); then
+            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}"
+            git checkout tags/v${PROJECT_VERSION}
+        # Otherwise download distribution branch:
         else
-            echo "checking out ${DISTRIBUTION_BRANCH_TO_BUILD}"
+            echo "2. checking out branch ${DISTRIBUTION_BRANCH_TO_BUILD}"
             git checkout "${DISTRIBUTION_BRANCH_TO_BUILD}"
         fi
     fi
@@ -144,7 +181,7 @@ do
     IFS=':' read -ra PICKS <<< "${PICK_SEGMENT}"
     for pick in "${PICKS[@]}"
     do
-        echo "cherry-picking ${pick}"
+        echo "3. cherry-picking ${pick}"
         git fetch "https://git.opendaylight.org/gerrit/${PROJECT}" "refs/changes/${pick}"
         git cherry-pick --ff --keep-redundant-commits FETCH_HEAD
     done
@@ -162,36 +199,6 @@ if [ "${distribution_status}" == "not_included" ]; then
     cd "${BUILD_DIR}"
 fi
 
-# If there is a patch for odlparent or yangtools (MRI projects), adjust version to mdsal project:
-# 1. Extract project version in patch
-# 2. Extract project MSI version from mdsal project
-# 3. Replace version in patch by MSI version
-# Otherwise release the MRI project
-if [[ -d "odlparent" ]]; then
-    if [[ -d "mdsal" ]]; then
-        # Extract patch and MSI used version
-        patch_version="$(xpath ./odlparent/odlparent-lite/pom.xml '/project/version/text()' 2> /dev/null)"
-        msi_version="$(xpath ./mdsal/pom.xml '/project/parent/version/text()' 2> /dev/null)"
-        # Replace version
-        find ./odlparent -name "*.xml" -print0 | xargs -0 sed -i "s/${patch_version}/${msi_version}/g"
-    else
-        # Release project
-        find ./odlparent -name "*.xml" -print0 | xargs -0 sed -i 's/-SNAPSHOT//g'
-    fi
-fi
-if [[ -d "yangtools" ]]; then
-        if [[ -d "mdsal" ]]; then
-        # Extract patch and MSI used version
-        patch_version="$(xpath ./yangtools/pom.xml '/project/version/text()' 2> /dev/null)"
-        msi_version="$(xpath ./mdsal/binding/yang-binding/pom.xml '/project/dependencyManagement/dependencies/dependency/version/text()' 2> /dev/null)"
-        # Replace version
-        find ./yangtools -name "*.xml" -print0 | xargs -0 sed -i "s/${patch_version}/${msi_version}/g"
-    else
-        # Release project
-        find ./yangtools -name "*.xml" -print0 | xargs -0 sed -i 's/-SNAPSHOT//g'
-    fi
-fi
-
 # Second phase: build everything
 
 for PROJECT_SHORTNAME in "${PROJECTS[@]}"; do
diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
deleted file mode 100644 (file)
index 784e75c..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
----
-- project:
-    name: iotdm-neon
-    jobs:
-      - odl-maven-jobs
-
-    stream: neon
-    project: 'iotdm'
-    project-name: 'iotdm'
-    branch: 'master'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'iotdm-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'aaa-merge-{stream}'
-    email-upstream: '[iotdm] [aaa]'
-
-    # Used by the release job
-    staging-profile-id: 96fd6e9453970
-
-- project:
-    name: iotdm-fluorine
-    jobs:
-      - odl-maven-jobs
-
-    stream: fluorine
-    project: 'iotdm'
-    project-name: 'iotdm'
-    branch: 'stable/fluorine'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'iotdm-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'aaa-merge-{stream}'
-    email-upstream: '[iotdm] [aaa]'
-
-    # Used by the release job
-    staging-profile-id: 96fd6e9453970
-
-- project:
-    name: iotdm-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'iotdm'
-    project-name: 'iotdm'
-    branch: 'stable/oxygen'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'iotdm-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'aaa-merge-{stream}'
-    email-upstream: '[iotdm] [aaa]'
-
-    # Used by the release job
-    staging-profile-id: 96fd6e9453970
-
-- project:
-    name: iotdm-sonar
-    jobs:
-      - gerrit-maven-sonar
-    project: 'iotdm'
-    project-name: 'iotdm'
-    branch: 'master'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'iotdm-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: iotdm-view
-    views:
-      - project-view
-    project-name: iotdm
index c6a0cb8fec4a44b78d87b6f8fe282e6cd1cca4a1..443dd1807d3fcee6dce4bf14b3237744fa8ccc08 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index 5059f3172e785d9f8fb0f37b675e0fcb9672b436..093115b8048eaddcafb3b44f572c65a49147e438 100644 (file)
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: jsonrpc-neon
+    name: jsonrpc-sodium
     jobs:
       - odl-maven-jobs
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
-    stream: neon
+    stream: sodium
     branch: 'master'
     mvn-settings: 'jsonrpc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     staging-profile-id: 96fdf4408765d
 
 - project:
-    name: jsonrpc-fluorine
+    name: jsonrpc-neon
     jobs:
       - odl-maven-jobs
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
-    stream: fluorine
-    branch: 'stable/fluorine'
+    stream: neon
+    branch: 'stable/neon'
     mvn-settings: 'jsonrpc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
     staging-profile-id: 96fdf4408765d
 
 - project:
-    name: jsonrpc-oxygen
+    name: jsonrpc-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
-    stream: oxygen
-    branch: 'stable/oxygen'
+    stream: fluorine
+    branch: 'stable/fluorine'
     mvn-settings: 'jsonrpc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
index 332eddb349ec5fdd31ad6da6653e8e86807f9927..a1cde7a89af93015fb7d40f6ab8feffd60dde121 100644 (file)
@@ -6,18 +6,19 @@
 
     # The project name
     project: 'l2switch'
+    disable-job: true
 
     # The functionality under test
     functionality: 'host-scalability-daily'
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index 2366e31e099b7e3406ddc1548a8144066168b2d5..679a9b30fe959285585675b6c07f0b7982387cc1 100644 (file)
@@ -6,18 +6,19 @@
 
     # The project name
     project: 'l2switch'
+    disable-job: true
 
     # The functionality under test
     functionality: 'scalability'
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - all:
index 3c7fd0e8171f2c16abd99207cdd63336c1717012..acc6bff9bfba30d8154bf7203f1a09f4e32abbdb 100644 (file)
@@ -7,18 +7,19 @@
 
     # The project name
     project: 'l2switch'
+    disable-job: true
 
     # The functionality under test
     functionality: 'switch'
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - all:
index 8634fd4497c213d298f45643ef763eda7d0050b5..4984e5ee1d2a7e201602316c549eb61ad61726c5 100644 (file)
@@ -6,15 +6,17 @@
 
     # The project name
     project: 'l2switch'
+    disable-job: true
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+          os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     feature:
       - all:
index 176de3580dfcb6f6e5ea164abb657c99bf8f19e0..b317c206ed2e9daf427168f53dbb2253b8d28c7d 100644 (file)
@@ -1,10 +1,10 @@
 ---
 - project:
-    name: l2switch-neon
+    name: l2switch-sodium
     jobs:
       - odl-maven-jobs
 
-    stream: neon
+    stream: sodium
     project: 'l2switch'
     project-name: 'l2switch'
     branch: 'master'
         openflowjava-merge-{stream},
         openflowplugin-merge-{stream}
     email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96fee85953ca0
 
 - project:
-    name: l2switch-fluorine
+    name: l2switch-neon
     jobs:
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'l2switch'
     project-name: 'l2switch'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     mvn-settings: 'l2switch-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: >
         openflowjava-merge-{stream},
         openflowplugin-merge-{stream}
     email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96fee85953ca0
 
 - project:
-    name: l2switch-oxygen
+    name: l2switch-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'l2switch'
     project-name: 'l2switch'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     mvn-settings: 'l2switch-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: >
@@ -62,6 +63,7 @@
         openflowjava-merge-{stream},
         openflowplugin-merge-{stream}
     email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96fee85953ca0
@@ -75,6 +77,7 @@
     branch: 'master'
     mvn-settings: 'l2switch-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    disable-job: true
 
 - project:
     name: l2switch-view
diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml
deleted file mode 100644 (file)
index 1cc1b23..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
----
-- project:
-    name: lacp-csit-lacp
-    jobs:
-      - inttest-csit-1node
-      - inttest-csit-verify-1node
-
-    # The project name
-    project: 'lacp'
-
-    # The functionality under test
-    functionality: 'lacp'
-
-    # Project branches
-    stream:
-      - neon:
-          branch: 'master'
-      - fluorine:
-          branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-
-    install:
-      - all:
-          scope: 'all'
-
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514
-
-    # Features to install
-    install-features: 'odl-lacp-ui'
-
-    # Robot custom options
-    robot-options: ' '
diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
deleted file mode 100644 (file)
index 67ac762..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
----
-- project:
-    name: lacp-neon
-    jobs:
-      - odl-maven-jobs
-
-    stream: neon
-    project: 'lacp'
-    project-name: 'lacp'
-    branch: 'master'
-    mvn-settings: 'lacp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
-    email-upstream: '[lacp] [openflowjava] [openflowplugin]'
-
-    # Used by the release job
-    staging-profile-id: 96ff6c0ff6ab1
-
-- project:
-    name: lacp-fluorine
-    jobs:
-      - odl-maven-jobs
-
-    stream: fluorine
-    project: 'lacp'
-    project-name: 'lacp'
-    branch: 'stable/fluorine'
-    mvn-settings: 'lacp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
-    email-upstream: '[lacp] [openflowjava] [openflowplugin]'
-
-    # Used by the release job
-    staging-profile-id: 96ff6c0ff6ab1
-
-- project:
-    name: lacp-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'lacp'
-    project-name: 'lacp'
-    branch: 'stable/oxygen'
-    mvn-settings: 'lacp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
-    email-upstream: '[lacp] [openflowjava] [openflowplugin]'
-
-    # Used by the release job
-    staging-profile-id: 96ff6c0ff6ab1
-
-- project:
-    name: lacp-sonar
-    jobs:
-      - gerrit-maven-sonar
-    project: 'lacp'
-    project-name: 'lacp'
-    branch: 'master'
-    mvn-settings: 'lacp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: lacp-view
-    views:
-      - project-view
-    project-name: lacp
index f232f2ec0ef18d0a3495fee8e1bd9ba7acd0e91e..07d01ba20d93bfeafa4cf635134c3435e671ae4a 100644 (file)
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: lf-releng
 
+- project:
+    name: lf-infra-info-master
+    jobs:
+      - gerrit-tox-verify
+
+    project-name: lf-infra-info-master
+    project: releng/info-master
+    build-node: centos7-builder-2c-2g
+    stream: any
+    branch: '*'
+
+    git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
+    gerrit-server-name: lf-releng
+
+- project:
+    name: lf-test-release-tox-verify
+    jobs:
+      - gerrit-tox-verify
+
+    project-name: lf-test-release-tox-verify
+    project: zzz-test-release
+    build-node: centos7-builder-2c-2g
+    stream: any
+    branch: '*'
+
+    git-url: https://git.opendaylight.org/gerrit/$GERRIT_PROJECT
+
 - project:
     name: lf-infra-common-packer
     jobs:
       - '{project-name}-rtd-jobs'
+      - gerrit-release-announce
       - gerrit-tox-verify
 
     project-name: lf-infra-common-packer
@@ -68,6 +96,7 @@
     name: lf-infra-docs-conf
     jobs:
       - '{project-name}-rtd-jobs'
+      - gerrit-release-announce
       - gerrit-tox-verify
 
     project-name: lf-infra-docs-conf
 - project:
     name: lf-infra-global-jjb
     jobs:
-      - '{project-name}-rtd-jobs'
+      - '{project-name}-rtd-jobs':
+          gerrit_trigger_file_paths:
+            - compare-type: REG_EXP
+              pattern: '.*\.css'
+            - compare-type: REG_EXP
+              pattern: '.*\.html'
+            - compare-type: REG_EXP
+              pattern: '.*\.rst'
+            - compare-type: REG_EXP
+              pattern: '.*\/conf.py'
+            - compare-type: REG_EXP
+              pattern: 'releasenotes/.*'
+      - gerrit-release-announce
       - gerrit-tox-verify
 
     project-name: lf-infra-global-jjb
     name: lf-infra-lftools
     jobs:
       - '{project-name}-rtd-jobs'
+      - gerrit-release-announce
       - gerrit-tox-verify
 
     project-name: lf-infra-lftools
diff --git a/jjb/lf-infra/zzz-test-release.yaml b/jjb/lf-infra/zzz-test-release.yaml
new file mode 100644 (file)
index 0000000..806a52d
--- /dev/null
@@ -0,0 +1,20 @@
+---
+- project:
+    name: '{project-name}-maven-stage-{stream}'
+    jobs:
+      - gerrit-maven-stage
+    project: zzz-test-release
+    project-name: zzz-test-release
+    stream: master
+    branch: master
+    distribution_branch: master
+    mvn-settings: autorelease-settings
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-version: mvn35
+    dependencies: ''
+    email-upstream: '[odlparent]'
+    archive-artifacts: >
+        **/*.pom
+        **/*.xml
+    # Used by the release job
+    staging-profile-id: 615fb2f4e0adf
index a08c79e5a82be0e4f12c6288d253eab2eb158f61..edbb8f03f5dcab8cdfb0999616fc2d8cf2f3ea25 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - all:
index 9017bc0674e0d966731c45eb926e3f4a7d425b89..c8b05965bc0bbf1c44584804830d5f725a40f2c4 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index 1ff72034e717507d25fa35c936403f8c5a75fab1..6b6f17fb149e6324948517e98698a0b2e3bb4090 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: lispflowmapping-neon
+    name: lispflowmapping-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -9,9 +9,12 @@
           project-pattern: lispflowmapping
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/
           rtd-token: 181be9dd804e4969b9f318a6f1988e3cbee9d9a8
-      - odl-maven-jobs
+      - odl-maven-jobs:
+          java-version:
+            - openjdk8
+            - openjdk11
 
-    stream: neon
+    stream: sodium
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
     branch: 'master'
@@ -30,7 +33,7 @@
     staging-profile-id: 96fff2503b766
 
 - project:
-    name: lispflowmapping-fluorine
+    name: lispflowmapping-neon
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
           project-pattern: lispflowmapping
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/
           rtd-token: 181be9dd804e4969b9f318a6f1988e3cbee9d9a8
-      - odl-maven-jobs
+      - odl-maven-jobs:
+          java-version:
+            - openjdk8
+            - openjdk11
 
-    stream: fluorine
+    stream: neon
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     mvn-settings: 'lispflowmapping-settings'
     mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
     staging-profile-id: 96fff2503b766
 
 - project:
-    name: lispflowmapping-oxygen
+    name: lispflowmapping-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: lispflowmapping
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/
+          rtd-token: 181be9dd804e4969b9f318a6f1988e3cbee9d9a8
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     mvn-settings: 'lispflowmapping-settings'
     mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
index 0f36f54fe2a90722147fc89ee399f8563d655062..1dc5719ffd46498e6a7172244c6aad24b4d24be5 100644 (file)
     functionality: 'bindingv1'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index ffafa87c310ffd9849f5f0b0b1957fe15104a832..c2440770384942e7540e501561eaff54cbabc336 100644 (file)
@@ -7,15 +7,15 @@
     project: 'mdsal'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
+          os-branch: 'queens'
       - fluorine:
           branch: 'stable/fluorine'
           os-branch: 'queens'
-      - oxygen:
-          branch: 'stable/oxygen'
-          os-branch: 'queens'
 
     jdk: 'openjdk8'
 
index 57a4cb46bb3dcb7ea000dfd31e8922cbe921505c..251842596bb09ce92d0eb403a3ded8130c083dda 100644 (file)
@@ -2,7 +2,8 @@
 - project:
     name: mdsal-master
     jobs:
-      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-maven-javadoc-jobs':
+          disable-job: true
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: mdsal
     staging-profile-id: a674173c7b29d
 
 - project:
-    name: mdsal-fluorine
+    name: mdsal-3.0.x
     jobs:
-      - '{project-name}-distribution-check-{stream}':
-          mvn-version: 'mvn35'
       - '{project-name}-maven-javadoc-jobs':
-          mvn-version: 'mvn33'
+          disable-job: true
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: mdsal
           rtd-token: a56d6212dd3de3eef12642affe8a6100cc8bc002
       - odl-maven-jobs
 
-    stream: fluorine
-    project: 'mdsal'
-    project-name: 'mdsal'
-    branch: 'stable/fluorine'
+    project: mdsal
+    project-name: mdsal
+    branch: v3.0.x
+    stream: v3.0.x
+
     mvn-settings: 'mdsal-settings'
-    mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
     mvn-opts: '-Xmx2048m'
-    build-node: centos7-builder-8c-8g
-    build-timeout: 90
+
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[mdsal] [odlparent] [yangtools]'
+    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-oxygen
+    name: mdsal-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}':
           mvn-version: 'mvn35'
       - '{project-name}-maven-javadoc-jobs':
           mvn-version: 'mvn33'
+          disable-job: true
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: mdsal
           rtd-token: a56d6212dd3de3eef12642affe8a6100cc8bc002
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'mdsal'
     project-name: 'mdsal'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     mvn-settings: 'mdsal-settings'
     mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
     mvn-opts: '-Xmx2048m'
diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml
deleted file mode 100644 (file)
index 26098a6..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
----
-- project:
-    name: natapp-neon
-    jobs:
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: neon
-    project: 'natapp'
-    project-name: 'natapp'
-    branch: 'master'
-    mvn-settings: 'natapp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowplugin-merge-{stream}'
-    email-upstream: '[natapp] [openflowplugin]'
-
-    # Used by the release job
-    staging-profile-id: a679c0f4f08a8
-
-- project:
-    name: natapp-fluorine
-    jobs:
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: fluorine
-    project: 'natapp'
-    project-name: 'natapp'
-    branch: 'stable/fluorine'
-    mvn-settings: 'natapp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowplugin-merge-{stream}'
-    email-upstream: '[natapp] [openflowplugin]'
-
-    # Used by the release job
-    staging-profile-id: a679c0f4f08a8
-
-- project:
-    name: natapp-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'natapp'
-    project-name: 'natapp'
-    branch: 'stable/oxygen'
-    mvn-settings: 'natapp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowplugin-merge-{stream}'
-    email-upstream: '[natapp] [openflowplugin]'
-
-    # Used by the release job
-    staging-profile-id: a679c0f4f08a8
-
-- project:
-    name: natapp-sonar
-    jobs:
-      - gerrit-maven-sonar
-    project: 'natapp'
-    project-name: 'natapp'
-    branch: 'master'
-    mvn-settings: 'natapp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: natapp-view
-    views:
-      - project-view
-    project-name: natapp
index d56aeb22e9fa3622d1f08dd6886d27255f15f962..ecf7605caea1cb50054faa07ca0f855de4155fc2 100644 (file)
@@ -7,18 +7,19 @@
 
     # The project name
     project: 'nemo'
+    disable-job: true
 
     # The functionality under test
     functionality: 'engine'
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - all:
index dc24a888f044c146c914ec86b0d7a2224bea8e76..d47144d06fd3c9300080940ee907eb2e6b3a62b2 100644 (file)
@@ -1,10 +1,10 @@
 ---
 - project:
-    name: nemo-neon
+    name: nemo-sodium
     jobs:
       - odl-maven-jobs
 
-    stream: neon
+    stream: sodium
     project: 'nemo'
     project-name: 'nemo'
     branch: 'master'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[nemo]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a67a9890f6202
 
 - project:
-    name: nemo-fluorine
+    name: nemo-neon
     jobs:
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'nemo'
     project-name: 'nemo'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     mvn-settings: 'nemo-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[nemo]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a67a9890f6202
 
 - project:
-    name: nemo-oxygen
+    name: nemo-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'nemo'
     project-name: 'nemo'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     mvn-settings: 'nemo-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[nemo]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a67a9890f6202
@@ -60,6 +62,7 @@
     branch: 'master'
     mvn-settings: 'nemo-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    disable-job: true
 
 - project:
     name: nemo-view
index 7652b068fb23f96001147d23bbee74f793fae30d..5fd3de7c71ee1a184a5f0ef4d6ef05c1e944cfec 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index 85766f77d4235bb6ceee02633e9bb1de3e63e6a7..c2c36726c814d06cf78e890d1967936d0307a9a7 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index 7e85868e0045b347133ca037cad87c54cac2eacd..4012b53e367f0d7d591b42c52f8c7d2b151a0ddc 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index 8c2119f2cfbe74838d03dabb3bfb9f8a87b1e505..756b9b1bc09280c90d54f712a03d51e6376a59ec 100644 (file)
@@ -7,15 +7,15 @@
     project: 'netconf'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
+          os-branch: 'queens'
       - fluorine:
           branch: 'stable/fluorine'
           os-branch: 'queens'
-      - oxygen:
-          branch: 'stable/oxygen'
-          os-branch: 'queens'
 
     feature:
       - core:
index 6070964f4e70201ce8bc34582f7df72fcb1f879f..6e610acf677cb623643812c38fb9d15fe6f632dd 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index fdbd77aaa90ea0f827117a44f47d383cb80e8d44..5b41d7dc62b4620583697d06ec8f7e3baee5f590 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - all:
index e3f6be7f604a87e9d8b680190eaebfaa608727db..b5c6843211aae0ef1cd9c3398f2869ae0a22ca10 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: netconf-neon
+    name: netconf-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
@@ -10,7 +10,7 @@
           rtd-token: aee2df909686ab7ba36f2ed08d90bdcf81f7b8dc
       - odl-maven-jobs
 
-    stream: neon
+    stream: sodium
     project: 'netconf'
     project-name: 'netconf'
     branch: 'master'
@@ -26,7 +26,7 @@
     staging-profile-id: a67b22fc3663f
 
 - project:
-    name: netconf-fluorine
+    name: netconf-neon
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
           rtd-token: aee2df909686ab7ba36f2ed08d90bdcf81f7b8dc
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'netconf'
     project-name: 'netconf'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'netconf-settings'
     mvn-goals: 'clean deploy -Pintegrationtests'
     staging-profile-id: a67b22fc3663f
 
 - project:
-    name: netconf-oxygen
+    name: netconf-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: netconf
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netconf/48397/
+          rtd-token: aee2df909686ab7ba36f2ed08d90bdcf81f7b8dc
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'netconf'
     project-name: 'netconf'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'netconf-settings'
     mvn-goals: 'clean deploy -Pintegrationtests'
diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml
deleted file mode 100644 (file)
index 4a6e160..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
----
-- project:
-    name: netide-neon
-    jobs:
-      - odl-maven-jobs
-
-    stream: neon
-    project: 'netide'
-    project-name: 'netide'
-    branch: 'master'
-    mvn-settings: 'netide-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowjava-merge-{stream}'
-    email-upstream: '[netide] [openflowjava]'
-
-    # Used by the release job
-    staging-profile-id: a67bab3755815
-
-- project:
-    name: netide-fluorine
-    jobs:
-      - odl-maven-jobs
-
-    stream: fluorine
-    project: 'netide'
-    project-name: 'netide'
-    branch: 'stable/fluorine'
-    mvn-settings: 'netide-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowjava-merge-{stream}'
-    email-upstream: '[netide] [openflowjava]'
-
-    # Used by the release job
-    staging-profile-id: a67bab3755815
-
-- project:
-    name: netide-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'netide'
-    project-name: 'netide'
-    branch: 'stable/oxygen'
-    mvn-settings: 'netide-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowjava-merge-{stream}'
-    email-upstream: '[netide] [openflowjava]'
-
-    # Used by the release job
-    staging-profile-id: a67bab3755815
-
-- project:
-    name: netide-sonar
-    jobs:
-      - gerrit-maven-sonar
-    project: 'netide'
-    project-name: 'netide'
-    branch: 'master'
-    mvn-settings: 'netide-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: netide-view
-    views:
-      - project-view
-    project-name: netide
index 7e34fe6b3414fc3453551bbf7ca4cd229c2f6f46..cb652a30e9e0c2bc09546715b4a754aea1a4d026 100644 (file)
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
           openstack_system_image: '{openstack_queens_system_image}'
           openstack_system2_image: '{openstack_queens_system_image}'
-
-- project:
-    name: netvirt-csit-hwvtep-openstack-integration-oxygen
-    jobs:
-      - inttest-csit-hwvtep-openstack-custom
-
-    project: 'netvirt'
-    stream: 'oxygen'
-    branch: 'stable/oxygen'
-    testplan: '{project}-{topology}-l2gw-openstack.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,l2gw-plugin'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: 'stateful'
-    odl_system_flavor: odl-highcpu-8
-    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 - 20181029-223513.438
-    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,decanter-collector-jmx,decanter-appender-elasticsearch'
-      - 3node:
-          openstack_system2_count: 3
-          odl_system_count: 3
-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
-
-    functionality:
-      - upstream-stateful
-      - gate-stateful
-
-    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}'
index d10c691496f5aad17d6c313d87634ac486921862..7274d996a3d2f3b9274902b4e3b6f5336ed26f58 100644 (file)
@@ -6,12 +6,13 @@
 
     project: 'netvirt'
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
+
     testplan: '{project}-{topology}-openstack.txt'
 
     test-suites: 'openstack/connectivity/l2.robot
@@ -19,7 +20,7 @@
 
     topology: '1node'
 
-    install-features: 'odl-netvirt-openstack, decanter-collector-jmx, decanter-appender-elasticsearch'
+    install-features: 'odl-netvirt-openstack, decanter-collector-jmx, decanter-appender-elasticsearch, odl-mdsal-trace'
 
     public-bridge: 'br-datacentre'
     public-physical-network: 'datacentre'
index d4a244d316f531c1d484f453a04aa2bb4ce8ddaa..0377cc987cf65aa44e2234344caacd2fc35feccf 100644 (file)
@@ -7,10 +7,13 @@
     project: 'netvirt'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
+          disable-job: true
 
     testplan: '{project}-{topology}-openstack-upgrade.txt'
     odl-ml2-driver-version: 'v2'
index 4548ca50c7494ec24774d652cf44f12cedeb219f..22b40f4e03d5921637114e8b4a75b6d7d23c5a70 100644 (file)
@@ -1,11 +1,11 @@
 ---
 - project:
-    name: netvirt-csit-openstack-integration-neon
+    name: netvirt-csit-openstack-integration-sodium
     jobs:
       - inttest-csit-openstack-custom
 
     project: 'netvirt'
-    stream: 'neon'
+    stream: 'sodium'
     branch: 'master'
     testplan: '{project}-{topology}-openstack.txt'
     odl-ml2-driver-version: 'v2'
           openstack_system2_image: '{openstack_queens_system_image}'
 
 - project:
-    name: netvirt-csit-openstack-integration-fluorine
+    name: netvirt-csit-openstack-integration-neon
     jobs:
       - inttest-csit-openstack-custom
 
     project: 'netvirt'
-    stream: 'fluorine'
-    branch: 'stable/fluorine'
+    stream: 'neon'
+    branch: 'stable/neon'
     testplan: '{project}-{topology}-openstack.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,tempest'
           openstack_system2_image: '{openstack_queens_system_image}'
 
 - project:
-    name: netvirt-csit-openstack-integration-oxygen
+    name: netvirt-csit-openstack-integration-fluorine
     jobs:
       - inttest-csit-openstack-custom
 
     project: 'netvirt'
-    stream: 'oxygen'
-    branch: 'stable/oxygen'
+    stream: 'fluorine'
+    branch: 'stable/fluorine'
     testplan: '{project}-{topology}-openstack.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,tempest'
       - upstream-stateful-snat-conntrack:
           odl-snat-mode: 'conntrack'
       - gate-stateful
-      - gate-stateful-snat-conntrack:
-          odl-snat-mode: 'conntrack'
       - 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.
           openstack_system2_image: '{openstack_queens_system_image}'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           ovs-install: 'v2.9.2'
+      - neon:
+          branch: 'stable/neon'
+          ovs-install: 'v2.9.2'
       - fluorine:
           branch: 'stable/fluorine'
           ovs-install: 'v2.9.2'
-      - oxygen:
-          branch: 'stable/oxygen'
-          ovs-install: 'v2.6.1-nsh'
-          os-cmp-cnt: 1
-          openstack_system2_count: 1
-          openstack_system_image: '{openstack_pike_system_image}'
-          openstack_system2_image: '{openstack_pike_system_image}'
 
 - project:
     name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration
     os-cmp-cnt: 0
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     topology:
       - 1node:
index 0cde5fc5ca9f55d3a4336c30814bd733288eaf03..3e1363ebc3ae1f8b747f5c9396e1bf13ef6d1e58 100644 (file)
@@ -9,8 +9,6 @@
         netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-neon
         netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-fluorine
         netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-fluorine
-        netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-oxygen
-        netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-oxygen
     report-logurl: 'https://logs.opendaylight.org/releng/vex-yul-odl-jenkins-1'
     report-numjobs: 100
     report-path: '/tmp/jobreports'
index 1827b80726242b112e1c9cab4a6545bc55eab102..6065a5abcecb0a2f434839dc0fdb71fa2e8e6bae 100644 (file)
@@ -7,15 +7,15 @@
     project: 'netvirt'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
+          os-branch: 'queens'
       - fluorine:
           branch: 'stable/fluorine'
           os-branch: 'queens'
-      - oxygen:
-          branch: 'stable/oxygen'
-          os-branch: 'queens'
 
     jdk: 'openjdk8'
 
index 02039887a075ee64bde7ed607e474077a6383b7c..967564c311bef9836edc02bcee8bd8fbae5f11ff 100644 (file)
     block_on_csit: false
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     project: 'netvirt'
     project-name: 'netvirt'
index 2453f98128c214316d655b39720352f4f711c735..9b1b75e37f363455e5b93fdc79d83dc03c5f7c1e 100644 (file)
@@ -7,15 +7,15 @@
     project: 'neutron'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
+          os-branch: 'queens'
       - fluorine:
           branch: 'stable/fluorine'
           os-branch: 'queens'
-      - oxygen:
-          branch: 'stable/oxygen'
-          os-branch: 'queens'
 
     jdk: 'openjdk8'
 
index 20e835ed5e4028bb0178bbec050beca6dd4f1030..23f7620ca81b19c5dea9201f47a2914e425f2e57 100644 (file)
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: neutron-neon
+    name: neutron-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: neon
+    stream: sodium
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 90
     staging-profile-id: a67e1b40d7419
 
 - project:
-    name: neutron-fluorine
+    name: neutron-neon
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 90
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     mvn-settings: 'neutron-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
     staging-profile-id: a67e1b40d7419
 
 - project:
-    name: neutron-oxygen
+    name: neutron-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 90
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     mvn-settings: 'neutron-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[neutron] [odlparent] [aaa]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a67e1b40d7419
diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml
deleted file mode 100644 (file)
index ed3e16a..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
----
-- project:
-    name: next-neon
-    jobs:
-      - odl-maven-jobs
-
-    stream: neon
-    project: 'next'
-    project-name: 'next'
-    branch: 'master'
-    mvn-settings: 'next-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[next]'
-
-    # Used by the release job
-    staging-profile-id: a67e7c516f385
-
-- project:
-    name: next-fluorine
-    jobs:
-      - odl-maven-jobs
-
-    stream: fluorine
-    project: 'next'
-    project-name: 'next'
-    branch: 'stable/fluorine'
-    mvn-settings: 'next-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[next]'
-
-    # Used by the release job
-    staging-profile-id: a67e7c516f385
-
-- project:
-    name: next-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'next'
-    project-name: 'next'
-    branch: 'stable/oxygen'
-    mvn-settings: 'next-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[next]'
-
-    # Used by the release job
-    staging-profile-id: a67e7c516f385
-
-- project:
-    name: next-sonar
-    jobs:
-      - gerrit-maven-sonar
-    project: 'next'
-    project-name: 'next'
-    branch: 'master'
-    mvn-settings: 'next-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: next-view
-    views:
-      - project-view
-    project-name: next
diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml
deleted file mode 100644 (file)
index c8421b9..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
----
-- project:
-    name: nic-neon
-    jobs:
-      - odl-maven-jobs
-
-    stream: neon
-    project: 'nic'
-    project-name: 'nic'
-    branch: 'master'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'nic-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}'
-    email-upstream: '[nic] [vtn] [groupbasedpolicy]'
-
-    # Used by the release job
-    staging-profile-id: a67ef386204aa
-
-- project:
-    name: nic-fluorine
-    jobs:
-      - odl-maven-jobs
-
-    stream: fluorine
-    project: 'nic'
-    project-name: 'nic'
-    branch: 'stable/fluorine'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'nic-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}'
-    email-upstream: '[nic] [vtn] [groupbasedpolicy]'
-
-    # Used by the release job
-    staging-profile-id: a67ef386204aa
-
-- project:
-    name: nic-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'nic'
-    project-name: 'nic'
-    branch: 'stable/oxygen'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'nic-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}'
-    email-upstream: '[nic] [vtn] [groupbasedpolicy]'
-
-    # Used by the release job
-    staging-profile-id: a67ef386204aa
-
-- project:
-    name: nic-sonar
-    jobs:
-      - gerrit-maven-sonar
-    project: 'nic'
-    project-name: 'nic'
-    branch: 'master'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'nic-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: nic-view
-    views:
-      - project-view
-    project-name: nic
diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml
deleted file mode 100644 (file)
index c07b59a..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
----
-- project:
-    name: ocpplugin-neon
-    jobs:
-      - odl-maven-jobs
-
-    stream: neon
-    project: 'ocpplugin'
-    project-name: 'ocpplugin'
-    branch: 'master'
-    mvn-settings: 'ocpplugin-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: a687673279f9c
-
-- project:
-    name: ocpplugin-fluorine
-    jobs:
-      - odl-maven-jobs
-
-    stream: fluorine
-    project: 'ocpplugin'
-    project-name: 'ocpplugin'
-    branch: 'stable/fluorine'
-    mvn-settings: 'ocpplugin-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: a687673279f9c
-
-- project:
-    name: ocpplugin-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'ocpplugin'
-    project-name: 'ocpplugin'
-    branch: 'stable/oxygen'
-    mvn-settings: 'ocpplugin-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: a687673279f9c
-
-- project:
-    name: ocpplugin-sonar
-    jobs:
-      - gerrit-maven-sonar
-
-    project: 'ocpplugin'
-    project-name: 'ocpplugin'
-    branch: 'master'
-    mvn-settings: 'ocpplugin-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: ocpplugin-view
-    views:
-      - project-view
-    project-name: ocpplugin
index 1ba9d383be03469e4b91533625200f4552f59f2e..88c47d85f7a4b09e04b467803ab93f9cfb1c153f 100644 (file)
@@ -7,15 +7,15 @@
     project: 'odlparent'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
+          os-branch: 'queens'
       - fluorine:
           branch: 'stable/fluorine'
           os-branch: 'queens'
-      - oxygen:
-          branch: 'stable/oxygen'
-          os-branch: 'queens'
 
     jdk: 'openjdk8'
 
index 8dbcaa052d448c0eca0973cd75e5c1be1451fb36..512fe25704b17cb2675eb5492390c42aae9d11a8 100644 (file)
@@ -30,7 +30,7 @@
     staging-profile-id: 880d5ac25eaa
 
 - project:
-    name: odlparent-3.1.x
+    name: odlparent-4.0.x
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
@@ -38,8 +38,8 @@
 
     project: odlparent
     project-name: odlparent
-    stream: 3.1.x
-    branch: 3.1.x
+    stream: 4.0.x
+    branch: 4.0.x
     distribution_branch: master
 
     mvn-settings: odlparent-settings
@@ -60,7 +60,7 @@
     staging-profile-id: 880d5ac25eaa
 
 - project:
-    name: odlparent-3.0.x
+    name: odlparent-3.1.x
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
@@ -68,8 +68,8 @@
 
     project: odlparent
     project-name: odlparent
-    stream: 3.0.x
-    branch: 3.0.x
+    stream: 3.1.x
+    branch: 3.1.x
     distribution_branch: master
 
     mvn-settings: odlparent-settings
index 4c848fa5893e87ce7237b52382513cddd213105f..944eb6100d8f0cc20438c64c8e5145093859a446 100644 (file)
     testplan: '{project}-basic.txt'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
 
index 6104f4fd5e741fa0a1dd6769efa16e946993e0fa..89d1baae80de46099eee40a44f95c113d5dc561f 100644 (file)
@@ -8,8 +8,10 @@
     jdk: openjdk8
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
 
index 60055fe106140b4be9ddaffe317e962be017c8f2..1d8966ed6ed878051d588b8a39fe76650bfeea8e 100644 (file)
           rtd-token: 225d4ef64e1efce4fe3ba4c9c4fe772355d3c8b2
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
+          disable-job: true
 
     project: odltools
     project-name: odltools
index c4baf3664d86abcfee2a55b2dd5b265c11e18b9e..c4040d9509e1bb47a2dc1353e1c2e45d44ea6bb3 100644 (file)
@@ -1,10 +1,10 @@
 ---
 - project:
-    name: of-config-neon
+    name: of-config-sodium
     jobs:
       - odl-maven-jobs
 
-    stream: neon
+    stream: sodium
     project: 'of-config'
     project-name: 'of-config'
     branch: 'master'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: netconf-merge-{stream}'
     email-upstream: '[of-config] [netconf]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a6880455efe67
 
 - project:
-    name: of-config-fluorine
+    name: of-config-neon
     jobs:
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'of-config'
     project-name: 'of-config'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     mvn-settings: 'of-config-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: netconf-merge-{stream}'
     email-upstream: '[of-config] [netconf]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a6880455efe67
 
 - project:
-    name: of-config-oxygen
+    name: of-config-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'of-config'
     project-name: 'of-config'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     mvn-settings: 'of-config-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: netconf-merge-{stream}'
     email-upstream: '[of-config] [netconf]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a6880455efe67
@@ -60,6 +62,7 @@
     branch: 'master'
     mvn-settings: 'of-config-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    disable-job: true
 
 - project:
     name: of-config-view
index 4cda23afcd78b588732113a154b87782828f10b5..a96aeb92aea9df265f9fd86671116893d4454ad2 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - all:
index b404b273f4e1b8f1fef7da48146815486f5105c6..b7f322e54310cc41a7416a0ac22351b3d62b0f62 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
@@ -30,7 +30,7 @@
     install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-drop-test'
 
     # Robot custom options
-    robot-options: '-v duration_in_secs:60 -v throughput_threshold:20000 -v latency_threshold:2000'
+    robot-options: '-v duration_in_secs:60 -v throughput_threshold:20000 -v latency_threshold:1000'
 
     # Plot Info
     01-plot-title: 'Throughput Mode'
index 04b07adb1f677b61f1fb9f872ff15c45ad8ae55b..2d1b48091c1dec966e294242ecae5875dbe9381b 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index 6cf7e904ee4a74eee84dc36d75112b6ac83eaa83..8def413783794f1502358cfedeef56d604f44991 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index 9bbc4cf698cde000b6576fff60d2b5b33b52ba10..736f080570edfadc2dd2122030ba186a42930465 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index 36c42a25308ce6be16775c7450add4a55d9a1f1d..7820b795ff83f9233cef95acbd577673c2f4deb4 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - all:
index ca0d53dbe07e80754405eec5f0e5715112493002..ef3a6ec22ee20804ebdab6af70608e701314c2ca 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index 540f34830855505b7f2c7b53fa7566651026a7a7..947a34406738f08006827128b7b1ab92abe3a5da 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index 1232f7ff9dbb45834d8fc0122dcd2baecb76dff0..566a6b01f8b6848c44bed98aaa8505a1b85f03a7 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index aa2a4db56aa826284460afec764323678b4b6920..c69615b3927c0108b56c0871f4e88916742079c3 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index f5287d8b9cd3ce36d370f7c4e5aa6c61177f8554..ba7bc2b594ae341e86e0727e8ec4dacc9c5a0561 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index 7bd8ad239e5e831f3f376f9f3236e951f6b7d22b..be686f303cc602c7b6814606b7b50a3e126a3a9f 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index 7d0a84343612501424320651bb236e3204ec3414..2eafdfe3b666b9de6eade70f06e96093c3494441 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index bcfd5647e3a9c417485658667ad1553c84e215a3..f0ce435bc96726d911e110a73c908fcce0145aea 100644 (file)
@@ -9,15 +9,15 @@
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
+          os-branch: 'queens'
       - fluorine:
           branch: 'stable/fluorine'
           os-branch: 'queens'
-      - oxygen:
-          branch: 'stable/oxygen'
-          os-branch: 'queens'
 
     jdk: 'openjdk8'
 
index 3b30d6118b5dde044892b1da963b149d9cb72ce6..bdf2513567ee9778e3f903b3ca0dd22cd6eb3817 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: openflowplugin-neon
+    name: openflowplugin-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
           rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f
       - odl-maven-jobs
 
-    stream: neon
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
+    stream: sodium
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'master'
@@ -32,7 +35,7 @@
     staging-profile-id: a68a76dc1b44c
 
 - project:
-    name: openflowplugin-fluorine
+    name: openflowplugin-neon
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
           rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f
       - odl-maven-jobs
 
-    stream: fluorine
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
+    stream: neon
     project: 'openflowplugin'
     project-name: 'openflowplugin'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     build-node: centos7-builder-2c-8g
     build-timeout: 90
     mvn-settings: 'openflowplugin-settings'
@@ -64,7 +70,7 @@
     staging-profile-id: a68a76dc1b44c
 
 - project:
-    name: openflowplugin-oxygen
+    name: openflowplugin-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
           rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'openflowplugin'
     project-name: 'openflowplugin'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     build-node: centos7-builder-2c-8g
     build-timeout: 90
     mvn-settings: 'openflowplugin-settings'
     project-name: 'openflowplugin'
 
 - project:
-    name: openflowplugin-oxygen-view
+    name: openflowplugin-fluorine-view
     views:
       - common-view
-    view-name: 'openflowplugin-oxygen'
-    view-regex: '^openflowplugin-.*-oxygen'
+    view-name: 'openflowplugin-flourine'
+    view-regex: '^openflowplugin-.*-fluorine'
index 9702ce9c814dec8a62c89e48daa75defcdca0a3a..217de21b5ea61059bc40b9f41fbb3d3e26a5b790 100644 (file)
@@ -6,18 +6,18 @@
       - 'opflex-merge-{stream}'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
-      - fluorine:
-          branch: 'stable/fluorine'
+      - neon:
+          branch: 'stable/neon'
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
-      - oxygen:
-          branch: 'stable/oxygen'
+      - fluorine:
+          branch: 'stable/fluorine'
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
 - job-template:
     name: 'opflex-verify-{stream}'
 
+    disable-job: false
+
     project-type: freestyle
     node: centos7-builder-2c-8g
     concurrent: true
     jdk: '{java-version}'
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
index a0f30f7244813921eac626511a9cbabc81254e3c..40e5e03bffc08fc261cd189d6de6b66aeb6fac8c 100644 (file)
@@ -12,6 +12,7 @@
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
+          disable-job: true
 
     project: 'opflex'
 
 - job-template:
     name: 'opflex-thirdparty-libuv-{stream}'
 
+    disable-job: false
+
     project-type: freestyle
     node: centos7-builder-2c-8g
     concurrent: true
+    disabled: '{disable-job}'
 
     group-id: 'libuv'
 
index ff6acfc8af15a8ca4e3fc53d05b6f16305370f64..ddca4e02dc2cd544cb1f787dbaa6660a087dc924 100644 (file)
       - 'opflex-release-{stream}'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
-      - fluorine:
-          branch: 'stable/fluorine'
+      - neon:
+          branch: 'stable/neon'
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
-      - oxygen:
-          branch: 'stable/oxygen'
+      - fluorine:
+          branch: 'stable/fluorine'
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
 
     node: centos7-builder-2c-8g
     jdk: '{java-version}'
+    disabled: '{disable-job}'
 
     ######################
     # Default parameters #
     ######################
 
+    disable-job: false
     build-timeout: 30
     java-version: openjdk8
     mvn-opts: ''
diff --git a/jjb/ovil/ovil.yaml b/jjb/ovil/ovil.yaml
deleted file mode 100644 (file)
index 6e7ef19..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
----
-- project:
-    name: ovil-neon
-    jobs:
-      - odl-maven-jobs
-      - gerrit-tox-verify
-
-    stream: neon
-    project: ovil
-    project-name: ovil
-    branch: 'master'
-    mvn-settings: ovil-settings
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-    dependencies: ''
-    email-upstream: '[ovil]'
-
-    # Used by the release job
-    staging-profile-id: 7b48866c207d8
-
-- project:
-    name: ovil-fluorine
-    jobs:
-      - odl-maven-jobs
-      - gerrit-tox-verify
-
-    stream: fluorine
-    project: ovil
-    project-name: ovil
-    branch: 'stable/fluorine'
-    mvn-settings: ovil-settings
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-    dependencies: ''
-    email-upstream: '[ovil]'
-
-    # Used by the release job
-    staging-profile-id: 7b48866c207d8
-
-- project:
-    name: ovil-oxygen
-    jobs:
-      - odl-maven-jobs
-      - gerrit-tox-verify
-
-    stream: oxygen
-    project: ovil
-    project-name: ovil
-    branch: 'stable/oxygen'
-    mvn-settings: ovil-settings
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-    dependencies: ''
-    email-upstream: '[ovil]'
-
-    # Used by the release job
-    staging-profile-id: 7b48866c207d8
-
-- project:
-    name: ovil-sonar
-    jobs:
-      - gerrit-maven-sonar
-    project: 'ovil'
-    project-name: 'ovil'
-    branch: 'master'
-    mvn-settings: 'ovil-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: ovil-view
-    views:
-      - project-view
-    project-name: ovil
index 4eb6ee08b65c163b925699ccb88f6a0d090c5a4e..bade29c759dee212ec927549c5f8006506fa2621 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index 7453bddb94aad3719e4a7809094d66671dc23d99..96d4a5f81f399c2dc71d1fb993db62c0e8f29057 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - all:
index 8f02b5d3eb0b469694cb00e75eac9bec3bbad8cd..803116ad7fbc3b0385347d3db9670321544e998e 100644 (file)
@@ -5,12 +5,12 @@
       - 'ovsdb-daily-full-integration-{stream}'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     project: 'ovsdb'
     archive-artifacts: '*.log'
 - job-template:
     name: 'ovsdb-daily-full-integration-{stream}'
 
+    disable-job: false
+
     project-type: freestyle
     node: centos7-docker-1c-4g
     jdk: '{java-version}'
     description: >
         Integration tests for the OVSDB project against different versions of
         OVS and branches. This job runs nightly.
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
index 560e8b127b4ff5ddec1282d609fe4e72efa64094..c80f878beaef4c48543cdeaedc0e9173eafd9177 100644 (file)
@@ -8,15 +8,15 @@
     project: 'ovsdb'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
+          os-branch: 'queens'
       - fluorine:
           branch: 'stable/fluorine'
           os-branch: 'queens'
-      - oxygen:
-          branch: 'stable/oxygen'
-          os-branch: 'queens'
 
     jdk: 'openjdk8'
 
index a62d9800a3a81a313e9e7f58f9553ab12b795477..991e030e79d5fd44dc864b3015375eb8b00c7d3f 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: ovsdb-neon
+    name: ovsdb-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
           rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be
       - odl-maven-jobs
 
-    stream: neon
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
+    stream: sodium
     project: 'ovsdb'
     project-name: 'ovsdb'
     branch: 'master'
@@ -25,7 +28,7 @@
     staging-profile-id: a68b188166958
 
 - project:
-    name: ovsdb-fluorine
+    name: ovsdb-neon
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
           rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be
       - odl-maven-jobs
 
-    stream: fluorine
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
+    stream: neon
     project: 'ovsdb'
     project-name: 'ovsdb'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'ovsdb-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     staging-profile-id: a68b188166958
 
 - project:
-    name: ovsdb-oxygen
+    name: ovsdb-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: ovsdb
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/
+          rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'ovsdb'
     project-name: 'ovsdb'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'ovsdb-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 6025be9a1e0b149f0ed1fd5eea00f6a431ce709e..cf9c19ca2921fa6e9d52775750539b3de1f8b9f8 100644 (file)
@@ -1,11 +1,11 @@
 ---
 - project:
-    name: p4plugin-neon
+    name: p4plugin-sodium
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: neon
+    stream: sodium
     project: 'p4plugin'
     project-name: 'p4plugin'
     branch: 'master'
     staging-profile-id: a68bf26e208d4
 
 - project:
-    name: p4plugin-fluorine
+    name: p4plugin-neon
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'p4plugin'
     project-name: 'p4plugin'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     mvn-settings: 'p4plugin-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     staging-profile-id: a68bf26e208d4
 
 - project:
-    name: p4plugin-oxygen
+    name: p4plugin-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'p4plugin'
     project-name: 'p4plugin'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     mvn-settings: 'p4plugin-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
index 7076350381c4057f3a25b5b6b4cc6c462342bb60..57b8de52e7e026975c0e68ec738ace45bb0202c3 100644 (file)
@@ -15,9 +15,7 @@ $PYTHON -m pip install --upgrade pip
 $PYTHON -m pip install -r "$WORKSPACE/packaging/packages/requirements.txt"
 
 # Convert stream to numeric ODL major version
-if [ "$STREAM" == "oxygen" ]; then
-  VERSION_MAJOR=8
-elif [ "$STREAM" == "fluorine" ]; then
+if [ "$STREAM" == "fluorine" ]; then
   VERSION_MAJOR=9
 elif [ "$STREAM" == "neon" ]; then
   VERSION_MAJOR=10
index fb0b1856f96779844b9834bae0e26ad183447479..3752bd0f819e2c1114bab67624483f8cba2fa264 100644 (file)
           branch: 'master'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
 - job-template:
     name: '{project-name}-test-sanity-{stream}'
 
     node: centos7-docker-1c-4g
+    disable-job: false
 
     project-type: freestyle
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
     name: '{project-name}-test-full-{stream}'
 
     node: centos7-docker-1c-4g
+    disable-job: false
 
     project-type: freestyle
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
index 10a19718fd15307fd58f0100982ba8158b437ef8..2eaad7a29955f07074a945a0972a8ff20f7041e4 100644 (file)
@@ -27,7 +27,7 @@
     stream:
       - neon
       - fluorine
-      - oxygen
+
     distro:
       - opensuse-42
       - epel-7
 - job-template:
     name: 'packaging-build-rpm-{stream}'
 
+    disable-job: false
+
     node: centos7-builder-2c-2g
 
     project-type: freestyle
+    disabled: '{disable-job}'
 
     mvn-opts: ''
     mvn-params: ''
     name: 'packaging-build-rpm-{distro}-snap-{stream}'
 
     node: centos7-docker-2c-2g
+    disable-job: false
 
     project-type: freestyle
+    disabled: '{disable-job}'
 
     mvn-opts: ''
     mvn-params: ''
     name: 'packaging-verify-rpm-master'
 
     node: centos7-builder-2c-2g
+    disable-job: false
 
     project-type: freestyle
+    disabled: '{disable-job}'
 
     parameters:
       - opendaylight-infra-parameters:
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
+      # Test Neon ('Managed Release Common Distro') release tarball
+      - inject:
+          # yamllint disable-line rule:line-length
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/opendaylight/0.10.0/opendaylight-0.10.0.tar.gz'
+      - shell: !include-raw-escape: build-rpm.sh
+      - install-test-uninstall-rpm
+
       # Test Fluorine ('Managed Release Common Distro') release tarball
       - inject:
           # yamllint disable-line rule:line-length
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
-      # Test Neon pre-release autorelease tarball
-      # NB: This will need to be updated as old builds expire
+      # Test Fluorine SR2 release tarball
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2569/org/opendaylight/integration/karaf/0.10.0/karaf-0.10.0.tar.gz'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.9.2/karaf-0.9.2.tar.gz'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
+      # Test Neon pre-release autorelease tarball
+      # NB: This will need to be updated as old builds expire
+      # - inject:
+      # yamllint disable-line rule:line-length
+      #     properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2620/org/opendaylight/integration/karaf/0.10.0/karaf-0.10.0.tar.gz'
+      # - shell: !include-raw-escape: build-rpm.sh
+      # - install-test-uninstall-rpm
+
       # Test Neon multipatch zip (no parallel tarball available)
       # NB: This will need to be updated as old builds expire
-      - inject:
-          # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.10.0-SNAPSHOT/karaf-0.10.0-20181208.003609-30.zip'
-      - shell: !include-raw-escape: build-rpm.sh
-      - install-test-uninstall-rpm
+      - inject:
+      # yamllint disable-line rule:line-length
+      #     properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.10.0-SNAPSHOT/karaf-0.10.0-20190103.173010-50.zip'
+      - shell: !include-raw-escape: build-rpm.sh
+      - install-test-uninstall-rpm
 
       # Test latest Neon snapshot
       - inject:
     name: 'packaging-verify-full-rpm-master'
 
     node: centos7-builder-2c-2g
+    disable-job: false
 
     project-type: freestyle
+    disabled: '{disable-job}'
 
     parameters:
       - opendaylight-infra-parameters:
 
       # Test Oxygen pre-release autorelease tarball
       # NB: This will need to be updated as old builds expire
-      - inject:
-          # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2571/org/opendaylight/integration/karaf/0.8.4/karaf-0.8.4.tar.gz'
-      - shell: !include-raw-escape: build-rpm.sh
-      - install-test-uninstall-rpm
+      - inject:
+      # yamllint disable-line rule:line-length
+      #     properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2622/org/opendaylight/integration/karaf/0.8.5/karaf-0.8.5.tar.gz'
+      - shell: !include-raw-escape: build-rpm.sh
+      - install-test-uninstall-rpm
 
       # Test latest Oxygen snapshot
       - inject:
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
-      # Test Fluorine pre-release autorelease tarball
-      # NB: This will need to be updated as old builds expire
+      # Test Fluorine SR2 release tarball
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2570/org/opendaylight/integration/karaf/0.9.2/karaf-0.9.2.tar.gz'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.9.2/karaf-0.9.2.tar.gz'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
-      # Test Fluorine multipatch zip (no parallel tarball available)
-      # NB: This will need to be updated as old builds expire
+      # Test Neon release tarball
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.9.2-SNAPSHOT/karaf-0.9.2-20181201.152658-5.zip'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.10.0/karaf-0.10.0.tar.gz'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
+      # Test Fluorine pre-release autorelease tarball
+      # NB: This will need to be updated as old builds expire
+      # - inject:
+      # yamllint disable-line rule:line-length
+      #     properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2621/org/opendaylight/integration/karaf/0.9.2/karaf-0.9.2.tar.gz'
+      # - shell: !include-raw-escape: build-rpm.sh
+      # - install-test-uninstall-rpm
+
+      # Test Fluorine multipatch zip (no parallel tarball available)
+      # NB: This will need to be updated as old builds expire
+      # - inject:
+      # yamllint disable-line rule:line-length
+      #     properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.9.2-SNAPSHOT/karaf-0.9.2-20181222.162905-8.zip'
+      # - shell: !include-raw-escape: build-rpm.sh
+      # - install-test-uninstall-rpm
+
       # Test latest Fluorine snapshot
       - inject:
           properties-content: 'STREAM=fluorine'
 
       # Test Neon pre-release autorelease tarball
       # NB: This will need to be updated as old builds expire
-      - inject:
-          # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2569/org/opendaylight/integration/karaf/0.10.0/karaf-0.10.0.tar.gz'
-      - shell: !include-raw-escape: build-rpm.sh
-      - install-test-uninstall-rpm
+      - inject:
+      # yamllint disable-line rule:line-length
+      #     properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2620/org/opendaylight/integration/karaf/0.10.0/karaf-0.10.0.tar.g'
+      - shell: !include-raw-escape: build-rpm.sh
+      - install-test-uninstall-rpm
 
       # Test Neon multipatch zip (no parallel tarball available)
       # NB: This will need to be updated as old builds expire
-      - inject:
-          # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.10.0-SNAPSHOT/karaf-0.10.0-20181208.003609-30.zip'
-      - shell: !include-raw-escape: build-rpm.sh
-      - install-test-uninstall-rpm
+      - inject:
+      # yamllint disable-line rule:line-length
+      #     properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.10.0-SNAPSHOT/karaf-0.10.0-20190103.173010-50.zip'
+      - shell: !include-raw-escape: build-rpm.sh
+      - install-test-uninstall-rpm
 
       # Test latest Neon snapshot
       - inject:
     name: 'packaging-test-rpm-master'
 
     node: centos7-builder-2c-2g
+    disable-job: false
+
+    disabled: '{disable-job}'
 
     parameters:
       - opendaylight-infra-parameters:
 - job-template:
     name: 'packaging-test-rpm-upgrade-master'
 
+    disable-job: false
+
     node: centos7-builder-2c-2g
+    disabled: '{disable-job}'
 
     parameters:
       - opendaylight-infra-parameters:
     name: 'packaging-test-deb-master'
 
     node: ubuntu1604-mininet-ovs-25-1c-4g
+    disable-job: false
+
+    disabled: '{disable-job}'
 
     parameters:
       - opendaylight-infra-parameters:
     name: 'packaging-build-deb-{stream}'
 
     node: ubuntu1604-mininet-ovs-25-1c-4g
+    disable-job: false
 
     project-type: freestyle
+    disabled: '{disable-job}'
 
     mvn-opts: ''
     mvn-params: ''
index 64b788e0dea5e7bc5e67f68032c345b8fc898b30..622fac40494a2bfc30d167c40094238619654448 100644 (file)
@@ -19,4 +19,4 @@ sudo cp $WORKSPACE/packaging-ansible/library/odl_usermod.py /usr/share/ansible/p
 sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/tests/test-odl-users.yaml -v
 
 # Test the custom log configurations
-sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/tests/test-odl-logs.yaml -e test_log_level=DEBUG -e test_log_mechanism=console -v
+#sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/tests/test-odl-logs.yaml -e test_log_level=DEBUG -e test_log_mechanism=console -v
index 8fabbb7d667ec86e17522eba192f3622768bdcdf..a0ba51d245bae63067fcf20a819d1ee8a8460aa1 100644 (file)
@@ -19,4 +19,4 @@ sudo cp $WORKSPACE/packaging-ansible/library/odl_usermod.py /usr/share/ansible/p
 sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/tests/test-odl-users.yaml -v
 
 # Test the custom log configurations
-sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/tests/test-odl-logs.yaml -e test_log_level=INFO -e test_log_mechanism=file -v
+#sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/tests/test-odl-logs.yaml -e test_log_level=INFO -e test_log_mechanism=file -v
index 36f7c8e5f5bf50d70b8777aa0e8620c5d189a671..a671fffb09bf42ee5e671dd7458febf7972dcfd3 100644 (file)
@@ -19,4 +19,4 @@ sudo cp $WORKSPACE/packaging-ansible/library/odl_usermod.py /usr/share/ansible/p
 sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/tests/test-odl-users.yaml -v
 
 # Test the custom log configurations
-sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/tests/test-odl-logs.yaml -e test_log_level=DEBUG -e test_log_mechanism=console -v
+#sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/tests/test-odl-logs.yaml -e test_log_level=DEBUG -e test_log_mechanism=console -v
index 8d352a80b3d5e61cc65a306a04bfe28c45184f7f..a0319c48b022cffe6742fb38490ddfc946b91705 100644 (file)
@@ -19,4 +19,4 @@ sudo cp $WORKSPACE/packaging-ansible/library/odl_usermod.py /usr/share/ansible/p
 sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/tests/test-odl-users.yaml -v
 
 # Test the custom log configurations
-sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/tests/test-odl-logs.yaml -e test_log_level=INFO -e test_log_mechanism=file -v
+#sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/tests/test-odl-logs.yaml -e test_log_level=INFO -e test_log_mechanism=file -v
index d460e451edbce671d298fd26fe2c6bbcefb16b70..c0aace6c093093924284526ffd4c167e76d613de 100644 (file)
@@ -28,15 +28,19 @@ set +e
 # shellcheck disable=SC1090
 source "$HOME/.rvm/scripts/rvm"
 set -e
-rvm install 2.4.0
+rvm install 2.6.0
 set -x
 ruby --version
 # This has to be done as a login shell to get rvm fns
 # https://rvm.io/support/faq#what-shell-login-means-bash-l
 # http://superuser.com/questions/306530/run-remote-ssh-command-with-full-login-shell
-bash -lc "rvm use 2.4.0 --default"
+bash -lc "rvm use 2.6.0 --default"
 ruby --version
 
+# Update RubyGems using itself, as OS package may be old
+# Ran into RubyGems 2.x installed by OS, 3.x required by Bundler in INTPAK-230
+gem update --system
+
 # Install gems dependencies of puppet-opendaylight via Bundler
 gem install bundler
 echo export PATH="\\$PATH:/usr/local/bin" >> "$HOME/.bashrc"
index a7faeb446229094923f756f0160c521ab3959b2e..980011d00bccbcc2f5d9675a5b06dc6f1f40029f 100644 (file)
@@ -26,7 +26,7 @@ sudo docker exec $docker_id /bin/bash $scripts_path/start-odl.sh
 sudo docker exec $docker_id /bin/bash $scripts_path/test-ports-nofeature.sh
 
 # Don't install test feature and check REST for Oxygen, ODLPARENT-139 breaks it
-if [ "$STREAM" == "oxygen" ] || [ "$STREAM" == "fluorine" ] || [ "$STREAM" == "neon" ]; then
+if [ "$STREAM" == "fluorine" ] || [ "$STREAM" == "neon" ]; then
   sudo docker exec $docker_id /usr/bin/expect $scripts_path/test-karaf-oxygensafe.expect
 else
   sudo docker exec $docker_id /usr/bin/expect $scripts_path/test-karaf.expect
index 1c2b4563232d0c20282ba690140db508d468b94a..c8ed2020054067e3f8fdfcb71dcff931bed0fed8 100644 (file)
     # The functionality under test
     functionality: 'pcmm'
 
+    disable-job: true
+
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - all:
index 7d500b4e9a2908c59a495f5e35ebb2bce4b79785..fb1e2d6896c5bc7662efedf4aef9c2eab1fd3615 100644 (file)
@@ -1,10 +1,10 @@
 ---
 - project:
-    name: packetcable-neon
+    name: packetcable-sodium
     jobs:
       - odl-maven-jobs
 
-    stream: neon
+    stream: sodium
     project: 'packetcable'
     project-name: 'packetcable'
     branch: 'master'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[packetcable]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a68ca4a24655c
 
 - project:
-    name: packetcable-fluorine
+    name: packetcable-neon
     jobs:
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'packetcable'
     project-name: 'packetcable'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     mvn-settings: 'packetcable-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[packetcable]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a68ca4a24655c
 
 - project:
-    name: packetcable-oxygen
+    name: packetcable-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'packetcable'
     project-name: 'packetcable'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     mvn-settings: 'packetcable-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[packetcable]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a68ca4a24655c
@@ -60,6 +62,7 @@
     branch: 'master'
     mvn-settings: 'packetcable-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    disable-job: true
 
 - project:
     name: packetcable-view
index ba5479ee141cd44e51899a3dbef5041c59c69998..8b35fbf77a2b46bd8202baf73851a9677052fb5c 100644 (file)
@@ -29,7 +29,7 @@
     build-node: centos7-builder-2c-2g
     archive-artifacts: '**/*.log'
     build-timeout: 30
-    jjb-version: 2.8.0
+    jjb-version: 2.9.1
 
 - project:
     name: builder-openstack
index d735b4876e3e56d0635154300fb9dc7e32c0a8b1..8ef6aae3dbfbb367abfc34d311bf6c32d5cc6ee6 100644 (file)
       - '{project-name}-merge-{stream}':
           build-timeout: 180
           mvn-goals: clean install -V -Dmaven.compile.fork=true -Dintegrationtests -Dvtn.build.jobs=2
+          disable-job: '{disable-job}'
 
       - gerrit-maven-stage:
           sign-artifacts: true
           mvn-central: true
-          ossrh-profile-id: 7edbe315063867
+          ossrh-profile-id: 6386ebbbf3a563
       - gerrit-maven-verify
       - gerrit-maven-verify-dependencies:
           build-timeout: 180
 
     mvn-version: mvn35
+    disable-job: '{disable-job}'
 
 - job-template:
     name: '{project-name}-integration-{stream}'
@@ -42,6 +44,7 @@
       **/target/failsafe-reports/failsafe-summary.xml
       **/target/surefire-reports/*-output.txt
     mvn-goals: clean install
+    disable-job: false
 
     #####################
     # Job Configuration #
@@ -50,6 +53,7 @@
     project-type: freestyle
     node: '{build-node}'
     jdk: '{java-version}'
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
     ######################
     # Default parameters #
     ######################
+    disable-job: 'false'
 
     archive-artifacts: >
       **/*.log
     project-type: maven
     node: '{build-node}'
     jdk: '{java-version}'
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
index 1dd8b35ddbcf11b0937639cf63194d41b70188c4..18e5efb10bb68955cdf71466f9395f1210455d15 100644 (file)
     view-description: 'List of Patch-Test jobs, for prioritizing jobs via the Job Priorities plugin'
     view-regex: '.*-patch-test-.*'
 
-- project:
-    name: Periodic
-    project: Periodic
-    project-name: Periodic
-    view-name: Periodic
-    views:
-      - common-view
-    view-description: 'List of Periodic jobs'
-    view-regex: '[a-zA-Z0-9]+-periodic-[a-zA-Z0-9]+'
-
-- project:
-    name: Release
-    views:
-      - common-view
-    view-name: Release
-    view-description: 'List of Release jobs'
-    view-regex: '.*-release-.*'
-
 - project:
     name: Sanity
     views:
diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
deleted file mode 100644 (file)
index 146c188..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
----
-- project:
-    name: sdninterfaceapp-neon
-    jobs:
-      - odl-maven-jobs
-
-    stream: neon
-    project: 'sdninterfaceapp'
-    project-name: 'sdninterfaceapp'
-    branch: 'master'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'sdninterfaceapp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'bgpcep-merge-{stream}'
-    email-upstream: '[sdninterfaceapp] [bgpcep]'
-
-    # Used by the release job
-    staging-profile-id: a68e3d1ff55e3
-
-- project:
-    name: sdninterfaceapp-fluorine
-    jobs:
-      - odl-maven-jobs
-
-    stream: fluorine
-    project: 'sdninterfaceapp'
-    project-name: 'sdninterfaceapp'
-    branch: 'stable/fluorine'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'sdninterfaceapp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'bgpcep-merge-{stream}'
-    email-upstream: '[sdninterfaceapp] [bgpcep]'
-
-    # Used by the release job
-    staging-profile-id: a68e3d1ff55e3
-
-- project:
-    name: sdninterfaceapp-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'sdninterfaceapp'
-    project-name: 'sdninterfaceapp'
-    branch: 'stable/oxygen'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'sdninterfaceapp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'bgpcep-merge-{stream}'
-    email-upstream: '[sdninterfaceapp] [bgpcep]'
-
-    # Used by the release job
-    staging-profile-id: a68e3d1ff55e3
-
-- project:
-    name: sdninterfaceapp-sonar
-    jobs:
-      - gerrit-maven-sonar
-
-    project: 'sdninterfaceapp'
-    project-name: 'sdninterfaceapp'
-    branch: 'master'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'sdninterfaceapp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: sdninterfaceapp-view
-    views:
-      - project-view
-    project-name: sdninterfaceapp
index da018f3a1bd522538555cb6abe29ec1328c8af1c..450cbc2ba226e65d5a978625a4aa49d45ecf46b0 100644 (file)
@@ -7,15 +7,15 @@
     project: 'serviceutils'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
+          os-branch: 'queens'
       - fluorine:
           branch: 'stable/fluorine'
           os-branch: 'queens'
-      - oxygen:
-          branch: 'stable/oxygen'
-          os-branch: 'queens'
 
     jdk: 'openjdk8'
 
index 98801745618fb27223023542db4d9c97dfb6e44e..2a69a930919ce1808dfc7f06baf132a5760eba1c 100644 (file)
       - odl-maven-jobs
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     project: 'serviceutils'
     project-name: 'serviceutils'
index 05b7fd2f825a8100355b234eb181d9bb7a2aa507..bca4fbc0f5a4a24a65872cb0f5a40eeab57ac633 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - all:
index d12157507d4179ce7a55737ab03d5b47bdda43dd..9c2a82031709800c9b0cc26ed137cb9066f4e40f 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - all:
index 1e4833e31b9cafd84d241149a68b59756a6eb7e4..597bba707c550b4aee7105dd6d143dbed75882b5 100644 (file)
@@ -9,15 +9,15 @@
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
+          os-branch: 'queens'
       - fluorine:
           branch: 'stable/fluorine'
           os-branch: 'queens'
-      - oxygen:
-          branch: 'stable/oxygen'
-          os-branch: 'queens'
 
     feature:
       - basic:
index 3dfecd935726b5ce9ecbb8e2ee488770295352ab..3152dfa38b9122750d8a27ff36f5edc48d6bff59 100644 (file)
@@ -5,12 +5,12 @@
       - 'gerrit-tox-verify'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     project: 'sfc'
     project-name: 'sfc'
index 4e659c575643eee72f1865f4361d4cf6ad31154b..cd9e992288c599f1024d5f6af937aaf9f5c99d27 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: sfc-neon
+    name: sfc-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
@@ -10,7 +10,7 @@
           rtd-token: 2fa6c2900bbe181b0427ad65df3dc494ac749edb
       - odl-maven-jobs
 
-    stream: neon
+    stream: sodium
     project: 'sfc'
     project-name: 'sfc'
     branch: 'master'
@@ -25,7 +25,7 @@
     staging-profile-id: a68eb361ca48a
 
 - project:
-    name: sfc-fluorine
+    name: sfc-neon
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
           rtd-token: 2fa6c2900bbe181b0427ad65df3dc494ac749edb
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'sfc'
     project-name: 'sfc'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     mvn-settings: 'sfc-settings'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     build-timeout: 120
@@ -50,7 +50,7 @@
     staging-profile-id: a68eb361ca48a
 
 - project:
-    name: sfc-oxygen
+    name: sfc-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
           rtd-token: 2fa6c2900bbe181b0427ad65df3dc494ac749edb
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'sfc'
     project-name: 'sfc'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     mvn-settings: 'sfc-settings'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     build-timeout: 120
diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml
deleted file mode 100644 (file)
index 9d6ef95..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
----
-- project:
-    name: snbi-neon
-    jobs:
-      - odl-maven-jobs
-
-    stream: neon
-    project: 'snbi'
-    project-name: 'snbi'
-    branch: 'master'
-    mvn-settings: 'snbi-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[snbi]'
-
-    # Used by the release job
-    staging-profile-id: a68f328cefed6
-
-- project:
-    name: snbi-fluorine
-    jobs:
-      - odl-maven-jobs
-
-    stream: fluorine
-    project: 'snbi'
-    project-name: 'snbi'
-    branch: 'stable/fluorine'
-    mvn-settings: 'snbi-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[snbi]'
-
-    # Used by the release job
-    staging-profile-id: a68f328cefed6
-
-- project:
-    name: snbi-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'snbi'
-    project-name: 'snbi'
-    branch: 'stable/oxygen'
-    mvn-settings: 'snbi-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[snbi]'
-
-    # Used by the release job
-    staging-profile-id: a68f328cefed6
-
-- project:
-    name: snbi-sonar
-    jobs:
-      - gerrit-maven-sonar
-    project: 'snbi'
-    project-name: 'snbi'
-    branch: 'master'
-    mvn-settings: 'snbi-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: snbi-view
-    views:
-      - project-view
-    project-name: snbi
index 10a13ea7912921135a4d4a30094e877f8ba6556b..996ea76c1611d009b9c316aa9b4854f4eecf556b 100644 (file)
@@ -1,10 +1,10 @@
 ---
 - project:
-    name: snmp-neon
+    name: snmp-sodium
     jobs:
       - odl-maven-jobs
 
-    stream: neon
+    stream: sodium
     project: 'snmp'
     project-name: 'snmp'
     branch: 'master'
     staging-profile-id: a68fb236b93a6
 
 - project:
-    name: snmp-fluorine
+    name: snmp-neon
     jobs:
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'snmp'
     project-name: 'snmp'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     mvn-settings: 'snmp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     staging-profile-id: a68fb236b93a6
 
 - project:
-    name: snmp-oxygen
+    name: snmp-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'snmp'
     project-name: 'snmp'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     mvn-settings: 'snmp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
index 228b19f42d54ffd7e0b201bec28bbcee7d328b45..9a45a18dd8ef0e9bf5421eb808f69aeb76201093 100644 (file)
@@ -1,10 +1,10 @@
 ---
 - project:
-    name: snmp4sdn-neon
+    name: snmp4sdn-sodium
     jobs:
       - odl-maven-jobs
 
-    stream: neon
+    stream: sodium
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
     branch: 'master'
     staging-profile-id: a69034a4b6ef5
 
 - project:
-    name: snmp4sdn-fluorine
+    name: snmp4sdn-neon
     jobs:
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     mvn-settings: 'snmp4sdn-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     staging-profile-id: a69034a4b6ef5
 
 - project:
-    name: snmp4sdn-oxygen
+    name: snmp4sdn-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     mvn-settings: 'snmp4sdn-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
index 3cb0856e0bb6ecd2790741a74a5c131f4abd9b4c..58a77943568268a15ab1100fddc48191298d93a6 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
           trigger-jobs: '{project}-merge-{stream}'
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
       - fluorine:
           branch: 'stable/fluorine'
           trigger-jobs: '{project}-merge-{stream}'
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
-      - oxygen:
-          branch: 'stable/oxygen'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features'
 
     install:
       - all:
           scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-sxp-controller'
+    install-features: 'odl-restconf,odl-sxp-routing'
 
     # Robot custom options
     robot-options: ''
index a46a8d1a4c72ad93413b619fff389983c9c8ef15..34683f847320ff150a0b8a058b1bcac7a08d27ad 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
           trigger-jobs: '{project}-merge-{stream}'
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
       - fluorine:
           branch: 'stable/fluorine'
           trigger-jobs: '{project}-merge-{stream}'
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features'
 
     install:
       - all:
           scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-sxp-controller'
+    install-features: 'odl-restconf,odl-sxp-routing'
 
     # Robot custom options
     robot-options: ''
similarity index 63%
rename from jjb/sxp/sxp-csit-cluster-routing.yaml
rename to jjb/sxp/sxp-csit-cluster-binding.yaml
index 723c3e4a2e1cf94385906ec2da525fa492e18f24..1c67fec39637bb1de7e4636be2bd5937ebd70741 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: sxp-csit-routing
+    name: sxp-csit-cluster-binding
     jobs:
       - inttest-csit-3node
 
@@ -8,34 +8,31 @@
     project: 'sxp'
 
     # The functionality under test
-    functionality: 'routing'
+    functionality: 'cluster-binding'
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
           trigger-jobs: '{project}-merge-{stream}'
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
       - fluorine:
           branch: 'stable/fluorine'
           trigger-jobs: '{project}-merge-{stream}'
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
-      - oxygen:
-          branch: 'stable/oxygen'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features'
 
     install:
       - all:
           scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-sxp-controller,odl-sxp-routing'
-
-    # Tools VMs:
-    tools_system_count: 2
+    install-features: 'odl-restconf,odl-sxp-routing'
 
     # Robot custom options:
     robot-options: ''
index 700753c2429922ccde177eeef8309ba7bc7869b4..09ac3079d164bf2dfd37ddfac46dd2000eca4ad3 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
           trigger-jobs: '{project}-merge-{stream}'
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
       - fluorine:
           branch: 'stable/fluorine'
           trigger-jobs: '{project}-merge-{stream}'
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
-      - oxygen:
-          branch: 'stable/oxygen'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features'
 
     install:
       - all:
           scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-sxp-controller'
+    install-features: 'odl-restconf,odl-sxp-routing'
 
     # Robot custom options:
     robot-options: ''
index 9bd243f7bca975ffaa368ec326acee5d768f2092..ef910c9d6391977310a4b5b10ed9809c0bfda23f 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
           trigger-jobs: '{project}-merge-{stream}'
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
       - fluorine:
           branch: 'stable/fluorine'
           trigger-jobs: '{project}-merge-{stream}'
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
-      - oxygen:
-          branch: 'stable/oxygen'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features'
 
     install:
       - all:
           scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-sxp-controller'
+    install-features: 'odl-restconf,odl-sxp-routing'
 
     # Robot custom options
     robot-options: ''
index be41e19483781437bce7bf0a06c4312ebb9f5893..7f970e61eaf1485551d6fc92552c8f42ea761775 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
           trigger-jobs: '{project}-merge-{stream}'
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
       - fluorine:
           branch: 'stable/fluorine'
           trigger-jobs: '{project}-merge-{stream}'
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
-      - oxygen:
-          branch: 'stable/oxygen'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features'
 
     install:
       - all:
           scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-sxp-controller,odl-sxp-robot'
+    install-features: 'odl-restconf,odl-sxp-routing,odl-sxp-robot'
 
     # Robot custom options:
     robot-options: ''
index 55bec1ec27237bf4089d694d2134b8b705b22ba1..ab4be0034ca7078b6f2854a5a4ba96d1b219eb74 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
           trigger-jobs: '{project}-merge-{stream}'
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
       - fluorine:
           branch: 'stable/fluorine'
           trigger-jobs: '{project}-merge-{stream}'
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
-      - oxygen:
-          branch: 'stable/oxygen'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features'
 
     install:
       - all:
           scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-sxp-controller'
+    install-features: 'odl-restconf,odl-sxp-routing'
 
     # Robot custom options
     robot-options: ''
index deb7b97d6073f207ea449aa95c870e70a397d3a6..cc55728741389659d656d4c0aaea2fe70508dd24 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: sxp-neon
+    name: sxp-sodium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -9,7 +9,11 @@
           rtd-token: 4a78556e59ce3ef35e61e2fa19ebae049acf6d5d
       - odl-maven-jobs
 
-    stream: neon
+    java-version:
+      - openjdk8
+      - openjdk11
+
+    stream: sodium
     project: 'sxp'
     project-name: 'sxp'
     branch: 'master'
@@ -24,7 +28,7 @@
     staging-profile-id: a6909c75719b7
 
 - project:
-    name: sxp-fluorine
+    name: sxp-neon
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           rtd-token: 4a78556e59ce3ef35e61e2fa19ebae049acf6d5d
       - odl-maven-jobs
 
-    stream: fluorine
+    java-version:
+      - openjdk8
+      - openjdk11
+
+    stream: neon
     project: 'sxp'
     project-name: 'sxp'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
+
     mvn-settings: 'sxp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
 
     staging-profile-id: a6909c75719b7
 
 - project:
-    name: sxp-oxygen
+    name: sxp-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: sxp
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/
+          rtd-token: 4a78556e59ce3ef35e61e2fa19ebae049acf6d5d
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'sxp'
     project-name: 'sxp'
-    branch: 'stable/oxygen'
-
+    branch: 'stable/fluorine'
     mvn-settings: 'sxp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
 
diff --git a/jjb/systemmetrics/systemmetrics.yaml b/jjb/systemmetrics/systemmetrics.yaml
deleted file mode 100644 (file)
index 87c311e..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
----
-- project:
-    name: systemmetrics-neon
-    jobs:
-      - odl-maven-jobs
-
-    project: 'systemmetrics'
-    project-name: 'systemmetrics'
-    stream: neon
-    branch: 'master'
-    mvn-settings: 'systemmetrics-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: a69113575458e
-
-- project:
-    name: systemmetrics-fluorine
-    jobs:
-      - odl-maven-jobs
-
-    project: 'systemmetrics'
-    project-name: 'systemmetrics'
-    stream: fluorine
-    branch: 'stable/fluorine'
-    mvn-settings: 'systemmetrics-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: a69113575458e
-
-- project:
-    name: systemmetrics-sonar
-    jobs:
-      - gerrit-maven-sonar
-
-    project: 'systemmetrics'
-    project-name: 'systemmetrics'
-    branch: 'master'
-    mvn-settings: 'systemmetrics-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: systemmetrics-view
-    views:
-      - project-view
-    project-name: systemmetrics
similarity index 66%
rename from jjb/iotdm/iotdm-csit-basic.yaml
rename to jjb/telemetry/telemetry-csit-basic.yaml
index df7ec1e491997661772e5225a456d3690fe8424b..61caadd4f7d8686e7eac0a9b3779fec38c9d1fa0 100644 (file)
@@ -1,31 +1,29 @@
 ---
 - project:
-    name: iotdm-csit-basic
+    name: telemetry-csit-basic
     jobs:
       - inttest-csit-1node
       - inttest-csit-verify-1node
 
     # The project name
-    project: 'iotdm'
+    project: 'telemetry'
 
     # The functionality under test
     functionality: 'basic'
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
-      - fluorine:
-          branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
+      - neon:
+          branch: 'stable/neon'
 
     install:
       - all:
           scope: 'all'
 
     # Features to install
-    install-features: 'odl-iotdmcsitdist'
+    install-features: 'odl-telemetry-all'
 
     # Robot custom options
     robot-options: ''
index f3342b2723d1344bef525e3df09d759184ba772e..914fec7d96d2da8a4be353f6def0d19a941f177f 100644 (file)
@@ -1,14 +1,49 @@
 ---
+- project:
+    name: telemetry-sodium
+    jobs:
+      - 'odl-maven-jobs'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: telemetry
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-telemetry/57583/
+          rtd-token: 694bcbf8e0b45b3c4e53174c6e5773ca351e1efb
+
+    stream: sodium
+    project: 'telemetry'
+    project-name: 'telemetry'
+    branch: 'master'
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'telemetry-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[telemetry]'
+    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: 8ed9c52266504
+
 - project:
     name: telemetry-neon
     jobs:
       - 'odl-maven-jobs'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: telemetry
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-telemetry/57583/
+          rtd-token: 694bcbf8e0b45b3c4e53174c6e5773ca351e1efb
 
     stream: neon
     project: 'telemetry'
     project-name: 'telemetry'
-    branch: 'master'
+    branch: 'stable/neon'
     jdks:
       - openjdk8
     maven:
index b02bb5ee098c252aace5a95cf9ec3b2327cb1b07..0f844d556f98389cb4dd72ef9c781acb5a6196a9 100644 (file)
@@ -1,18 +1,20 @@
 ---
 - project:
-    name: transportpce-neon
+    name: transportpce-sodium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: transportpce
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-transportpce/47688/
           rtd-token: 6f37ba63226bdcc6c823ee455e62237cf68813fd
-      - gerrit-tox-verify
+      - gerrit-tox-verify:
+          build-timeout: 120
+          build-node: centos7-builder-8c-8g
       - odl-maven-jobs
 
     project: 'transportpce'
     project-name: 'transportpce'
-    stream: neon
+    stream: sodium
     branch: 'master'
     mvn-settings: 'transportpce-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     staging-profile-id: a6927323fa3d4
 
 - project:
-    name: transportpce-fluorine
+    name: transportpce-neon
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: transportpce
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-transportpce/47688/
           rtd-token: 6f37ba63226bdcc6c823ee455e62237cf68813fd
+      - gerrit-tox-verify:
+          build-timeout: 120
+          build-node: centos7-builder-8c-8g
       - odl-maven-jobs
 
     project: 'transportpce'
     project-name: 'transportpce'
-    stream: fluorine
-    branch: 'stable/fluorine'
+    stream: neon
+    branch: 'stable/neon'
     mvn-settings: 'transportpce-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     staging-profile-id: a6927323fa3d4
 
 - project:
-    name: transportpce-oxygen
+    name: transportpce-fluorine
     jobs:
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: transportpce
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-transportpce/47688/
+          rtd-token: 6f37ba63226bdcc6c823ee455e62237cf68813fd
       - odl-maven-jobs
 
     project: 'transportpce'
     project-name: 'transportpce'
-    stream: oxygen
-    branch: 'stable/oxygen'
+    stream: fluorine
+    branch: 'stable/fluorine'
     mvn-settings: 'transportpce-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
index 3af4a36affbfb574c5cab5dbc605ae66f6c38aa1..172e03ab170bf7a322e8eb47ec09c987e9bdc9a6 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
           trigger-jobs: '{project}-merge-{stream}'
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
@@ -25,8 +27,6 @@
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
           repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr//xml/features'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index f18d9c41fb01b13bb53d428d600bca435c5d96cf..29fe32e26291225250ab26122c4106722dc23460 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
           trigger-jobs: '{project}-merge-{stream}'
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
@@ -25,8 +27,6 @@
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
           repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr//xml/features'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index 219472b649569275aba672fde32e2851c822233e..96b2b208020c4bc798c8378b9ed22f6e3bf6a512 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
           trigger-jobs: '{project}-merge-{stream}'
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
@@ -25,8 +27,6 @@
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
           repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr//xml/features'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - all:
index cf00cd88636d3b1fdde25ba7807fbf4de5367849..7db3bab5bf9a3acf3c877fdc105267fb20f6bf05 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
           trigger-jobs: '{project}-merge-{stream}'
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
@@ -25,8 +27,6 @@
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
           repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr//xml/features'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - all:
index f16049f8291378991e9ccfe3d00a13d8f758fe25..c90043f8c2f0d8815d506f4ec5b20d43fa8d9f82 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: tsdr-neon
+    name: tsdr-sodium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -9,7 +9,7 @@
           rtd-token: 96c97641155132afcc5900bafc68af3364d91c99
       - odl-maven-jobs
 
-    stream: neon
+    stream: sodium
     project: 'tsdr'
     project-name: 'tsdr'
     branch: 'master'
@@ -22,7 +22,7 @@
     staging-profile-id: a69373036303c
 
 - project:
-    name: tsdr-fluorine
+    name: tsdr-neon
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           rtd-token: 96c97641155132afcc5900bafc68af3364d91c99
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'tsdr'
     project-name: 'tsdr'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     mvn-settings: 'tsdr-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     staging-profile-id: a69373036303c
 
 - project:
-    name: tsdr-oxygen
+    name: tsdr-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: tsdr
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-tsdr/47532/
+          rtd-token: 96c97641155132afcc5900bafc68af3364d91c99
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'tsdr'
     project-name: 'tsdr'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     mvn-settings: 'tsdr-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml
deleted file mode 100644 (file)
index 59becd5..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
----
-- project:
-    name: ttp-neon
-    jobs:
-      - odl-maven-jobs
-
-    stream: neon
-    project: 'ttp'
-    project-name: 'ttp'
-    branch: 'master'
-    mvn-settings: 'ttp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[ttp] [odlparent]'
-
-    # Used by the release job
-    staging-profile-id: a693f948563d5
-
-- project:
-    name: ttp-fluorine
-    jobs:
-      - odl-maven-jobs
-
-    stream: fluorine
-    project: 'ttp'
-    project-name: 'ttp'
-    branch: 'stable/fluorine'
-    mvn-settings: 'ttp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[ttp] [odlparent]'
-
-    # Used by the release job
-    staging-profile-id: a693f948563d5
-
-- project:
-    name: ttp-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'ttp'
-    project-name: 'ttp'
-    branch: 'stable/oxygen'
-    mvn-settings: 'ttp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[ttp] [odlparent]'
-
-    # Used by the release job
-    staging-profile-id: a693f948563d5
-
-- project:
-    name: ttp-sonar
-    jobs:
-      - gerrit-maven-sonar
-
-    project: 'ttp'
-    project-name: 'ttp'
-    branch: 'master'
-    mvn-settings: 'ttp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: ttp-view
-    views:
-      - project-view
-    project-name: ttp
index cc769ff41d09d15a04ec4f07f61233b1c9195c09..504d2204564577ed1cd481968e121251f8589045 100644 (file)
@@ -1,4 +1,27 @@
 ---
+- project:
+    name: unimgr-sodium
+    jobs:
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: unimgr
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-unimgr/49748/
+          rtd-token: e12225e9b9ac67f5439c1619dcad342393b7ea31
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'unimgr'
+    project-name: 'unimgr'
+    branch: 'master'
+    mvn-settings: 'unimgr-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'ovsdb-merge-{stream}'
+    email-upstream: '[unimgr] [ovsdb]'
+    build-node: centos7-builder-4c-16g
+
+    # Used by the release job
+    staging-profile-id: a695d0a0b8d51
+
 - project:
     name: unimgr-neon
     jobs:
@@ -12,7 +35,7 @@
     stream: neon
     project: 'unimgr'
     project-name: 'unimgr'
-    branch: 'master'
+    branch: 'stable/neon'
     mvn-settings: 'unimgr-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'ovsdb-merge-{stream}'
@@ -41,6 +64,7 @@
     dependencies: 'ovsdb-merge-{stream}'
     email-upstream: '[unimgr] [ovsdb]'
     build-node: centos7-builder-4c-16g
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a695d0a0b8d51
index 0b71f0a2bc939c7bcc9ab853d961035917a58ce5..0b373cc7e46f526a73371a8f58796ab7c0cce5c5 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
           # yamllint disable-line rule:line-length
           repo-url: 'mvn:org.opendaylight.usc/usc-features/1.6.0-SNAPSHOT/xml/features'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - all:
index a8fb8b199092a06ec470eae310c2ddbb9d33ec9c..bdbebca14c2652fe388ce90884286e2c644a03ff 100644 (file)
@@ -1,11 +1,11 @@
 ---
 - project:
-    name: usc-neon
+    name: usc-sodium
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: neon
+    stream: sodium
     project: 'usc'
     project-name: 'usc'
     branch: 'master'
     staging-profile-id: a697b633b3ffe
 
 - project:
-    name: usc-fluorine
+    name: usc-neon
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'usc'
     project-name: 'usc'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     mvn-settings: 'usc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
     staging-profile-id: a697b633b3ffe
 
 - project:
-    name: usc-oxygen
+    name: usc-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'usc'
     project-name: 'usc'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     mvn-settings: 'usc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml
deleted file mode 100644 (file)
index 8f51afc..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
----
-- project:
-    name: usecplugin-neon
-    jobs:
-      - odl-maven-jobs
-
-    stream: neon
-    project: 'usecplugin'
-    project-name: 'usecplugin'
-    branch: 'master'
-    mvn-settings: 'usecplugin-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowplugin-merge-{stream}'
-    email-upstream: '[usecplugin] [openflowplugin]'
-
-    # Used by the release job
-    staging-profile-id: a69902281e037
-
-- project:
-    name: usecplugin-fluorine
-    jobs:
-      - odl-maven-jobs
-
-    stream: fluorine
-    project: 'usecplugin'
-    project-name: 'usecplugin'
-    branch: 'stable/fluorine'
-    mvn-settings: 'usecplugin-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowplugin-merge-{stream}'
-    email-upstream: '[usecplugin] [openflowplugin]'
-
-    # Used by the release job
-    staging-profile-id: a69902281e037
-
-- project:
-    name: usecplugin-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'usecplugin'
-    project-name: 'usecplugin'
-    branch: 'stable/oxygen'
-    mvn-settings: 'usecplugin-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowplugin-merge-{stream}'
-    email-upstream: '[usecplugin] [openflowplugin]'
-
-    # Used by the release job
-    staging-profile-id: a69902281e037
-
-- project:
-    name: usecplugin-sonar
-    jobs:
-      - gerrit-maven-sonar
-
-    project: 'usecplugin'
-    project-name: 'usecplugin'
-    mvn-settings: 'usecplugin-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: usecplugin-view
-    views:
-      - project-view
-    project-name: usecplugin
index a40bcf5ab9e84dbf09258c21e8770e8625757e51..58c2bb48cd25cef4b9f6d5c304fe15544e75640a 100644 (file)
 
     # Project branches.
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - only:
index e414787cd7c75c085865695cfe83be585b640e31..2491d1630f2786e1cb7fabb964e08abea2fc0d9e 100644 (file)
@@ -7,15 +7,15 @@
     project: 'yangtools'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
+          os-branch: 'queens'
       - fluorine:
           branch: 'stable/fluorine'
           os-branch: 'queens'
-      - oxygen:
-          branch: 'stable/oxygen'
-          os-branch: 'queens'
 
     jdk: 'openjdk8'
 
index c99554fd98cf81509247fa399def969520a3a8ed..2ef1116850e537ff15633b0a444be52557b92eed 100644 (file)
@@ -2,7 +2,8 @@
 - project:
     name: yangtools-master
     jobs:
-      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-maven-javadoc-jobs':
+          disable-job: true
       - odl-maven-jobs
 
     project: yangtools
     staging-profile-id: 1271cf710cc09d
 
 - project:
-    name: yangtools-v2.0.x
+    name: yangtools-v2.1.x
     jobs:
-      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-maven-javadoc-jobs':
+          disable-job: true
       - odl-maven-jobs
 
     project: yangtools
     project-name: yangtools
-    branch: v2.0.x
-    stream: v2.0.x
+    branch: v2.1.x
+    stream: v2.1.x
 
     mvn-settings: 'yangtools-settings'
     mvn-opts: '-Xmx1024m'
     staging-profile-id: 1271cf710cc09d
 
 - project:
-    name: yangtools-v2.0.6.x
+    name: yangtools-v2.0.x
     jobs:
-      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-maven-javadoc-jobs':
+          disable-job: true
       - odl-maven-jobs
 
     project: yangtools
     project-name: yangtools
-    branch: v2.0.6.x
-    stream: v2.0.6.x
+    branch: v2.0.x
+    stream: v2.0.x
 
     mvn-settings: 'yangtools-settings'
     mvn-opts: '-Xmx1024m'
index ecf9e5f21c0bcb8036f5c2304c6687dfd7291df6..77df480ff311d4d74e76dcdeb076c136cd524e13 100644 (file)
@@ -5,13 +5,15 @@
   vars:
     openvswitch_version: 2.8.2
     openvswitch_checksum: sha256:87b4a7e7134a44ce1f808d3415a2244b4518c2b0b2a42fa2f8231e592f13103d
-    k8s_version: 1.9.4
+    k8s_version: 1.13.2
+    golang_version: 1.11.5
+    golang_checksum: sha256:ff54aafedff961eb94792487e827515da683d61a5f9482f668008832631e5d25
 
   pre_tasks:
     - include_role: name=lfit.system-update
 
   roles:
-    - lfit.docker-install
+    - {role: lfit.docker-install, ubuntu_docker_version: 18.06.0~ce~3-0~ubuntu}
     - fkautz.bridge-utils-install
     - fkautz.golang-install
     - fkautz.kubernetes-install
index dfaa7e3bc41ab613e315cd31030f4eab7a25daec..149060c537d6f77d025bfa36ee244fdcca9372da 100644 (file)
     elastic_search_version: 1.7.5
     hbase_checksum: sha256:9cd990939403fd43dfb665b14603e3772ca3ed813a6e21a81de1778583b35eb8
     hbase_version: 0.94.27
-    openjdk10_checksum: 'sha256:f3b26abc9990a0b8929781310e14a339a7542adfd6596afb842fa0dd7e3848b2'
-    openjdk10_url: https://download.java.net/java/GA/jdk10/{{openjdk10_version}}/19aef61b38124481863b1413dce1855f/13/openjdk-{{openjdk10_version}}_linux-x64_bin.tar.gz
-    openjdk10_version: 10.0.2
-    openjdk11_checksum: 'sha256:3784cfc4670f0d4c5482604c7c513beb1a92b005f569df9bf100e8bef6610f2e'
-    openjdk11_url: https://download.java.net/java/ga/jdk11/openjdk-{{openjdk11_version}}_linux-x64_bin.tar.gz
-    openjdk11_version: 11
 
   pre_tasks:
     - include_role: name=lfit.system-update
     - lfit.mono-install
 
   tasks:
-    - name: 'Install OpenJDK {{openjdk10_version}}'
-      block:
-        - name: 'Fetch OpenJDK {{openjdk10_version}} to /tmp/jdk-{{openjdk10_version}}_linux-x64_bin.tar.gz'
-          get_url:
-            url: "{{openjdk10_url}}"
-            dest: '/tmp/jdk-{{openjdk10_version}}_linux-x64_bin.tar.gz'
-            checksum: '{{openjdk10_checksum}}'
-        - name: 'Untar OpenJDK {{openjdk10_version}} in /opt/'
-          unarchive:
-            src: '/tmp/jdk-{{openjdk10_version}}_linux-x64_bin.tar.gz'
-            dest: /opt/
-            mode: 0755
-            remote_src: true
-          become: true
-        - name: 'Setup Java master and slave links for OpenJDK {{openjdk10_version}}'
-          command: 'alternatives --install "/usr/bin/java" "java" "/opt/jdk-{{openjdk10_version}}/bin/java" 10 \
-                    --slave "/usr/bin/jar" "jar" "/opt/jdk-{{openjdk10_version}}/bin/jar" \
-                    --slave "/usr/bin/jarsigner" "jarsigner" "/opt/jdk-{{openjdk10_version}}/bin/jarsigner" \
-                    --slave "/usr/bin/javac" "javac" "/opt/jdk-{{openjdk10_version}}/bin/javac" \
-                    --slave "/usr/bin/javadoc" "javadoc" "/opt/jdk-{{openjdk10_version}}/bin/javadoc" \
-                    --slave "/usr/bin/javah" "javah" "/opt/jdk-{{openjdk10_version}}/bin/javah" \
-                    --slave "/usr/bin/javap" "javap" "/opt/jdk-{{openjdk10_version}}/bin/javap" \
-                    --slave "/usr/bin/javaws" "javaws" "/opt/jdk-{{openjdk10_version}}/bin/javaws"'
-          become: true
-    - name: 'Install OpenJDK {{openjdk11_version}}'
-      block:
-        - name: 'Fetch OpenJDK 11 to /tmp/jdk-{{openjdk11_version}}_linux-x64_bin.tar.gz'
-          get_url:
-            url: "{{openjdk11_url}}"
-            dest: '/tmp/jdk-{{openjdk11_version}}_linux-x64_bin.tar.gz'
-            checksum: '{{openjdk11_checksum}}'
-        - name: 'Untar OpenJDK {{openjdk11_version}} in /opt/'
-          unarchive:
-            src: '/tmp/jdk-{{openjdk11_version}}_linux-x64_bin.tar.gz'
-            dest: /opt/
-            mode: 0755
-            remote_src: true
-          become: true
-        - name: 'Setup Java master and slave links for OpenJDK {{openjdk11_version}}'
-          command: 'alternatives --install "/usr/bin/java" "java" "/opt/jdk-{{openjdk11_version}}/bin/java" 10 \
-                    --slave "/usr/bin/jar" "jar" "/opt/jdk-{{openjdk11_version}}/bin/jar" \
-                    --slave "/usr/bin/jarsigner" "jarsigner" "/opt/jdk-{{openjdk11_version}}/bin/jarsigner" \
-                    --slave "/usr/bin/javac" "javac" "/opt/jdk-{{openjdk11_version}}/bin/javac" \
-                    --slave "/usr/bin/javadoc" "javadoc" "/opt/jdk-{{openjdk11_version}}/bin/javadoc" \
-                    --slave "/usr/bin/javah" "javah" "/opt/jdk-{{openjdk11_version}}/bin/javah" \
-                    --slave "/usr/bin/javap" "javap" "/opt/jdk-{{openjdk11_version}}/bin/javap" \
-                    --slave "/usr/bin/javaws" "javaws" "/opt/jdk-{{openjdk11_version}}/bin/javaws"'
-          become: true
     - name: Install Cassandra Server
       block:
         - name: 'Fetch Cassandra Server to /tmp/apache-cassandra-{{cassandra_version}}-bin.tar.gz'
diff --git a/tox.ini b/tox.ini
index cf80a1dd7687d3bf2b2916476deaa8a637d585eb..285f266275177f5b086239b0d129d51cb81ba7ed 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = coala,docs,pep8,prefix,robot
+envlist = coala,docs,jjb-version,pep8,prefix,robot
 skipsdist = true
 
 [testenv:coala]
@@ -23,7 +23,7 @@ commands = sphinx-build -b html -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs
 
 [testenv:jenkins-jobs]
 deps =
-    jenkins-job-builder=={env:JJB_VERSION:2.7.0}
+    jenkins-job-builder=={env:JJB_VERSION:2.9.1}
 commands =
     jenkins-jobs {posargs:--help}