Merge "Remove odlparent-3.0.x jobs"
authorVenkatrangan Govindarajan <vgovindarajan@luminanetworks.com>
Mon, 4 Mar 2019 11:56:19 +0000 (11:56 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Mon, 4 Mar 2019 11:56:19 +0000 (11:56 +0000)
206 files changed:
docs/cloud-images.rst
global-jjb
jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg
jjb/aaa/aaa-csit-authn.yaml
jjb/aaa/aaa-csit-keystone.yaml
jjb/aaa/aaa-csit-tls.yaml
jjb/aaa/aaa-patch-test.yaml
jjb/aaa/aaa.yaml
jjb/alto/alto-csit-setup.yaml
jjb/alto/alto.yaml
jjb/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/validate-autorelease-neon.yaml
jjb/autorelease/validate-autorelease-sodium.yaml [new file with mode: 0644]
jjb/autorelease/version-bump.sh
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-sodium.lst [new file with mode: 0644]
jjb/integration/distribution/distribution-csit-userfeatures.yaml
jjb/integration/distribution/distribution-jobs.yaml
jjb/integration/distribution/distribution-templates.yaml
jjb/integration/integration-detect-variables.sh
jjb/integration/integration-install-robotframework.sh
jjb/integration/integration-macros.yaml
jjb/integration/integration-templates.yaml
jjb/integration/integration-test-jobs.yaml
jjb/integration/multipatch-distribution.sh
jjb/iotdm/iotdm-csit-basic.yaml [deleted file]
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-multi-apex.yaml
jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
jjb/netvirt/netvirt-csit-multi-openstack.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/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/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/packetcable/packetcable-csit-pcmm.yaml
jjb/packetcable/packetcable.yaml
jjb/releng-templates-java.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
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
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

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 ba3f1f932f671039373402b81640f7be2cde9bb8..1a45fc8ab4c2022ce42400b769aaad302baefd8f 160000 (submodule)
@@ -1 +1 @@
-Subproject commit ba3f1f932f671039373402b81640f7be2cde9bb8
+Subproject commit 1a45fc8ab4c2022ce42400b769aaad302baefd8f
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..5eecb1ef140fafb9da2f848ea03e25a8f53140db 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - all:
index 614ef0465451b27d8ca82e308706f47f569e9106..5e6aba771efc0a4c9485c8bf84c13fb0df1b6740 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - all:
index fc0c7a97b0ddc833ba460e01d4021dc38368d09b..b856640f58adf990643d6d775f99331ac3318663 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - only:
@@ -30,4 +33,4 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366
index 06f0b3224df15dd51f7c1d47612e15c92775a53e..5f873c438ff037332662e98d4dc0bae52aa277d7 100644 (file)
@@ -7,15 +7,19 @@
     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'
+          disable-job: 'true'
 
     feature:
       - authn:
index 7284ed1988c230664000acf7a765e426b4231a74..bbebed1cae220bcb17c3899b888de35ddd5e6f16 100644 (file)
@@ -1,4 +1,27 @@
 ---
+- project:
+    name: aaa-sodium
+    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: sodium
+    project: 'aaa'
+    project-name: 'aaa'
+    branch: 'master'
+    mvn-settings: 'aaa-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
+
+    # Used by the release job
+    staging-profile-id: 9318cf3c82c33
+
 - project:
     name: aaa-neon
     jobs:
@@ -13,7 +36,7 @@
     stream: neon
     project: 'aaa'
     project-name: 'aaa'
-    branch: 'master'
+    branch: 'stable/neon'
     mvn-settings: 'aaa-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -51,6 +74,7 @@
       - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
+    disable-job: true
     stream: oxygen
     project: 'aaa'
     project-name: 'aaa'
index ef5c322acfaa0ffa1d0913ce7f5d02ec8bce5d94..d8d32fcba9171647c4cea2ae8eb138bd59164f9e 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - all:
index bde65374976126bafbe24f0718023f3025e4d5d9..8b2a4278d12ed1aadfd4096f32d5617d97638260 100644 (file)
@@ -1,4 +1,22 @@
 ---
+- project:
+    name: alto-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'alto'
+    project-name: 'alto'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    mvn-settings: 'alto-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'l2switch-merge-{stream}'
+    email-upstream: '[alto] [l2switch]'
+
+    # Used by the release job
+    staging-profile-id: 931eabae9693c
+
 - project:
     name: alto-neon
     jobs:
@@ -7,7 +25,7 @@
     stream: neon
     project: 'alto'
     project-name: 'alto'
-    branch: 'master'
+    branch: 'stable/neon'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'alto-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -50,6 +68,7 @@
     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
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 7860abfec0ceb3a7e9f00fc30b81e126f5c5bd18..8252fb3cabea294fddc1f983d8a8029aaf9361b8 100644 (file)
       - gerrit-tox-verify
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+          integration-test: sodium
+          mvn-params: >
+              -Pintegrationtests,repoBuild
+              -P!karaf
+              -Pignore-lispflowmapping-integrationtest
+              -Dcheckstyle.skip=true
+              -Dskip.karaf.featureTest=true
+              -Dsft.heap.max=4g
+          java-version: openjdk11
+      - neon:
+          branch: 'stable/neon'
           integration-test: neon
-          extra-mvn-opts: -P!karaf -Pignore-lispflowmapping-integrationtest -Dsft.heap.max=4g
+          mvn-params: >
+              -Pintegrationtests,repoBuild
+              -P!karaf
+              -Pignore-lispflowmapping-integrationtest
+              -Dcheckstyle.skip=true
               -Dskip.karaf.featureTest=true
+              -Dsft.heap.max=4g
+          java-version: openjdk8
       - fluorine:
           branch: 'stable/fluorine'
           integration-test: fluorine
-          extra-mvn-opts: -P!karaf -Pignore-lispflowmapping-integrationtest -Dsft.heap.max=4g
+          mvn-params: >
+              -Pintegrationtests,repoBuild
+              -P!karaf
+              -Pignore-lispflowmapping-integrationtest
+              -Dcheckstyle.skip=true
               -Dskip.karaf.featureTest=true
+              -Dsft.heap.max=4g
+          java-version: openjdk8
       - 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
-    build-node: centos7-builder-2c-8g
-    java-version: openjdk8
-    # 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
-
-- project:
-    name: autorelease-projects-openjdk11
-    jobs:
-      - 'autorelease-release-{stream}-{mvn-version}-{java-version}':
-          build-node: centos7-autorelease-8c-32g
-
-    stream:
-      - neon:
-          branch: 'master'
-          integration-test: neon
-          extra-mvn-opts: -P!karaf -Pignore-lispflowmapping-integrationtest -Dsft.heap.max=4g
+          mvn-params: >
+              -Pintegrationtests,repoBuild
+              -P!karaf
+              -Pignore-lispflowmapping-integrationtest
+              -Dcheckstyle.skip=true
               -Dskip.karaf.featureTest=true
+              -Dsft.heap.max=4g
+          disable-job: 'true'
+          java-version: openjdk8
 
     project: releng/autorelease
     project-name: autorelease
     build-node: centos7-builder-2c-8g
-    java-version: openjdk11
     # Before adding more here, beware of https://jira.linuxfoundation.org/browse/RELENG-280
     archive-artifacts: >
         **/*.prop
@@ -73,7 +74,6 @@
     staging-profile-id: 425e43800fea70
     # TODO: **/*.hprof is too large, compress with xz first
 
-
 - project:
     name: autorelease-view
     views:
index 2f5da873e406369eeb5e9cae8a58cc0cf4b4b7c0..23453c27c718ca34979efbe3a8d0847f59252f26 100644 (file)
     cron: 'H 0 * * *'
     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: false
+    mvn-central: false
+    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}'
       # 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-build:
+          mvn-goals: '{mvn-goals}'
+      - lf-sigul-sign-dir:
+          sign-artifacts: '{sign-artifacts}'
+          sign-dir: '$WORKSPACE/m2repo'
       - lf-maven-stage
+      - lf-maven-central:
+          mvn-central: '{mvn-central}'
+          ossrh-profile-id: '{ossrh-profile-id}'
       - autorelease-get-integration-test-variables
       - autorelease-maven-sources:
           opendaylight-infra-mvn-opts: '{opendaylight-infra-mvn-opts}'
       - opendaylight-infra-notify-status
       - trigger-parameterized-builds:
           - project: 'integration-distribution-test-{integration-test}'
-            condition: STABLE
-            predefined-parameters: |
-              BUNDLE_URL=autorelease
-              KARAF_VERSION=$KARAF_VERSION
+            condition: UNSTABLE_OR_BETTER
+            property-file: variables.jenkins-trigger
             fail-on-missing: true
+          - project: 'integration-distribution-test-{integration-test}'
+            condition: FAILED
+            trigger-with-no-params: true
           - project: 'packaging-build-rpm-{stream}'
             condition: UNSTABLE_OR_BETTER
             predefined-parameters: DOWNLOAD_URL=$BUNDLE_URL
     ######################
 
     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:
     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..4427eacf1865da22ac4a3b8cd6080af643611b8b 100644 (file)
     build-node: centos7-builder-2c-8g
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - 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 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
diff --git a/jjb/autorelease/validate-autorelease-sodium.yaml b/jjb/autorelease/validate-autorelease-sodium.yaml
new file mode 100644 (file)
index 0000000..5c9137d
--- /dev/null
@@ -0,0 +1,41 @@
+---
+# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job
+- project:
+    name: autorelease-validate-sodium
+    jobs:
+      - '{project-name}-validate-autorelease-{stream}'
+    stream: sodium
+    branch: master
+    project-name:
+      - aaa:
+          project: aaa
+      - bgpcep:
+          project: bgpcep
+      - controller:
+          project: controller
+      - coe:
+          project: coe
+      - daexim:
+          project: daexim
+      - genius:
+          project: genius
+      - infrautils:
+          project: infrautils
+      - integration-distribution:
+          project: integration/distribution
+      - lispflowmapping:
+          project: lispflowmapping
+      - netconf:
+          project: netconf
+      - netvirt:
+          project: netvirt
+      - neutron:
+          project: neutron
+      - openflowplugin:
+          project: openflowplugin
+      - ovsdb:
+          project: ovsdb
+      - serviceutils:
+          project: serviceutils
+      - sfc:
+          project: sfc
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-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..51fd4d44ecc6c7856bbc23b6df2e1bdf1c6d5a07 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - all:
index 31794be641cde9ee810b5f90d6f4d1983315f139..2655b30e6fbd0f764a89f06633004863f74e1f12 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - all:
index b6f0ca61dab511d6dc0a12ff224c8cfe4c59f9cb..598415ec4a435b7cd903ed0633e98cf6978b203f 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - only:
index 84e5bb2a603d317f20b132e4b25d06ac362a8b69..59963c7c6e753c1cf4e7c5e791c455cb4fec5ca6 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - only:
index c8902b46ba191342973358e3423a74453e2948b1..582af12aba246f5ded8ba775862f37dec44cc613 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - all:
index 534b08f25b4e6a101d88d25b967590e5cbff00f0..9a7c9ba39a4c44251c6b85248f23cee598c49920 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - all:
index 40e58d612ae23af1fc2febc2b8297b20128b7692..a80a7845d4f38e8cc45207b50ea9ad17af234e46 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - all:
index 2405fe4bd5969eb25aa03658aad74e543d2fe089..767bbef084a5630d99b74dd8b81b418962f5d28a 100644 (file)
@@ -9,12 +9,15 @@
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     feature:
       - bgp:
index 82b640e10104fce4d6efbb4db0615a25eac42bb2..cb7c9f20636c87ceb1350df773ef2f83b1bfe92a 100644 (file)
@@ -1,4 +1,34 @@
 ---
+- project:
+    name: bgpcep-sodium
+    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: sodium
+    project: 'bgpcep'
+    project-name: 'bgpcep'
+    build-node: centos7-builder-8c-8g
+    build-timeout: 120
+    branch: 'master'
+    mvn-settings: 'bgpcep-settings'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m'
+    dependencies: >
+        odlparent-merge-{stream},
+        yangtools-merge-{stream},
+        controller-merge-{stream},
+        mdsal-merge-{stream}
+    email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal]'
+
+    # Used by the release job
+    staging-profile-id: 9427a05049030
+
 - project:
     name: bgpcep-neon
     jobs:
@@ -16,7 +46,7 @@
     project-name: 'bgpcep'
     build-node: centos7-builder-8c-8g
     build-timeout: 120
-    branch: 'master'
+    branch: 'stable/neon'
     mvn-settings: 'bgpcep-settings'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m'
     dependencies: >
         controller-merge-{stream},
         mdsal-merge-{stream}
     email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal]'
+    disable-job: 'true'
 
     # Used by the release job
     staging-profile-id: 9427a05049030
index dc38606699874d43a08207f3bb817b1db153001f..10aa7156f261a3d969f0b2ddb529d6e111b68db4 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     verify-stream: 'oxygen'
     verify-branch: 'stable/oxygen'
index bbebe4c86fc43af4aed1c8831cf10cbbf09eb048..90b9bdbb6865d7c22b815b88e15c7a9e0cda5a4c 100644 (file)
@@ -1,4 +1,23 @@
 ---
+- project:
+    name: bier-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'bier'
+    project-name: 'bier'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
+    mvn-settings: 'bier-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[bier]'
+
+    # Used by the release job
+    staging-profile-id: 942a8075b1f2a
+
 - project:
     name: bier-neon
     jobs:
@@ -7,7 +26,7 @@
     stream: neon
     project: 'bier'
     project-name: 'bier'
-    branch: 'master'
+    branch: 'stable/neon'
     build-node: centos7-builder-2c-8g
     build-timeout: 90
     mvn-settings: 'bier-settings'
@@ -53,6 +72,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[bier]'
+    disable-job: 'true'
 
     # Used by the release job
     staging-profile-id: 942a8075b1f2a
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..2880906af1fb5b3b086c76c8923ed4ac8579270e 100644 (file)
@@ -8,15 +8,18 @@
     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'
+          disable-job: 'true'
 
     install:
       - only:
index c22ec726c7f9175cb68356f2fcabd37ebd97658b..eaf4993755297a01b8e6f5c1175fe00f3ec64dfc 100644 (file)
@@ -7,12 +7,15 @@
     project: 'coe'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     jdk: 'openjdk8'
 
index 8b01c9e56ca5c8b2082bb95ccd5d44cf8eec1bfa..980591d75c784e8b9554e2eccff5f227cc18c46b 100644 (file)
@@ -1,4 +1,28 @@
 ---
+- project:
+    name: coe-sodium
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: coe
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-coe/34924/
+          rtd-token: 95a5a8fed43b75c6be8432a2643f20a344ba5155
+      - odl-maven-jobs
+
+    project: 'coe'
+    project-name: 'coe'
+    stream: sodium
+    branch: 'master'
+    mvn-settings: 'coe-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[coe] [odlparent] [yangtools] [controller]'
+    build-node: centos7-docker-2c-8g
+
+    # Used by the release job
+    staging-profile-id: 96c0be46aac33
+
 - project:
     name: coe-neon
     jobs:
@@ -13,7 +37,7 @@
     project: 'coe'
     project-name: 'coe'
     stream: neon
-    branch: 'master'
+    branch: 'stable/neon'
     mvn-settings: 'coe-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -67,6 +91,7 @@
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[coe] [odlparent] [yangtools] [controller]'
     build-node: centos7-docker-2c-8g
+    disable-job: 'true'
 
     # Used by the release job
     staging-profile-id: 96c0be46aac33
index 2b655baa6582b70bd6912cca0b55da38bfdd7de7..2e6f70ea99e98e203cc15dc1debcf66cc90b10f9 100644 (file)
     functionality: 'akka1'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - all:
index e0c41376e93c3d9b44697d2b8e0152a8a9f456cf..737c6e0ab649c96d38a16c9726fad8f5ed179a06 100644 (file)
       - 'clustering-tell'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - all:
index 7397512ac038a9d542e7a00139c4caf456176a8c..0ed748e67f05f2646aab98908c3670d4a0dd94b7 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - only:
index db10859a7bd9748b58d3084dcc977a41832646f5..6528e045aa5dea331bc435af8112b05d50e8b445 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - only:
index 250ce7da19cc298d378ab615a5592c326ecfe6f9..8de3ceab21465ba68150108089b853c1b4368445 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - only:
index 0aefef94dd6d8eb48f184c6fd5e9eb8044a3abcd..b9f9c78d3813eebc626d7f7c7209736b6488a4d8 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - only:
index 1239d74f6667f80c6e320cf37a7a065172072a58..0e1dcf30ffa31c1161bed8bed65ae9cf29efd169 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - only:
index 6f95f90c47b96fb2948bb08d4483d1fe1b3344b2..ee0cd3a58e7a1cabb5aa90c2dea078bc4a4aeebb 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - only:
index 9f14470e84f77e6d69956dc4f4582182aca12f2d..faae28c67068496bf99f3bdba1bf332b4b9863dd 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - all:
index b54e60c4ae0c3491e7d7c7c967172c385d89f6d4..70b35bf85faf45681da2c0379f4e70586e892ccd 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - all:
index a631e6282d62aa4fef3e040c35a9241d158c0ddf..61a7e187fa87eba62391032e347e56bb65d03dc1 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - all:
index a1546a218aa08daacc23b88c97db1d725b2bd4b2..8daba62ce227f1e056e83524c855981b20eb54cf 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - only:
index a0890e13056d2ec6fe9a62a63611ebca40fbcc39..174be29045294e43b3e948928024f0686abeeb64 100644 (file)
@@ -7,15 +7,19 @@
     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'
+          disable-job: 'true'
 
     jdk: 'openjdk8'
 
index 0a16ec99ad9883c675f10003098d23aa6223f1a9..81fa9f84fc8234a9b11379811edcf8760d86e588 100644 (file)
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: controller-sodium
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: controller
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-controller/48288/
+          rtd-token: b8440116c823a80c0fb0479eb7448a9196e6932f
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'controller'
+    project-name: 'controller'
+    branch: 'master'
+    mvn-settings: 'controller-settings'
+    mvn-goals: 'clean deploy -Pintegrationtests,docs'
+    mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+    build-node: centos7-builder-8c-8g
+    build-timeout: 90
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
+    email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
+
+    # Used by the release job
+    staging-profile-id: 96c1c9177efdd
+
 - project:
     name: controller-neon
     jobs:
@@ -14,7 +41,7 @@
     stream: neon
     project: 'controller'
     project-name: 'controller'
-    branch: 'master'
+    branch: 'stable/neon'
     mvn-settings: 'controller-settings'
     mvn-goals: 'clean deploy -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
@@ -71,6 +98,7 @@
     build-timeout: 90
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
+    disable-job: 'true'
 
     # Used by the release job
     staging-profile-id: 96c1c9177efdd
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..3f7539d55dd16e7b9569ef4e4d857ad4abaca54f 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - only:
index bf041892ca6dbe24596ac07db4fb0a74a85ac0ff..4078d6989adb94b4188de092a2dfc508971ee5c2 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - only:
index 99057ec6fb5dc56681ef72d5f0b3f420b3c72890..7fed129bf99b06d018563d17035b0d1d9b7221d9 100644 (file)
@@ -1,4 +1,27 @@
 ---
+- project:
+    name: daexim-sodium
+    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: sodium
+    branch: 'master'
+    mvn-settings: 'daexim-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
+
+    # Used by the release job
+    staging-profile-id: 96e4dade34bd7
+
 - project:
     name: daexim-neon
     jobs:
@@ -13,7 +36,7 @@
     project: 'daexim'
     project-name: 'daexim'
     stream: neon
-    branch: 'master'
+    branch: 'stable/neon'
     mvn-settings: 'daexim-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -59,6 +82,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
+    disable-job: 'true'
 
     # Used by the release job
     staging-profile-id: 96e4dade34bd7
index cc01016fb6b772b1f98fe039ff52439d7da044ba..d08be1a915f2a50c94258a060f286f37af500ad4 100644 (file)
     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-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,
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..f5896cdeab40465146ba3a032366f03c1446c6e7 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- project:
+    name: dlux-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'dlux'
+    project-name: 'dlux'
+    branch: 'master'
+    mvn-settings: 'dlux-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream}'
+    email-upstream: '[dlux] [odlparent]'
+
+    # Used by the release job
+    staging-profile-id: 96e6a0327484f
+
 - project:
     name: dlux-neon
     jobs:
@@ -7,7 +24,7 @@
     stream: neon
     project: 'dlux'
     project-name: 'dlux'
-    branch: 'master'
+    branch: 'stable/neon'
     mvn-settings: 'dlux-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
@@ -47,6 +64,7 @@
     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
index 65f5c6f85880dbb7566e835b4f51f6c450422316..21dd9eae0203dde82251b0ec6a41f37d0011e81f 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - all:
index 14e23e2dfd65002e687655620fc21a40f56802bd..da00339d9bd59f9fc84af55aa0c8a9cbc41bb3f3 100644 (file)
@@ -1,4 +1,22 @@
 ---
+- project:
+    name: dluxapps-sodium
+    jobs:
+      - odl-maven-jobs
+
+    project: 'dluxapps'
+    project-name: 'dluxapps'
+    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]'
+
+    # Used by the release job
+    staging-profile-id: 96e6fb1e65bf9
+
 - project:
     name: dluxapps-neon
     jobs:
@@ -7,7 +25,7 @@
     project: 'dluxapps'
     project-name: 'dluxapps'
     stream: neon
-    branch: 'master'
+    branch: 'stable/neon'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'dluxapps-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -50,6 +68,7 @@
     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..510f268d08334a4e5c76f35278c2835ca360dcec 100644 (file)
@@ -6,12 +6,15 @@
       - gerrit-tox-verify
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     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..a7e0ab08d56b80025f42de905aefa5605e5ae426 100644 (file)
     testplan: '{project}-{functionality}.txt'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - only:
index 77067e5cb78b551cdb949ffa7448bca760d84fa1..d38db902740c7670f43e94c30443fc0695b478f0 100644 (file)
@@ -7,15 +7,19 @@
     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'
+          disable-job: 'true'
 
     jdk: 'openjdk8'
 
index 6aad10ae9aafcc58efe4c6af2f1263da3946ba5b..ff1ec5ce0c2b683d97937401ba572464eddacbdd 100644 (file)
@@ -1,4 +1,38 @@
 ---
+- project:
+    name: genius-sodium
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: genius
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/
+          rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f
+      - odl-maven-jobs
+
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
+    stream: sodium
+    project: 'genius'
+    project-name: 'genius'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    mvn-settings: 'genius-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    build-timeout: 90
+    dependencies: >
+        controller-merge-{stream},
+        yangtools-merge-{stream},
+        odlparent-merge-{stream},
+        openflowplugin-merge-{stream},
+        neutron-merge-{stream}
+    email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
+
+    # Used by the release job
+    staging-profile-id: 96fb4b6d9d1ee
+
 - project:
     name: genius-neon
     jobs:
@@ -17,7 +51,7 @@
     stream: neon
     project: 'genius'
     project-name: 'genius'
-    branch: 'master'
+    branch: 'stable/neon'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'genius-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         openflowplugin-merge-{stream},
         neutron-merge-{stream}
     email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
+    disable-job: 'true'
 
     # Used by the release job
     staging-profile-id: 96fb4b6d9d1ee
index 732faf41eecfd4210190392bb47318bfba7dbefd..d2483d7a361969c3794479cf3cdb17cc20754254 100644 (file)
     functionality: 'openstack'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
           install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
       - fluorine:
           branch: 'stable/fluorine'
@@ -28,6 +30,7 @@
       - oxygen:
           branch: 'stable/oxygen'
           install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
+          disable-job: 'true'
 
     openstack:
       - pike:
index 5589adb53cc981946f1fd51c3888ebac10c95ae8..95bd59403ab77accab5c872ee004871e1a55ed07 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - all:
index 5779e1a1dfc34ba75b1864d9ed73bc71b067ec50..7a316db82c19bc6de61a4defcf56cc269da94b0f 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - all:
index 10dbc33ad7b23f1340b857c0d09d888d60f4b681..a5207da2d3771a2d68a954594d7a0555d18808bf 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - all:
index 6a826d4746648029e82bda1b61eb9981c18b7d78..232105f16a96ff95a278aebdcaec0e17bd7e17e0 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - only:
index 25cbca1dc9b00f088e6d585210da657e3825ebaf..98611514d69f2cc04638be81601820b7d27c8708 100644 (file)
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: groupbasedpolicy-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'groupbasedpolicy'
+    project-name: 'groupbasedpolicy'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    mvn-settings: 'groupbasedpolicy-settings'
+    mvn-goals: '-U clean deploy findbugs:findbugs'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    build-timeout: 90
+    dependencies: >
+        openflowjava-merge-{stream},
+        openflowplugin-merge-{stream},
+        neutron-merge-{stream},
+        sfc-merge-{stream},
+        ovsdb-merge-{stream}
+    email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
+
+    # Used by the release job
+    staging-profile-id: 96fbb93f95a76
+
 - project:
     name: groupbasedpolicy-neon
     jobs:
@@ -7,7 +32,7 @@
     stream: neon
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
-    branch: 'master'
+    branch: 'stable/neon'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean deploy findbugs:findbugs'
@@ -71,6 +96,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
index 659a5765527f5d883be8afeced29d28d5c32fbee..71010fa2430041b116dc145e5168a6025700008e 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- project:
+    name: vbd-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'honeycomb/vbd'
+    project-name: 'vbd'
+    branch: 'master'
+    mvn-settings: 'honeycomb-vbd-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[vbd]'
+
+    # Used by the release job
+    staging-profile-id: 96fc362c36862
+
 - project:
     name: vbd-neon
     jobs:
@@ -7,7 +24,7 @@
     stream: neon
     project: 'honeycomb/vbd'
     project-name: 'vbd'
-    branch: 'master'
+    branch: 'stable/neon'
     mvn-settings: 'honeycomb-vbd-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -47,6 +64,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[vbd]'
+    disable-job: 'true'
 
     # Used by the release job
     staging-profile-id: 96fc362c36862
index b584fff798d72c56743f40865683a0e6d113176b..72fa951ab818aed7e724bb08080de4287342f738 100644 (file)
@@ -7,15 +7,19 @@
     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'
+          disable-job: 'true'
 
     jdk: 'openjdk8'
 
index 563eb54f694c76975d65e6893f9b79035c5ae694..0dd9a4aef619aa1f6e9121112437f883910ba0bb 100644 (file)
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: infrautils-sodium
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
+          project-pattern: infrautils
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-infrautils/38993/
+          rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'infrautils'
+    project-name: 'infrautils'
+    branch: 'master'
+    mvn-settings: 'infrautils-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream}'
+    email-upstream: '[infrautils] [odlparent]'
+
+    # Used by the release job
+    staging-profile-id: 96fca0367756c
+
 - project:
     name: infrautils-neon
     jobs:
@@ -15,7 +40,7 @@
     stream: neon
     project: 'infrautils'
     project-name: 'infrautils'
-    branch: 'master'
+    branch: 'stable/neon'
     mvn-settings: 'infrautils-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
@@ -70,6 +95,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[infrautils] [odlparent]'
+    disable-job: 'true'
 
     # Used by the release job
     staging-profile-id: 96fca0367756c
diff --git a/jjb/integration/csit-jobs-sodium.lst b/jjb/integration/csit-jobs-sodium.lst
new file mode 100644 (file)
index 0000000..c2eafa8
--- /dev/null
@@ -0,0 +1,62 @@
+aaa-csit-1node-authn-all-sodium,
+aaa-csit-1node-tls-only-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 1381e246b30d37cf4159e23d63d8fe4d29254567..f8eaf14f492ccec9aa7400d9a6b5ec4739dacbe9 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
index 004b1e79622dca93cd68567ff4266a5fa4045ea4..773ab3f6fb3cff29916cac9259b02a83fb318d05 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
           sm-features: >
-              odl-sxp-routing,
+              odl-telemetry-collector,
+              odl-telemetry-configurator,
+              odl-telemetry-all
+      - neon:
+          branch: 'stable/neon'
+          karaf-version: odl
+          # Self-Managed projects repos and features:
+          sm-repos: >
+              mvn:org.opendaylight.telemetry/features-telemetry//xml/features
+          sm-features: >
               odl-telemetry-collector,
               odl-telemetry-configurator,
               odl-telemetry-all
           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
           sm-features: >
-              odl-sxp-routing,
               odl-transportpce,
               odl-transportpce-api,
               odl-transportpce-ordmodels,
@@ -48,6 +54,7 @@
       - oxygen:
           branch: 'stable/oxygen'
           karaf-version: karaf4
+          disable-job: 'true'
 
 - project:
     name: distribution-managed
@@ -71,7 +78,7 @@
     dist-pom: 'distribution/pom.xml'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           dependencies: >
               aaa-merge-{stream},
               ovsdb-merge-{stream},
               serviceutils-merge-{stream},
               sfc-merge-{stream}
+      - neon:
+          branch: 'stable/neon'
+          dependencies: >
+              aaa-merge-{stream},
+              bgpcep-merge-{stream},
+              coe-merge-{stream},
+              controller-merge-{stream},
+              daexim-merge-{stream},
+              genius-merge-{stream},
+              infrautils-merge-{stream},
+              lispflowmapping-merge-{stream},
+              mdsal-merge-{stream},
+              netconf-merge-{stream},
+              netvirt-merge-{stream}
+              neutron-merge-{stream},
+              openflowplugin-merge-{stream},
+              ovsdb-merge-{stream},
+              serviceutils-merge-{stream},
+              sfc-merge-{stream}
       - fluorine:
           branch: 'stable/fluorine'
           dependencies: >
 
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
           dependencies: >
               aaa-merge-{stream},
               alto-merge-{stream},
     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},
+              telemetry-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 66e2df0d004c42426f923dec0f0fff18c8e03eef..961df7bcbbe0aef28812847bec6d446a3224af07 100644 (file)
@@ -24,15 +24,7 @@ if [ ${BUNDLE_URL} == 'last' ]; then
     BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLE_VERSION}"
     BUNDLE="${KARAF_ARTIFACT}-${TIMESTAMP}.zip"
     ACTUAL_BUNDLE_URL="${NEXUSPATH}/${BUNDLE_VERSION}/${BUNDLE}"
-elif [ ${BUNDLE_URL} == 'autorelease' ]; then
-    # Use latest stable AR job distribution URL
-    ACTUAL_BUNDLE_URL="$(curl -sL -X GET -H 'Accept:text/plain' https://jenkins.opendaylight.org/releng/view/autorelease/job/autorelease-release-$DISTROSTREAM/lastStableBuild/injectedEnvVars/export | grep BUNDLE_URL | tr -d 'BUNDLE_URL=')"
-    BUNDLE="${ACTUAL_BUNDLE_URL##*/}"
-    ARTIFACT="$(basename "$(dirname "$(dirname "${ACTUAL_BUNDLE_URL}")")")"
-    BUNDLE_VERSION="$(basename "$(dirname "${ACTUAL_BUNDLE_URL}")")"
-    BUNDLEFOLDER="${ARTIFACT}-${BUNDLE_VERSION}"
 else
-    # Use provided BUNDLE_URL
     ACTUAL_BUNDLE_URL="${BUNDLE_URL}"
     BUNDLE="${BUNDLE_URL##*/}"
     ARTIFACT="$(basename "$(dirname "$(dirname "${BUNDLE_URL}")")")"
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
 
index 5a1922fb17acdc84076aa1b066c54d6d4fa5c280..b9e448a037128fde0800b03266154778bb5bc2a8 100644 (file)
@@ -76,9 +76,7 @@
       - string:
           name: BUNDLE_URL
           default: '{bundle-url}'
-          description: |
-              Karaf distribution zip URL. Use last for last distribution in Nexus,
-              use autorelease for last stable AR job distribution.
+          description: 'URL to karaf distribution zip'
 
 - parameter:
     name: integration-repo-url
index 50b821a59189b707b5949b0fae977fded095c160..ef6157e41f7d94ec9d40d774dd90e38407c537cc 100644 (file)
@@ -81,7 +81,7 @@
     odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
 
     #####################
     # Job configuration #
     odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
 
     #####################
     # Job configuration #
     odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
 
     #####################
     # Job Configuration #
     odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
 
     #####################
     # Job configuration #
     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'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
 
     #####################
     # Job configuration #
     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'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
 
     #####################
     # Job configuration #
index 660144e2fa0116173278451302997d1416235d2e..be7e06e5d9cfa93f0418ac3591288f839773eaa1 100644 (file)
 
     # CSIT Lists in defaults.yaml
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           mvn-version: 'mvn35'
+          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
+
+      - neon:
+          branch: 'stable/neon'
+          mvn-version: 'mvn35'
           csit-list: !include: csit-jobs-neon.lst
           build-order: >
               odlparent yangtools infrautils mdsal controller serviceutils aaa netconf
@@ -44,6 +53,7 @@
               odlparent yangtools infrautils mdsal controller serviceutils aaa netconf
               daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt
               bgpcep integration/distribution
+          disable-job: true
 
 - project:
     name: integration-distribution
 
     # 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
       - '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'
           forbidden-files: ''
 
     builders:
+      - lf-infra-pre-build
       - config-file-provider:
           files:
             - file-id: odl-elastic-cloud
           build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
-      - integration-distribution-branch:
-          branch: '{branch}'
-      - integration-distribution-stream:
-          stream: '{stream}'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
 
     builders:
-      - integration-detect-variables
+      - lf-infra-pre-build
       - trigger-builds:
           - project: '{csit-list}'
             block: true
             predefined-parameters: |
-              BUNDLE_URL=$ACTUAL_BUNDLE_URL
+              BUNDLE_URL=$BUNDLE_URL
               KARAF_VERSION=$KARAF_VERSION
 
     wrappers:
       - 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 5a189d4f4113a17350b704ecfd1947c8294aa51c..682d0e301cc15eef286545a61ed287748ca9889b 100755 (executable)
@@ -17,6 +17,10 @@ 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"
@@ -47,7 +51,7 @@ if [[ "${PATCHES_TO_BUILD}" == *topic* ]]; then
     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
@@ -73,12 +77,8 @@ if [[ "${PATCHES_TO_BUILD}" == *topic* ]]; then
             read -rd '' -a SORT_REF_LIST <<< "${SORT_REF[*]}" || true
             # add refspec to patches to build list
             for PATCH in "${SORT_REF_LIST[@]}"; do
-                # if project is odlparent or yangtools, do not cherry-pick
-                if [[ "${PROJECT}" == "odlparent" || "${PROJECT}" == "yangtools" ]]; then
-                    PATCHES_TO_BUILD="${PATCHES_TO_BUILD}=${PATCH/*-/}"
-                else
-                    PATCHES_TO_BUILD="${PATCHES_TO_BUILD}:${PATCH/*-/}"
-                fi
+                # cherry-pick is better than checkout patch
+                PATCHES_TO_BUILD="${PATCHES_TO_BUILD}:${PATCH/*-/}"
             done
         fi
     done
@@ -92,9 +92,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:
@@ -110,33 +111,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
@@ -145,7 +164,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
@@ -163,57 +182,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 odlparent version
-        patch_version="$(xpath ./odlparent/odlparent-lite/pom.xml '/project/version/text()' 2> /dev/null)"
-        msi_version="$(xpath ./mdsal/pom.xml '/project/parent/version/text()' 2> /dev/null)"
-        # Replace odlparent version
-        find ./odlparent -name "*.xml" -print0 | xargs -0 sed -i "s/${patch_version}/${msi_version}/g"
-        echo "odlparent project version changed to ${msi_version}"
-    else
-        # Release odlparent
-        find ./odlparent -name "*.xml" -print0 | xargs -0 sed -i 's/-SNAPSHOT//g'
-        odlparent_version=${patch_version%"-SNAPSHOT"}
-        echo "odlparent project version changed to ${odlparent_version}"
-    fi
-fi
-if [[ -d "yangtools" ]]; then
-    if [[ -d "mdsal" ]]; then
-        # Adjust yangtools and odlparent version to mdsal
-        # Extract patch and MSI used yangtools version
-        patch_version="$(xpath ./yangtools/pom.xml '/project/version/text()' 2> /dev/null)"
-        msi_version="$(xpath ./mdsal/dom/dom-parent/pom.xml '/project/dependencyManagement/dependencies/dependency[artifactId="yangtools-artifacts"]/version/text()' 2> /dev/null)"
-        # Replace yangtools version
-        find ./yangtools -name "*.xml" -print0 | xargs -0 sed -i "s/${patch_version}/${msi_version}/g"
-        echo "yangtools project version changed to ${msi_version}"
-        # Extract patch and MSI used odlparent version
-        patch_version="$(xpath ./yangtools/pom.xml '/project/parent/version/text()' 2> /dev/null)"
-        msi_version="$(xpath ./mdsal/pom.xml '/project/parent/version/text()' 2> /dev/null)"
-        # Replace odlparent version
-        find ./yangtools -name "*.xml" -print0 | xargs -0 sed -i "s/${patch_version}/${msi_version}/g"
-        echo "yangtools project odlparent version changed to ${msi_version}"
-    else
-        # Release yangtools and adjust odlparent version if required
-        find ./yangtools -name "*.xml" -print0 | xargs -0 sed -i 's/-SNAPSHOT//g'
-        yangtools_version=${patch_version%"-SddNAPSHOT"}
-        echo "yangtools project version changed to ${yangtools_version}"
-        if [[ -d "odlparent" ]]; then
-            # Extract odlparent version from odlparent
-            patch_version="$(xpath ./yangtools/pom.xml '/project/parent/version/text()' 2> /dev/null)"
-            # Replace odlparent version
-            find ./yangtools -name "*.xml" -print0 | xargs -0 sed -i "s/${patch_version}/${odlparent_version}/g"
-            echo "yangtools project odlparent version changed to ${odlparent_version}"
-        fi
-    fi
-fi
-
 # Second phase: build everything
 
 for PROJECT_SHORTNAME in "${PROJECTS[@]}"; do
diff --git a/jjb/iotdm/iotdm-csit-basic.yaml b/jjb/iotdm/iotdm-csit-basic.yaml
deleted file mode 100644 (file)
index df7ec1e..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
----
-- project:
-    name: iotdm-csit-basic
-    jobs:
-      - inttest-csit-1node
-      - inttest-csit-verify-1node
-
-    # The project name
-    project: 'iotdm'
-
-    # 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-iotdmcsitdist'
-
-    # Robot custom options
-    robot-options: ''
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..f0d77cc85d46a8c7a5c2b1773807fcda0cbe6f63 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - only:
index 5059f3172e785d9f8fb0f37b675e0fcb9672b436..41522921f345e23577fc920fde449627c3e412ee 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- project:
+    name: jsonrpc-sodium
+    jobs:
+      - odl-maven-jobs
+
+    project: 'jsonrpc'
+    project-name: 'jsonrpc'
+    stream: sodium
+    branch: 'master'
+    mvn-settings: 'jsonrpc-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
+    email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
+
+    # Used by the release job
+    staging-profile-id: 96fdf4408765d
+
 - project:
     name: jsonrpc-neon
     jobs:
@@ -7,7 +24,7 @@
     project: 'jsonrpc'
     project-name: 'jsonrpc'
     stream: neon
-    branch: 'master'
+    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}'
@@ -47,6 +64,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
     email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96fdf4408765d
index 332eddb349ec5fdd31ad6da6653e8e86807f9927..cce9831792c458147dbc31ab00a8bfa8eb55e1b3 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - only:
index 2366e31e099b7e3406ddc1548a8144066168b2d5..ce53408f42851e63ff590658e7e8a098f5d759e1 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - all:
index 3c7fd0e8171f2c16abd99207cdd63336c1717012..5b68a71d1853ee7dea72c9218573701c7fff1147 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - all:
index 8634fd4497c213d298f45643ef763eda7d0050b5..4449ca659220163a86c7a88ca180fc76a654f71d 100644 (file)
@@ -9,12 +9,16 @@
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+          os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     feature:
       - all:
index 176de3580dfcb6f6e5ea164abb657c99bf8f19e0..347e3f23a121d0e30b071dfe6c6b7272c8b8f4b7 100644 (file)
@@ -1,4 +1,26 @@
 ---
+- project:
+    name: l2switch-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'l2switch'
+    project-name: 'l2switch'
+    branch: 'master'
+    mvn-settings: 'l2switch-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    dependencies: >
+        odlparent-merge-{stream},
+        yangtools-merge-{stream},
+        controller-merge-{stream},
+        openflowjava-merge-{stream},
+        openflowplugin-merge-{stream}
+    email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
+
+    # Used by the release job
+    staging-profile-id: 96fee85953ca0
+
 - project:
     name: l2switch-neon
     jobs:
@@ -7,7 +29,7 @@
     stream: neon
     project: 'l2switch'
     project-name: 'l2switch'
-    branch: 'master'
+    branch: 'stable/neon'
     mvn-settings: 'l2switch-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: >
@@ -62,6 +84,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
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 2ae7a259d0ebe01f5f4ae47d74005fee1dba2041..2b1a3009cfbd1e181d2aa0040e900a842aae2d61 100644 (file)
     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:
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..1902a1f11d8b2eb148f03c9f1d5b59071edf7f8e 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - all:
index 9017bc0674e0d966731c45eb926e3f4a7d425b89..55f008e6ac2a8b9ca0410a047873215987acfd3d 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - only:
index 4d5492db04098df6d2d362da47b49630c44f0a70..6febcdaf4909be280c8115cee3a6eb50d18eb2c4 100644 (file)
@@ -1,4 +1,37 @@
 ---
+- project:
+    name: lispflowmapping-sodium
+    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:
+          java-version:
+            - openjdk8
+            - openjdk11
+
+    stream: sodium
+    project: 'lispflowmapping'
+    project-name: 'lispflowmapping'
+    branch: 'master'
+    mvn-settings: 'lispflowmapping-settings'
+    mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
+    dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
+    email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
+    archive-artifacts: >
+        **/*.log
+        **/target/surefire-reports/*-output.txt
+
+    build-node: centos7-builder-8c-8g
+
+    # Used by the release job
+    staging-profile-id: 96fff2503b766
+
 - project:
     name: lispflowmapping-neon
     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
 
-    java-version:
-      - openjdk8
-      - openjdk11
     stream: neon
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
-    branch: 'master'
+    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'
         **/target/surefire-reports/*-output.txt
 
     build-node: centos7-builder-8c-8g
-
+    disable-job: true
     # Used by the release job
     staging-profile-id: 96fff2503b766
 
index 0f36f54fe2a90722147fc89ee399f8563d655062..c7a3344d21a735435860d8da88895af85df5bd9f 100644 (file)
     functionality: 'bindingv1'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - only:
index ffafa87c310ffd9849f5f0b0b1957fe15104a832..d7ec6f12dc3e63d0ca5d02c9e45d94112afbafdd 100644 (file)
@@ -7,15 +7,19 @@
     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'
+          disable-job: true
 
     jdk: 'openjdk8'
 
index 7b7c25a5c38ec9e62ae994fd951d98454510c757..d9cba7671485f03a53cbbe842480bdeeb13daed3 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
@@ -38,6 +39,7 @@
           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
@@ -85,6 +87,7 @@
     build-timeout: 90
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[mdsal] [odlparent] [yangtools]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a674173c7b29d
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..6ac9518ac46f7bf06362c06d2c3009f440837bed 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - all:
index dc24a888f044c146c914ec86b0d7a2224bea8e76..fd541c3846b7d68cd2222865b6be474bd6a116fa 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- project:
+    name: nemo-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'nemo'
+    project-name: 'nemo'
+    branch: 'master'
+    mvn-settings: 'nemo-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[nemo]'
+
+    # Used by the release job
+    staging-profile-id: a67a9890f6202
+
 - project:
     name: nemo-neon
     jobs:
@@ -7,7 +24,7 @@
     stream: neon
     project: 'nemo'
     project-name: 'nemo'
-    branch: 'master'
+    branch: 'stable/neon'
     mvn-settings: 'nemo-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -47,6 +64,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[nemo]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a67a9890f6202
index 7652b068fb23f96001147d23bbee74f793fae30d..79fcc3cf7c48b317b498426f2ddc9dd657f172e0 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - only:
index 85766f77d4235bb6ceee02633e9bb1de3e63e6a7..62be81de97baf4fd0d39fab6e8581a9a62cc68a6 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - only:
index 7e85868e0045b347133ca037cad87c54cac2eacd..41145bd74337760e549af5547ad8b2480ebf7d6a 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - only:
index 8c2119f2cfbe74838d03dabb3bfb9f8a87b1e505..e732525416ffd84e84ffba93945e752810bb8c45 100644 (file)
@@ -7,15 +7,19 @@
     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'
+          disable-job: true
 
     feature:
       - core:
index 6070964f4e70201ce8bc34582f7df72fcb1f879f..efffbcd54e326c23b5ba54245a5f79990a53846d 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - only:
index fdbd77aaa90ea0f827117a44f47d383cb80e8d44..f49c4f5a4fc286392b7ef6234ff667832c4ce006 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - all:
index e3f6be7f604a87e9d8b680190eaebfaa608727db..7fb3c583c6edfef9cf9a20971881f79668eceb6f 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: netconf-sodium
+    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: sodium
+    project: 'netconf'
+    project-name: 'netconf'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    mvn-settings: 'netconf-settings'
+    mvn-goals: 'clean deploy -Pintegrationtests'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+    build-timeout: 90
+    dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
+
+    # Used by the release job
+    staging-profile-id: a67b22fc3663f
+
 - project:
     name: netconf-neon
     jobs:
@@ -13,7 +39,7 @@
     stream: neon
     project: 'netconf'
     project-name: 'netconf'
-    branch: 'master'
+    branch: 'stable/neon'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'netconf-settings'
     mvn-goals: 'clean deploy -Pintegrationtests'
@@ -68,6 +94,7 @@
     build-timeout: 90
     dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a67b22fc3663f
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 005558ef50971ca114ad26d625951e5f8977107f..efc2b804bdf043249a17a9faa59ddfa42dcb671c 100644 (file)
@@ -6,12 +6,16 @@
 
     project: 'netvirt'
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
+
     testplan: '{project}-{topology}-openstack.txt'
 
     test-suites: 'openstack/connectivity/l2.robot
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..56c2f10d44ca8b4cd67f3f007a8d98429262ad1e 100644 (file)
@@ -1,4 +1,81 @@
 ---
+- project:
+    name: netvirt-csit-openstack-integration-sodium
+    jobs:
+      - inttest-csit-openstack-custom
+
+    project: 'netvirt'
+    stream: 'sodium'
+    branch: 'master'
+    testplan: '{project}-{topology}-openstack.txt'
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'placement-api,tempest'
+    enable-openstack-compute-services: 'placement-client'
+    security-group-mode: 'stateful'
+    odl_system_flavor: odl-highcpu-8
+    openstack_system_flavor: odl-highcpu-8
+    openstack_system2_flavor: odl-highcpu-4
+    tools_system_count: 0
+    os-cmb-cnt: 0
+    os-ctl-cnt: 1
+    os-cmp-cnt: 2
+
+    topology:
+      - 1node:
+          openstack_system2_count: 2
+          odl_system_count: 1
+          enable-haproxy: 'no'
+          install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
+          robot-options: '-v FAIL_ON_EXCEPTIONS:True'
+      - 3node:
+          openstack_system2_count: 3
+          odl_system_count: 3
+          enable-haproxy: 'yes'
+          install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
+
+    functionality:
+      - upstream-stateful
+      - upstream-stateful-itm-direct-tunnels:
+          enable-itm-direct-tunnels: 'true'
+      - upstream-stateful-snat-conntrack:
+          odl-snat-mode: 'conntrack'
+      - gate-stateful
+      - gate-stateful-itm-direct-tunnels:
+          enable-itm-direct-tunnels: 'true'
+      - gate-stateful-snat-conntrack:
+          odl-snat-mode: 'conntrack'
+      - gate-minimal-cluster:
+          testplan: '{project}-{topology}-minimal-openstack.txt'
+      # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
+      - gate-tdd-wip:
+          testplan: '{project}-{topology}-tdd-wip-openstack.txt'
+          schedule: ''
+          tools_system_count: 3
+      - tempest-stateful:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+          schedule: '{schedule-daily}'
+      - tempest-stateful-snat-conntrack:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+          odl-snat-mode: 'conntrack'
+          schedule: '{schedule-daily}'
+      - gate-tempest-stateful:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+      - gate-tempest-stateful-snat-conntrack:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+          odl-snat-mode: 'conntrack'
+
+    openstack:
+      - 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}'
+
 - project:
     name: netvirt-csit-openstack-integration-neon
     jobs:
@@ -6,7 +83,7 @@
 
     project: 'netvirt'
     stream: 'neon'
-    branch: 'master'
+    branch: 'stable/neon'
     testplan: '{project}-{topology}-openstack.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,tempest'
     os-cmb-cnt: 0
     os-ctl-cnt: 1
     os-cmp-cnt: 2
+    disable-job: true
 
     topology:
       - 1node:
           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'
           openstack_system2_count: 1
           openstack_system_image: '{openstack_pike_system_image}'
           openstack_system2_image: '{openstack_pike_system_image}'
+          disable-job: true
 
 - 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'
+          disable-job: true
 
     topology:
       - 1node:
index 1827b80726242b112e1c9cab4a6545bc55eab102..1aa204505871cf55708c6d13c67980443aa23398 100644 (file)
@@ -7,15 +7,19 @@
     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'
+          disable-job: true
 
     jdk: 'openjdk8'
 
index 02039887a075ee64bde7ed607e474077a6383b7c..97877eea5ab070d5469a92a001c8c333219d36fd 100644 (file)
     block_on_csit: false
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     project: 'netvirt'
     project-name: 'netvirt'
index 2453f98128c214316d655b39720352f4f711c735..68c612ae3674a98e8df56302f322a99e27541074 100644 (file)
@@ -7,15 +7,19 @@
     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'
+          disable-job: true
 
     jdk: 'openjdk8'
 
index 20e835ed5e4028bb0178bbec050beca6dd4f1030..c42101443a58716977972cd087d7fe89a4c1ebaa 100644 (file)
@@ -1,4 +1,24 @@
 ---
+- project:
+    name: neutron-sodium
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'neutron'
+    project-name: 'neutron'
+    build-timeout: 90
+    branch: 'master'
+    mvn-settings: 'neutron-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
+    email-upstream: '[neutron] [odlparent] [aaa]'
+
+    # Used by the release job
+    staging-profile-id: a67e1b40d7419
+
 - project:
     name: neutron-neon
     jobs:
@@ -10,7 +30,7 @@
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 90
-    branch: 'master'
+    branch: 'stable/neon'
     mvn-settings: 'neutron-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
@@ -35,6 +55,7 @@
     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..9a7fe3fb01ac468406350d9b4175725544b9c272 100644 (file)
@@ -7,15 +7,19 @@
     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'
+          disable-job: true
 
     jdk: 'openjdk8'
 
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..7e896845dbabdc1c14ca5d2b6eb195207465bca2 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- project:
+    name: of-config-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'of-config'
+    project-name: 'of-config'
+    branch: 'master'
+    mvn-settings: 'of-config-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: netconf-merge-{stream}'
+    email-upstream: '[of-config] [netconf]'
+
+    # Used by the release job
+    staging-profile-id: a6880455efe67
+
 - project:
     name: of-config-neon
     jobs:
@@ -7,7 +24,7 @@
     stream: neon
     project: 'of-config'
     project-name: 'of-config'
-    branch: 'master'
+    branch: 'stable/neon'
     mvn-settings: 'of-config-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: netconf-merge-{stream}'
@@ -48,6 +65,7 @@
     dependencies: netconf-merge-{stream}'
     email-upstream: '[of-config] [netconf]'
 
+    disable-job: true
     # Used by the release job
     staging-profile-id: a6880455efe67
 
index 4cda23afcd78b588732113a154b87782828f10b5..061eda8374c962b3279e1f318d982045e9681d97 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - all:
index b404b273f4e1b8f1fef7da48146815486f5105c6..33161840e913f426f6680310a2752815d63a7f9f 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - only:
index 04b07adb1f677b61f1fb9f872ff15c45ad8ae55b..5c3caa2e7e0521e12752644c1cfd5d0856ffc0fb 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - only:
index 6cf7e904ee4a74eee84dc36d75112b6ac83eaa83..431b246488913756df72301aa209e4ef0f8bc625 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - only:
index 9bbc4cf698cde000b6576fff60d2b5b33b52ba10..9ec743cda0f11cea15ba2fdd44ab68242d812c26 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - only:
index 36c42a25308ce6be16775c7450add4a55d9a1f1d..7a5acaf3f7593ffac6938df6679ef50781d9e39e 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - all:
index ca0d53dbe07e80754405eec5f0e5715112493002..7df4298dba227a2be66c157984d915b96e7b2d14 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - only:
index 540f34830855505b7f2c7b53fa7566651026a7a7..79df63be04d3f495dcba87fd98c55fe0f99409d6 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - only:
index 1232f7ff9dbb45834d8fc0122dcd2baecb76dff0..0c6e97d7b317f83f8c3e318389e20d335b9475f2 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - only:
index aa2a4db56aa826284460afec764323678b4b6920..c6a90e064940d8ae3c384805c3123be080617324 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - only:
index f5287d8b9cd3ce36d370f7c4e5aa6c61177f8554..9e2efa5d35d3ba12500cc6297e74d81aad0323af 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - only:
index 7bd8ad239e5e831f3f376f9f3236e951f6b7d22b..0a6f65f3a160e8b0e0dc68394933761c3f33207a 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - only:
index 7d0a84343612501424320651bb236e3204ec3414..db0cc1610387864a6cf214911927f8e5a0f03dc5 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - only:
index bcfd5647e3a9c417485658667ad1553c84e215a3..80f63abbf46bb10910fbb15b4161966440b8adfb 100644 (file)
@@ -9,15 +9,19 @@
 
     # 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'
+          disable-job: true
 
     jdk: 'openjdk8'
 
index 7805f8dbcabeca30da4395e8e10d5436ba7dec96..e18ea7e828162ebc3fd60e1d10191e199a847a49 100644 (file)
@@ -1,4 +1,39 @@
 ---
+- project:
+    name: openflowplugin-sodium
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
+          project-pattern: openflowplugin
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/
+          rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f
+      - odl-maven-jobs
+
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
+    stream: sodium
+    project: 'openflowplugin'
+    project-name: 'openflowplugin'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
+    mvn-settings: 'openflowplugin-settings'
+    mvn-goals: 'clean deploy javadoc:aggregate'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: >
+        odlparent-merge-{stream},
+        yangtools-merge-{stream},
+        controller-merge-{stream},
+        openflowjava-merge-{stream}
+    email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
+
+    # Used by the release job
+    staging-profile-id: a68a76dc1b44c
+
 - project:
     name: openflowplugin-neon
     jobs:
@@ -18,7 +53,7 @@
     stream: neon
     project: 'openflowplugin'
     project-name: 'openflowplugin'
-    branch: 'master'
+    branch: 'stable/neon'
     build-node: centos7-builder-2c-8g
     build-timeout: 90
     mvn-settings: 'openflowplugin-settings'
         controller-merge-{stream},
         openflowjava-merge-{stream}
     email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a68a76dc1b44c
index 9702ce9c814dec8a62c89e48daa75defcdca0a3a..f920b3d4aa093a20b778b61461d1701f5e86b806 100644 (file)
@@ -6,11 +6,16 @@
       - 'opflex-merge-{stream}'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
+      - neon:
+          branch: 'stable/neon'
+          libuv-version: '1.8.0'
+          rapidjson-version: '1.0.2'
+          openvswitch-version: '2.6.0'
       - fluorine:
           branch: 'stable/fluorine'
           libuv-version: '1.8.0'
@@ -21,6 +26,8 @@
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
+          disable-job: true
+
 
     project: 'opflex'
     archive-artifacts: '**/*.tar.gz'
 - 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..9f621b041dbaf4d46def7d21098d0ea929cced00 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'
+      - neon:
+          branch: 'stable/neon'
+          libuv-version: '1.8.0'
+          rapidjson-version: '1.0.2'
+          openvswitch-version: '2.6.0'
       - fluorine:
           branch: 'stable/fluorine'
           libuv-version: '1.8.0'
@@ -25,6 +30,7 @@
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
+          disable-job: true
 
     project: 'opflex'
     project-name: 'opflex'
 
     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..4ee50847bdb9007145f475ad860012b661f2e3e1 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - only:
index 7453bddb94aad3719e4a7809094d66671dc23d99..1acd4cb2e54d187a04e22b18b05be3ef0acd9ecc 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - all:
index 8f02b5d3eb0b469694cb00e75eac9bec3bbad8cd..4bc2181f1ca58c1449c9be8772cf1a86ee32bca9 100644 (file)
@@ -5,12 +5,15 @@
       - 'ovsdb-daily-full-integration-{stream}'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     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..fb2c5b41751b2936699bc04eef6a90a7e1a6a36d 100644 (file)
@@ -8,15 +8,19 @@
     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'
+          disable-job: true
 
     jdk: 'openjdk8'
 
index c8c482541170477f1d8861c860419d8c89ffef00..a47e7e2d4b42e666e317fea679b6d71b35f565ba 100644 (file)
@@ -1,4 +1,32 @@
 ---
+- project:
+    name: ovsdb-sodium
+    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
+
+    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'
+    build-node: centos7-builder-2c-8g
+    mvn-settings: 'ovsdb-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
+
+    # Used by the release job
+    staging-profile-id: a68b188166958
+
 - project:
     name: ovsdb-neon
     jobs:
@@ -17,7 +45,7 @@
     stream: neon
     project: 'ovsdb'
     project-name: 'ovsdb'
-    branch: 'master'
+    branch: 'stable/neon'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'ovsdb-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -68,6 +96,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a68b188166958
index 6025be9a1e0b149f0ed1fd5eea00f6a431ce709e..0f6c51852864bf4a47cc40ba1358850cf0a164ba 100644 (file)
@@ -1,4 +1,22 @@
 ---
+- project:
+    name: p4plugin-sodium
+    jobs:
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'p4plugin'
+    project-name: 'p4plugin'
+    branch: 'master'
+    mvn-settings: 'p4plugin-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[p4plugin]'
+
+    # Used by the release job
+    staging-profile-id: a68bf26e208d4
+
 - project:
     name: p4plugin-neon
     jobs:
@@ -8,7 +26,7 @@
     stream: neon
     project: 'p4plugin'
     project-name: 'p4plugin'
-    branch: 'master'
+    branch: 'stable/neon'
     mvn-settings: 'p4plugin-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -50,6 +68,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[p4plugin]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a68bf26e208d4
index fb0b1856f96779844b9834bae0e26ad183447479..5179fcc1660eb486ed8e6172687df26bec7c0846 100644 (file)
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
 - 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 007a20e4215c1a67840984527de6dad9ced42fcf..0b3673e43ad734108540c960348ca0608bd0934e 100644 (file)
@@ -27,7 +27,9 @@
     stream:
       - neon
       - fluorine
-      - oxygen
+      - oxygen:
+          disable-job: 'true'
+
     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 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-2620/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-20190103.173010-50.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-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
+      - 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-2621/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 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
+      - 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:
 
       # 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.g'
-      - 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-20190103.173010-50.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 1c2b4563232d0c20282ba690140db508d468b94a..b84be440257d8186efd84c3714b596e03c9053d7 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - all:
index 7d500b4e9a2908c59a495f5e35ebb2bce4b79785..1fafb5dc539d47fc31dd38374413a9f584ae47bd 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- project:
+    name: packetcable-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'packetcable'
+    project-name: 'packetcable'
+    branch: 'master'
+    mvn-settings: 'packetcable-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[packetcable]'
+
+    # Used by the release job
+    staging-profile-id: a68ca4a24655c
+
 - project:
     name: packetcable-neon
     jobs:
@@ -7,7 +24,7 @@
     stream: neon
     project: 'packetcable'
     project-name: 'packetcable'
-    branch: 'master'
+    branch: 'stable/neon'
     mvn-settings: 'packetcable-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -47,6 +64,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[packetcable]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a68ca4a24655c
index 715afe353fadf3f93ea6bbbb84ae8dc22433a8c0..8ef6aae3dbfbb367abfc34d311bf6c32d5cc6ee6 100644 (file)
@@ -17,6 +17,7 @@
       - '{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
@@ -27,6 +28,7 @@
           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:
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..d3e1e84382bafebeac54d84ade71c8d34b47f8f7 100644 (file)
@@ -7,15 +7,19 @@
     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'
+          disable-job: false
 
     jdk: 'openjdk8'
 
index 98801745618fb27223023542db4d9c97dfb6e44e..c28579e5c807b650ebb08c934e12705243934f3d 100644 (file)
       - odl-maven-jobs
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     project: 'serviceutils'
     project-name: 'serviceutils'
index 05b7fd2f825a8100355b234eb181d9bb7a2aa507..0718a03d980163b25176c951efcce56aca98f07f 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - all:
index d12157507d4179ce7a55737ab03d5b47bdda43dd..9f22e8643ddefa2cce4e4e1d074dfef78787a253 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - all:
index 1e4833e31b9cafd84d241149a68b59756a6eb7e4..0ab5eaf658e68bcbb56aa99bc905643c81a4da6c 100644 (file)
@@ -9,15 +9,19 @@
 
     # 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'
+          disable-job: true
 
     feature:
       - basic:
index 3dfecd935726b5ce9ecbb8e2ee488770295352ab..16752b0c4651a98a58758f28b5dd0a6d27a50db9 100644 (file)
@@ -5,12 +5,15 @@
       - 'gerrit-tox-verify'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     project: 'sfc'
     project-name: 'sfc'
index 4e659c575643eee72f1865f4361d4cf6ad31154b..b160c492eff0ffb579e268b69012537773fb750e 100644 (file)
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: sfc-sodium
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: sfc
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sfc/38996/
+          rtd-token: 2fa6c2900bbe181b0427ad65df3dc494ac749edb
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'sfc'
+    project-name: 'sfc'
+    branch: 'master'
+    mvn-settings: 'sfc-settings'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    build-timeout: 120
+    dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
+    email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
+    build-node: centos7-builder-8c-8g
+
+    # Used by the release job
+    staging-profile-id: a68eb361ca48a
+
 - project:
     name: sfc-neon
     jobs:
@@ -13,7 +38,7 @@
     stream: neon
     project: 'sfc'
     project-name: 'sfc'
-    branch: 'master'
+    branch: 'stable/neon'
     mvn-settings: 'sfc-settings'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     build-timeout: 120
@@ -70,6 +95,7 @@
     dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
     email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
     build-node: centos7-builder-8c-8g
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a68eb361ca48a
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..46ebba15d53282a44c3c21256ecb1a480d62d57e 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- project:
+    name: snmp-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'snmp'
+    project-name: 'snmp'
+    branch: 'master'
+    mvn-settings: 'snmp-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream}'
+    email-upstream: '[snmp] [odlparent]'
+
+    # Used by the release job
+    staging-profile-id: a68fb236b93a6
+
 - project:
     name: snmp-neon
     jobs:
@@ -7,7 +24,7 @@
     stream: neon
     project: 'snmp'
     project-name: 'snmp'
-    branch: 'master'
+    branch: 'stable/neon'
     mvn-settings: 'snmp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
@@ -47,6 +64,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[snmp] [odlparent]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a68fb236b93a6
index 228b19f42d54ffd7e0b201bec28bbcee7d328b45..eab54f6977bc302ace8bc3b2d4f3a06c019b2093 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- project:
+    name: snmp4sdn-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'snmp4sdn'
+    project-name: 'snmp4sdn'
+    branch: 'master'
+    mvn-settings: 'snmp4sdn-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
+
+    # Used by the release job
+    staging-profile-id: a69034a4b6ef5
+
 - project:
     name: snmp4sdn-neon
     jobs:
@@ -7,7 +24,7 @@
     stream: neon
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
-    branch: 'master'
+    branch: 'stable/neon'
     mvn-settings: 'snmp4sdn-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
@@ -47,6 +64,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a69034a4b6ef5
index c137ab7b6e7bd31555890ea9c9d82f0b1b6216d1..f10ead2a8a329e5c19345684c7eb437e4ae6add1 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/1.7.2-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     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 3fe2e5be584526fb4c7c0b30865f3e28a7535f62..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
@@ -30,7 +32,7 @@
           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 09e2f71326a05d98be8478d93469735c3ff0253f..1c67fec39637bb1de7e4636be2bd5937ebd70741 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
@@ -30,7 +32,7 @@
           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 781ba19c36b3fbaf8725dd2c83407b2ba88753ad..e9a7a7c1f8b8b5d9bd672b9044472ebc100b3347 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/1.7.2-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     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 a443ff176539f38b822111645d825de3d0bd5d65..754f9b0e719eabdb345264d962ca3e378f3f91d3 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/1.7.2-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     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 b02734dfa6d9f54b4cbba7282d36e7070cd8cd41..fc876b8bbc1258d2b9d94f2fd6ca785d731787cd 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/1.7.2-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     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 ed1806babd74f134009907243ce7e041e0f381f6..d6f1637e521e044f35678084a3dc5d9aa2d35b96 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/1.7.2-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     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 c84828118ea7577b29fac4a06bfaba8cf78eb9e5..5f6c3bdddc812ffdf0b22dad06f19526f098af8e 100644 (file)
@@ -1,4 +1,32 @@
 ---
+- project:
+    name: sxp-sodium
+    jobs:
+      - '{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
+
+    java-version:
+      - openjdk8
+      - openjdk11
+
+    stream: sodium
+    project: 'sxp'
+    project-name: 'sxp'
+    branch: 'master'
+
+    mvn-settings: 'sxp-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
+
+    # Used by the release job
+    staging-profile-id: a6909c75719b7
+
 - project:
     name: sxp-neon
     jobs:
@@ -16,7 +44,7 @@
     stream: neon
     project: 'sxp'
     project-name: 'sxp'
-    branch: 'master'
+    branch: 'stable/neon'
 
     mvn-settings: 'sxp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -65,6 +93,7 @@
 
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a6909c75719b7
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
index b7f9829a624ad8c84f01ae4e2252f00605264fca..61caadd4f7d8686e7eac0a9b3779fec38c9d1fa0 100644 (file)
 
     # Project branches
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
 
     install:
       - all:
index c14d5a77c94435d7774d2945ae6941d598d0f35e..914fec7d96d2da8a4be353f6def0d19a941f177f 100644 (file)
@@ -1,4 +1,34 @@
 ---
+- 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:
@@ -13,7 +43,7 @@
     stream: neon
     project: 'telemetry'
     project-name: 'telemetry'
-    branch: 'master'
+    branch: 'stable/neon'
     jdks:
       - openjdk8
     maven:
index a7308c80caddf0e07d606342dd6cac2401e2bb22..28af1303937ab72dca7f4697daa82006be6e0c65 100644 (file)
@@ -1,4 +1,29 @@
 ---
+- project:
+    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:
+          build-timeout: 120
+          build-node: centos7-builder-8c-8g
+      - odl-maven-jobs
+
+    project: 'transportpce'
+    project-name: 'transportpce'
+    stream: sodium
+    branch: 'master'
+    mvn-settings: 'transportpce-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[transportpce] [odlparent] [yangtools] [controller]'
+
+    # Used by the release job
+    staging-profile-id: a6927323fa3d4
+
 - project:
     name: transportpce-neon
     jobs:
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-transportpce/47688/
           rtd-token: 6f37ba63226bdcc6c823ee455e62237cf68813fd
       - gerrit-tox-verify:
-          build-timeout: 90
+          build-timeout: 120
+          build-node: centos7-builder-8c-8g
       - odl-maven-jobs
 
     project: 'transportpce'
     project-name: 'transportpce'
     stream: neon
-    branch: 'master'
+    branch: 'stable/neon'
     mvn-settings: 'transportpce-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -58,6 +84,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[transportpce] [odlparent] [yangtools] [controller]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a6927323fa3d4
index 3af4a36affbfb574c5cab5dbc605ae66f6c38aa1..2916a91cabf97e648661daf48d28d61c497dcd68 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
@@ -27,6 +29,7 @@
           repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr//xml/features'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - only:
index f18d9c41fb01b13bb53d428d600bca435c5d96cf..2be946c3e409d064b1c137454b6650a44e78d243 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
@@ -27,6 +29,7 @@
           repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr//xml/features'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - only:
index 219472b649569275aba672fde32e2851c822233e..875cef3010ac939ab504827a866cc66942182d22 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
@@ -27,6 +29,7 @@
           repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr//xml/features'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - all:
index cf00cd88636d3b1fdde25ba7807fbf4de5367849..d4e215410421aee70bb3eeb1186b229958bb207a 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
@@ -27,6 +29,7 @@
           repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr//xml/features'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - all:
index f16049f8291378991e9ccfe3d00a13d8f758fe25..5d6fa15bac8f000283946ca20fd94c03deaaede4 100644 (file)
@@ -1,4 +1,26 @@
 ---
+- project:
+    name: tsdr-sodium
+    jobs:
+      - '{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: sodium
+    project: 'tsdr'
+    project-name: 'tsdr'
+    branch: 'master'
+    mvn-settings: 'tsdr-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[tsdr]'
+
+    # Used by the release job
+    staging-profile-id: a69373036303c
+
 - project:
     name: tsdr-neon
     jobs:
@@ -12,7 +34,7 @@
     stream: neon
     project: 'tsdr'
     project-name: 'tsdr'
-    branch: 'master'
+    branch: 'stable/neon'
     mvn-settings: 'tsdr-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -57,6 +79,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[tsdr]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a69373036303c
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..53cd5aa8dce7b068dfcec6a1123edf2f467f8e36 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'
+          disable-job: true
 
     install:
       - all:
index a8fb8b199092a06ec470eae310c2ddbb9d33ec9c..2675421c0ecc81239f1992681ffa6410f320d322 100644 (file)
@@ -1,4 +1,22 @@
 ---
+- project:
+    name: usc-sodium
+    jobs:
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'usc'
+    project-name: 'usc'
+    branch: 'master'
+    mvn-settings: 'usc-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
+    email-upstream: '[usc] [controller] [yangtools] [odlparent]'
+
+    # Used by the release job
+    staging-profile-id: a697b633b3ffe
+
 - project:
     name: usc-neon
     jobs:
@@ -8,7 +26,7 @@
     stream: neon
     project: 'usc'
     project-name: 'usc'
-    branch: 'master'
+    branch: 'stable/neon'
     mvn-settings: 'usc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
@@ -50,6 +68,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
     email-upstream: '[usc] [controller] [yangtools] [odlparent]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a697b633b3ffe
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..50deb04dc782899953a8cd2ecd9a76d76ed5a9ff 100644 (file)
 
     # Project branches.
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
 
     install:
       - only:
index e414787cd7c75c085865695cfe83be585b640e31..461f03e1945c09b2386dfa79c155800dd4332de1 100644 (file)
@@ -7,15 +7,19 @@
     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'
+          disable-job: true
 
     jdk: 'openjdk8'
 
index 20bc4533d1befb9f439972ce7a340f5c43de7d7e..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
@@ -29,7 +30,8 @@
 - project:
     name: yangtools-v2.1.x
     jobs:
-      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-maven-javadoc-jobs':
+          disable-job: true
       - odl-maven-jobs
 
     project: yangtools
@@ -56,7 +58,8 @@
 - project:
     name: yangtools-v2.0.x
     jobs:
-      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-maven-javadoc-jobs':
+          disable-job: true
       - odl-maven-jobs
 
     project: yangtools
index fbd554bcb2970fd715bfe6a68a58551158f73c25..77df480ff311d4d74e76dcdeb076c136cd524e13 100644 (file)
@@ -5,17 +5,15 @@
   vars:
     openvswitch_version: 2.8.2
     openvswitch_checksum: sha256:87b4a7e7134a44ce1f808d3415a2244b4518c2b0b2a42fa2f8231e592f13103d
-    k8s_version: 1.9.4
-    openvswitch_package_cache: /opt/cache/ovs
-    golang_package_cache: /opt/cache/golang
-    golang_version: 1.11.4
-    golang_checksum: sha256:fb26c30e6a04ad937bbc657a1b5bba92f80096af1e8ee6da6430c045a8db3a5b
+    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'