Merge "Push OpFlex artifacts to Nexus repository."
authorThanh Ha <thanh.ha@linuxfoundation.org>
Tue, 15 Aug 2017 00:00:23 +0000 (00:00 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 15 Aug 2017 00:00:23 +0000 (00:00 +0000)
205 files changed:
docs/jenkins.rst
jjb/aaa/aaa-csit-authn.yaml
jjb/aaa/aaa-csit-idmlite.yaml
jjb/aaa/aaa-csit-keystone.yaml
jjb/aaa/aaa-csit-tls.yaml
jjb/aaa/aaa-patch-test.yaml
jjb/aaa/aaa.yaml
jjb/alto/alto-csit-setup.yaml
jjb/alto/alto.yaml
jjb/atrium/atrium.yaml
jjb/autorelease/autorelease-macros.yaml
jjb/autorelease/autorelease-projects.yaml
jjb/autorelease/autorelease-templates.yaml
jjb/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
jjb/capwap/capwap.yaml
jjb/cardinal/cardinal.yaml
jjb/centinel/centinel-csit-basic.yaml
jjb/centinel/centinel.yaml
jjb/coe/coe-csit-openstack.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-periodic-dsbenchmark-cluster.yaml
jjb/controller/controller-csit-periodic-dsbenchmark.yaml
jjb/controller/controller-csit-rest-cars-perf.yaml
jjb/controller/controller-csit-rest-clust-cars-perf.yaml
jjb/controller/controller.yaml
jjb/coretutorials/coretutorials.yaml
jjb/daexim/daexim-csit-basic.yaml
jjb/daexim/daexim.yaml
jjb/didm/didm-csit-discovery.yaml
jjb/didm/didm.yaml
jjb/dlux/dlux.yaml
jjb/dluxapps/dluxapps-csit-yangman.yaml
jjb/dluxapps/dluxapps.yaml
jjb/docs/docs-rtd.yaml
jjb/eman/eman.yaml
jjb/faas/faas.yaml
jjb/federation/federation.yaml
jjb/genius/genius-csit-genius.yaml
jjb/genius/genius-patch-test.yaml
jjb/genius/genius.yaml
jjb/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.yaml
jjb/integration/distribution/distribution-csit-userfeatures.yaml
jjb/integration/distribution/distribution-jobs.yaml
jjb/integration/distribution/distribution.yaml
jjb/integration/integration-test-jobs.yaml
jjb/iotdm/iotdm-csit-basic.yaml
jjb/iotdm/iotdm.yaml
jjb/jsonrpc/jsonrpc-csit-basic.yaml
jjb/jsonrpc/jsonrpc.yaml
jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
jjb/l2switch/l2switch-csit-scalability.yaml
jjb/l2switch/l2switch-csit-switch.yaml
jjb/l2switch/l2switch-patch-test.yaml
jjb/l2switch/l2switch.yaml
jjb/lacp/lacp-csit-lacp.yaml
jjb/lacp/lacp.yaml
jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
jjb/lispflowmapping/lispflowmapping.yaml
jjb/mdsal/mdsal-csit-bindingv1.yaml
jjb/mdsal/mdsal.yaml
jjb/messaging4transport/messaging4transport-csit-basic.yaml
jjb/messaging4transport/messaging4transport.yaml
jjb/natapp/natapp-csit-basic.yaml
jjb/natapp/natapp.yaml
jjb/nemo/nemo-csit-engine.yaml
jjb/nemo/nemo.yaml
jjb/netconf/netconf-cluster-stress.yaml
jjb/netconf/netconf-clustering-scale.yaml
jjb/netconf/netconf-clustering.yaml
jjb/netconf/netconf-csit-callhome.yaml
jjb/netconf/netconf-patch-test.yaml
jjb/netconf/netconf-scale.yaml
jjb/netconf/netconf-userfeatures.yaml
jjb/netconf/netconf.yaml
jjb/netide/netide-csit-basic.yaml
jjb/netide/netide.yaml
jjb/netvirt/cleanup-docker.sh [moved from jjb/netvirt/include-raw-cleanup-docker.sh with 100% similarity]
jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
jjb/netvirt/netvirt-csit-multi-openstack.yaml
jjb/netvirt/netvirt-full-integration.yaml
jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml
jjb/netvirt/netvirt-patch-test.yaml
jjb/netvirt/netvirt.yaml
jjb/netvirt/openstack-ci.sh [moved from jjb/netvirt/include-raw-openstack-ci.sh with 100% similarity]
jjb/netvirt/setup-docker.sh [moved from jjb/netvirt/include-raw-setup-docker.sh with 100% similarity]
jjb/neutron/neutron.yaml
jjb/next/next.yaml
jjb/nic/nic-csit-basic.yaml
jjb/nic/nic.yaml
jjb/ocpplugin/ocpplugin-csit-basic.yaml
jjb/ocpplugin/ocpplugin-csit-scalability.yaml
jjb/ocpplugin/ocpplugin.yaml
jjb/of-config/of-config-csit-basic.yaml
jjb/of-config/of-config.yaml
jjb/ofextensions/circuitsw/circuitsw.yaml
jjb/openflowjava/openflowjava.yaml
jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml
jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml
jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml
jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
jjb/openflowplugin/openflowplugin-csit-clustering.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
jjb/openflowplugin/openflowplugin-csit-longevity.yaml
jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml
jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml
jjb/openflowplugin/openflowplugin-csit-sanity.yaml
jjb/openflowplugin/openflowplugin-csit-scalability.yaml
jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-frs.yaml
jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
jjb/openflowplugin/openflowplugin-patch-test.yaml
jjb/openflowplugin/openflowplugin.yaml
jjb/opflex/opflex-custom.yaml
jjb/opflex/opflex-dependencies.yaml
jjb/ovsdb/cleanup-docker.sh [moved from jjb/ovsdb/include-raw-cleanup-docker.sh with 100% similarity]
jjb/ovsdb/ovsdb-csit-clustering.yaml
jjb/ovsdb/ovsdb-csit-southbound.yaml
jjb/ovsdb/ovsdb-full-integration.yaml
jjb/ovsdb/ovsdb-patch-test.yaml
jjb/ovsdb/ovsdb-sonar.yaml
jjb/ovsdb/ovsdb.yaml
jjb/ovsdb/setup-docker.sh [moved from jjb/ovsdb/include-raw-setup-docker.sh with 100% similarity]
jjb/packetcable/packetcable-csit-pcmm.yaml
jjb/packetcable/packetcable.yaml
jjb/persistence/persistence.yaml
jjb/releng-defaults.yaml
jjb/releng-jobs.yaml
jjb/releng-macros.yaml
jjb/reservation/reservation.yaml
jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
jjb/sdninterfaceapp/sdninterfaceapp.yaml
jjb/sfc/sfc-csit-full-deploy.yaml
jjb/sfc/sfc-csit-rest-basic.yaml
jjb/sfc/sfc-patch-test.yaml
jjb/sfc/sfc-python.yaml
jjb/sfc/sfc.yaml
jjb/snbi/snbi.yaml
jjb/snmp/snmp-csit-basic.yaml
jjb/snmp/snmp.yaml
jjb/snmp4sdn/snmp4sdn.yaml
jjb/sxp/sxp-csit-basic.yaml
jjb/sxp/sxp-csit-cluster-routing.yaml
jjb/sxp/sxp-csit-clustering.yaml
jjb/sxp/sxp-csit-filtering.yaml
jjb/sxp/sxp-csit-performance.yaml
jjb/sxp/sxp-csit-topology.yaml
jjb/sxp/sxp.yaml
jjb/systemmetrics/systemmetrics.yaml
jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
jjb/topoprocessing/topoprocessing.yaml
jjb/transportpce/transportpce.yaml
jjb/tsdr/tsdr-csit-cassandra.yaml
jjb/tsdr/tsdr-csit-elasticsearch.yaml
jjb/tsdr/tsdr-csit-hbase.yaml
jjb/tsdr/tsdr-csit-hsqldb.yaml
jjb/tsdr/tsdr.yaml
jjb/ttp/ttp.yaml
jjb/unimgr/unimgr-csit-basic.yaml
jjb/unimgr/unimgr-csit-legato.yaml
jjb/unimgr/unimgr.yaml
jjb/usc/usc-csit-channel.yaml
jjb/usc/usc-csit-tcp.yaml
jjb/usc/usc.yaml
jjb/usecplugin/usecplugin-csit-basic.yaml
jjb/usecplugin/usecplugin.yaml
jjb/vtn/vtn-csit-3node-manager.yaml
jjb/vtn/vtn-csit-coordinator.yaml
jjb/vtn/vtn-csit-manager.yaml
jjb/vtn/vtn-manager-csit-1node-openstack.yaml
jjb/vtn/vtn-patch-test.yaml
jjb/vtn/vtn.yaml
jjb/yang-push/yang-push.yaml
jjb/yangide/yangide.yaml
jjb/yangtools/yangtools-csit-system.yaml
jjb/yangtools/yangtools.yaml
scripts/branch_cut/branch_cut.awk
scripts/branch_cut/branch_cutter.sh

index 276288d11fe84f136a8eaa4d9c9f0c3e4f4db9b1..40057f03b9e2b3d31dc6dc648b157731515628ef 100644 (file)
@@ -351,16 +351,11 @@ need to use the `jenkins-jobs` executable to translate a set of jobs into
 their XML descriptions and upload them to the sandbox Jenkins server.
 
 We document `installing <Installing Jenkins Job Builder_>`_ `jenkins-jobs`
-below. We also provide
-a `pre-built Docker image <jjb-docker_>`_ with `jenkins-jobs` already installed.
+below.
 
 Installing Jenkins Job Builder
 ------------------------------
 
-For users who aren't already experienced with Docker or otherwise don't want
-to use our `pre-built JJB Docker image <jjb-docker_>`_, installing JJB into a
-virtual environment is an equally good option.
-
 We recommend using `pip <Installing JJB using pip_>`_ to assist with JJB
 installs, but we
 also document `installing from a git repository manually
@@ -532,30 +527,6 @@ To validate that JJB was successfully installed you can run this command:
 
     (jjb)$ jenkins-jobs --version
 
-JJB Docker Image
-----------------
-
-`Docker <docker-docs_>`_ is an open platform used to create virtualized Linux containers
-for shipping self-contained applications. Docker leverages LinuX Containers
-\(LXC\) running on the same operating system as the host machine, whereas a
-traditional VM runs an operating system over the host.
-
-.. code-block:: bash
-
-    docker pull zxiiro/jjb-docker
-    docker run --rm -v ${PWD}:/jjb jjb-docker
-
-This `Dockerfile <jjb-dockerfile_>`_ created the
-`zxiiro/jjb-docker image <jjb-docker_>`_.
-By default it will run:
-
-.. code-block:: bash
-
-    jenkins-jobs test .
-
-You'll need to use the `-v/--volume=[]` parameter to mount a directory
-containing your YAML files, as well as a configured `jenkins.ini` file if you
-wish to upload your jobs to the `Jenkins Sandbox`_.
 
 Jenkins Job Templates
 ---------------------
@@ -911,38 +882,7 @@ details, including console output.
 Make changes to your JJB configuration, re-test, re-push and re-run until
 your job is ready.
 
-Docker Method
-^^^^^^^^^^^^^
-
-If `using Docker <JJB Docker image_>`_:
-
-.. code-block:: bash
-
-    # To test
-    docker run --rm -v ${PWD}:/jjb zxiiro/jjb-docker
-
-.. important::
-
-    When pushing with `jenkins-jobs`, a log message with
-    the number of jobs you're pushing will be issued, typically to stdout.
-    **If the number is greater than 1** (or the number of jobs you passed to
-    the command to push) then you are pushing too many jobs and should **`ctrl+c`
-    to cancel the upload**. Else you will flood the system with jobs.
-
-    .. code-block:: bash
-
-          INFO:jenkins_jobs.builder:Number of jobs generated:  1
-
-    **Failing to provide the final `<job-name>` param will push all jobs!**
-
-    .. code-block:: bash
-
-        # To upload jobs to the sandbox
-        # Please ensure that you include a configured jenkins.ini in your volume mount
-        # Making sure not to push more jobs than expected, ctrl+c to abort
-        docker run --rm -v ${PWD}:/jjb zxiiro/jjb-docker jenkins-jobs --conf jenkins.ini update . openflowplugin-csit-periodic-1node-cds-longevity-only-master
 
-.. _docker-docs: https://www.docker.com/whatisdocker/
 .. _example-jenkins.ini: https://git.opendaylight.org/gerrit/gitweb?p=releng/builder.git;a=blob;f=jenkins.ini.example
 .. _integration-test-wiki: https://wiki.opendaylight.org/view/Integration/Test
 .. _jenkins-master: https://jenkins.opendaylight.org/releng
@@ -950,8 +890,6 @@ If `using Docker <JJB Docker image_>`_:
 .. _jenkins-sandbox-login: https://jenkins.opendaylight.org/sandbox/login
 .. _jenkins.ini: http://docs.openstack.org/infra/jenkins-job-builder/execution.html#configuration-file
 .. _jjb-autoupdate-project.py: https://git.opendaylight.org/gerrit/gitweb?p=releng/builder.git;a=blob;f=scripts/jjb-autoupdate-project.py
-.. _jjb-docker: https://hub.docker.com/r/zxiiro/jjb-docker/
-.. _jjb-dockerfile: https://github.com/zxiiro/jjb-docker/blob/master/Dockerfile
 .. _jjb-docs: http://ci.openstack.org/jenkins-job-builder/
 .. _jjb-init-project.py: https://git.opendaylight.org/gerrit/gitweb?p=releng/builder.git;a=blob;f=scripts/jjb-init-project.py
 .. _jjb-repo: https://github.com/openstack-infra/jenkins-job-builder
index 61074842ab8211cd8bbef39987116d8de0406de1..2daa45588d8fa67847b760666cd68d94546a7531 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index e4dfde64a00089a9aa8723910a82c6e71875d950..7c6dc48b9a0059454137f0af24a30e73b1311df3 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index c5d3acd66c6bc3e9e59ca900f27df91a8d0c0154..9ebb3c98588f1e8904a65ca6a3a74546640f1cdf 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
@@ -32,7 +35,7 @@
 
     tools_system_count: '1'
     tools_system_flavor: '4 GB General Purpose v1'
-    tools_system_image: 'CentOS 7 - docker - 20170609-0220'
+    tools_system_image: 'CentOS 7 - docker - 20170808-0528'
 
     # Robot custom options
     robot-options: ''
index 87d5a899d0ff298b94d05209fea08244108a175d..2a1569b293040d5163e6c4dc786cfdaf0088804a 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
@@ -31,4 +34,4 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
index b50d7b35b7f24f0a5bb76e39e5a709b7f49d3050..9f9560f80e91ff5faf185967f681fbad277e3db0 100644 (file)
@@ -9,9 +9,12 @@
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jdk: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jdk: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jdk: 'openjdk8'
index 5055e5657585af80841bf1de447d92f7daf28274..1cd045d9136c8b8fec400d3d44180899cdcbc3db 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: aaa-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'aaa'
+    project-name: 'aaa'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'aaa-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
+    archive-artifacts: ''
+
 - project:
     name: aaa-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'aaa'
     project-name: 'aaa'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index a09aedd89304a7b9cede498187178c6b13d29049..7aa1f894c4aa8d0f5501e8cd5d9d55907470e88b 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index a479271045a7dbaf1c2839e1908f56b00900a529..ef206e8df6746f6214d0161a179faeb253d830cf 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: alto-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'alto'
+    project-name: 'alto'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'alto-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'l2switch-merge-{stream}'
+    email-upstream: '[alto] [l2switch]'
+    archive-artifacts: ''
+
 - project:
     name: alto-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'alto'
     project-name: 'alto'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index cd862e853bfe33e51b596f4a104e74fedf331e8a..da93fc9707be11266e15837551a8220b4ac9c36b 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: atrium-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'atrium'
+    project-name: 'atrium'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'atrium-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[atrium]'
+    archive-artifacts: ''
+
 - project:
     name: atrium-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'atrium'
     project-name: 'atrium'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index d23761bf092badd6b6e1ad715be76e6f8380bb42..b868d9c868d46dbc73a8b544148ed95c4c818e80 100644 (file)
           # DO NOT fail the build if copying failed.
           exit 0
 
+- builder:
+    name: autorelease-generate-artifact-versions
+    # Generate versions.csv containing version of all mvn artifacts in this build.
+    builders:
+      - shell: |
+          #!/bin/bash
+          set -eu -o pipefail
+          ./scripts/generate-artifact-versions.sh
+          mkdir -p "$WORKSPACE/archives"
+          mv versions.csv "$WORKSPACE/archives"
+
 - builder:
     name: autorelease-generate-release-patches
     builders:
index 8929213281964101dcfaa32db2d8533ac69cd44d..624fb59b596e01a5a304f41b8c788e3d554a1e06 100644 (file)
@@ -8,13 +8,18 @@
       - 'autorelease-version-bump-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
 
+    # todo: After boron EOL remove next-release-tag and directy pass
+    # '{stream}' to autorelease-release-tag parameter
     stream:
-      - nitrogen:
-          # todo: After boron EOL remove next-release-tag and directy pass
-          # '{stream}' to autorelease-release-tag parameter
+      - oxygen:
           next-release-tag: '{stream}'
           branch: 'master'
           jdk: 'openjdk8'
+          integration-test: oxygen
+      - nitrogen:
+          next-release-tag: '{stream}'
+          branch: 'stable/nitrogen'
+          jdk: 'openjdk8'
           integration-test: nitrogen
       - carbon:
           next-release-tag: '{stream}'
index ee3bb89c275110aaea145ba77d8a8d6294b3941e..2076bf6710f9c922d74ba98af8be7e969605bcba 100644 (file)
@@ -75,6 +75,7 @@
           autorelease-settings: 'autorelease-settings'
           global-settings: 'odl-global-settings'
       - autorelease-generate-release-patches
+      - autorelease-generate-artifact-versions
       - autorelease-distribute-taglist
       - distribute-build-url:
           path: 'integration/distribution/$KARAF_ARTIFACT/src/main/assembly'
index 0a299a74b48533e7523e74121c031b5a938041ff..e12ed8529b61a572e9391dbc79a3a4cc535e8c31 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index bfb14343158132f73cf6ffa7f83802f006d095e4..c0fdcc41a51a231b71ce09b827d6880867f790dd 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 0fa804008a059deae31578ac40122cfe57cecd4c..da267c02d3b90137185037e4be65a9f3775e09c9 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index e33a0115349eb658e60ecb6ea03ced1ae4117c97..7f635b04690229fea09b1fcd5240ab02e5124aa0 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 28133cb0310af468a4b2128952af9ff6e74af3a7..bc3b76756ec66769cedc1c10f912bef76acea3c9 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 51f796855a68bdf179368240308f3cec78df19fc..f615b9628d7feb2f8a87dfb5595dcc8614b11aa9 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 379bb2a52bb36129b2bfb04295d153e7e02c742e..d96356f3fbaac85f2413487dd2b15ce7d341dfd3 100644 (file)
@@ -9,9 +9,12 @@
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jdk: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jdk: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jdk: 'openjdk8'
index d96da0c6b3e4ba8508e6c7bf28f694c24dbb2b94..8e5b708c003c373aa07b771d1a0e765024770d2d 100644 (file)
@@ -1,4 +1,36 @@
 ---
+- project:
+    name: bgpcep-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'bgpcep'
+    project-name: 'bgpcep'
+    build-node: centos7-java-builder-4c-8g
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'bgpcep-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: >
+        odlparent-merge-{stream},
+        yangtools-merge-{stream},
+        controller-merge-{stream},
+        mdsal-merge-{stream},
+        tcpmd5-merge-{stream}
+    email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
+    archive-artifacts: ''
+
 - project:
     name: bgpcep-nitrogen
     jobs:
@@ -12,7 +44,7 @@
     project: 'bgpcep'
     project-name: 'bgpcep'
     build-node: centos7-java-builder-4c-8g
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index bb57f39ea3d2869ca7f84fc8f24ea72bb073fe66..e2cb28fa4168210dcbbf07135e82d0fa48e9a0ae 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 8d20008b7aa64fed73d75cf87bad20d83f649fd8..c29d5a2d21209a50234cfe340586f252b46adf2d 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: bier-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'bier'
+    project-name: 'bier'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'bier-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[bier]'
+    archive-artifacts: ''
+
 - project:
     name: bier-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'bier'
     project-name: 'bier'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index dd8982ace72338cbdfa2b464d3ebe5caa8df07d0..3b2abf9526b1120950825a67c14c54796e01b1ea 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 11660d701c9d2b9ac5ae9a1fea9cd1d60d3929c4..1abc7a746ed45edba292159a63848b5bccf7f1ff 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: capwap-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'capwap'
+    project-name: 'capwap'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'capwap-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[capwap]'
+    archive-artifacts: ''
+
 - project:
     name: capwap-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'capwap'
     project-name: 'capwap'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index 9cee353f4883aed38a56cfba853be3903ae2e8d8..b3719192527972cc14f5753fcb92d9d61f063798 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: cardinal-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'cardinal'
+    project-name: 'cardinal'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'cardinal-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'
+    email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]'
+    archive-artifacts: ''
+
 - project:
     name: cardinal-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'cardinal'
     project-name: 'cardinal'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index 9393f90475471dfcc0a46bf0359959440848dc97..4e92323675b580a45b96152c2bfd92d51e54b5f1 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 2853aca36ea6a1eda53ece4bf6a1ccd1ef3af42b..70074f9017726d8d679cbc5ed8b95880909f5f92 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: centinel-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'centinel'
+    project-name: 'centinel'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'centinel-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[centinel]'
+    archive-artifacts: ''
+
 - project:
     name: centinel-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'centinel'
     project-name: 'centinel'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index b1ef2111f9e1c7271394033eb2f4ca0d71c7e9d9..e27b40fc6df64ad815f05b7533b94b82293bfb31 100644 (file)
           schedule: ''
 
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
@@ -38,7 +41,7 @@
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
           odl-ml2-driver-version: 'v2'
-          openstack_system_image: 'CentOS 7 - devstack-ocata - 20170606-0821'
+          openstack_system_image: 'CentOS 7 - devstack-ocata - 20170808-0528'
 
 
     create-initial-networks: 'True'
index c20bc7d9c142a4a9271f3510e62c56d021c46699..be499099bb963b28f310be83d8a0512ca2d2ba8e 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: coe-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    project: 'coe'
+    project-name: 'coe'
+    stream: oxygen
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'coe-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[coe] [odlparent] [yangtools] [controller]'
+    archive-artifacts: ''
+
 - project:
     name: coe-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     project: 'coe'
     project-name: 'coe'
     stream: nitrogen
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index 7ab56420f132f1ccbba27ec741361297a2d4f0ec..80a9cdbc098c06e58b8e2f9765e39b331844a9ce 100644 (file)
 
     # Project branches. Boron for actual testing, Beryllium for sanity.
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index c7812c37d6b28525a41c9f86a24fbd8ea8ceafeb..04bc7ebce8eaafc0d5c48209fd4b46c30a4838ad 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 40dc8c32ef55aef1f6e9e39cd86bc56bf32fd1a0..22536d91ce638f87a5fc808ed44a63a54afcb39a 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index cc5101f4aefb6fb33981ee768adf333474c2d1e4..203c29355d18ce29ca043efe962096f803619ddc 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 4c1b0afd0914a23ea6d12e4a80112d3fec1c18f3..2ae01632a5ab377eb5d2d5caa0fb800d9781a252 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 37172087c8756c58778cef469680b04451ee7c58..1a3a82aaf8fa436eba0d3bb1588d6317d9a7db04 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index bd0bbc154aed6a7df0fe8fe34c62a9dad300aaf1..e5921207841faba19df83b89ba263df21b03c31a 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 039c68410bf1d8ff5fc0bdec9a72df97d6d097f0..8dc65e547b120ca51773a832d31e26a57867e28d 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 123704450004694b6237319dfc3d3eb6c151ba17..d9f0a7b442a829776ad9ab0769d4a8ce1fe2a9c1 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 8dc7c6492da776da99950b7a7cf09c35ff835716..50c623523609fc73fdde01a65849870ca6dc46e5 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index ab43f6f7aaa43e8f1f296a1e0b733445551b812a..906fbfd76f951d57489f102e8656bd77f5e750ee 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 1d540ac7bc74fa1a2854e376f345fa8f1560c890..e3ce26442dc1f391d049f0498aab8e3f0a5bbec4 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 9556f44e820e1cf9f379781a0b89568d2ae6974e..5f7298626a38f2d2c20f9d06d48b53032058dbd1 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: controller-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'controller'
+    project-name: 'controller'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'controller-settings'
+    mvn-goals: 'clean install -Pintegrationtests,docs'
+    mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
+    email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
+    archive-artifacts: ''
+
 - project:
     name: controller-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'controller'
     project-name: 'controller'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index cd47f88a7a377633f52eb321e225dd80fd884346..e90d1c4380c3fa84eb1c9f24e35e8b0a34030644 100644 (file)
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: coretutorials-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'coretutorials'
+    project-name: 'coretutorials'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'coretutorials-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[coretutorials]'
+    archive-artifacts: ''
+
 - project:
     name: coretutorials-nitrogen
     jobs:
@@ -10,7 +35,7 @@
     stream: nitrogen
     project: 'coretutorials'
     project-name: 'coretutorials'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index 2330af7b7c285cb5ab7fbb894e4804ebd284b35f..01d90ecb296dc57f12722538159bd6d80017be45 100644 (file)
     # The functionality under test
     functionality: 'basic'
 
-    # Set trigger
-    trigger-jobs: '{project}-merge-{stream}'
-
     # Project branches
     stream:
-      - carbon:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
-          karaf-version: karaf3
-          # yamllint disable-line rule:line-length
-          bundle-url: 'https://jenkins.opendaylight.org/releng/view/daexim/job/daexim-merge-carbon/lastSuccessfulBuild/org.opendaylight.daexim$daexim-karaf/artifact/org.opendaylight.daexim/daexim-karaf/1.0.0-SNAPSHOT/daexim-karaf-1.0.0-SNAPSHOT.zip'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
 
     install:
       - only:
index 6fb143be4640119d18cb482204aa21b65de09eb5..d9db87ebdd95e24ae50419e65ebe4774e4fb55d0 100644 (file)
@@ -1,17 +1,17 @@
 ---
 - project:
-    name: daexim-carbon
+    name: daexim-oxygen
     jobs:
       - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     project: 'daexim'
     project-name: 'daexim'
-    stream: carbon
+    stream: oxygen
     branch: 'master'
-    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
       - mvn33:
           mvn-version: 'mvn33'
     mvn-settings: 'daexim-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
+    archive-artifacts: ''
+
+- project:
+    name: daexim-nitrogen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    project: 'daexim'
+    project-name: 'daexim'
+    stream: nitrogen
+    branch: 'stable/nitrogen'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'daexim-settings'
+    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
@@ -34,5 +60,5 @@
     project-name: 'daexim'
     branch: 'master'
     mvn-settings: 'daexim-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index a580e0e405876a3d87c53c5cbac262a0503bf6cf..c59eb3f1f168fc0f1322b98d1ab419b82ea11f41 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index cabdfe8da449ee2ce59f1d59e1b6fe69a2809d54..7fefaf3e4e49073bfcb3bff7b42a338f9f7cba7d 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: didm-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'didm'
+    project-name: 'didm'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'didm-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[didm]'
+    archive-artifacts: ''
+
 - project:
     name: didm-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'didm'
     project-name: 'didm'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index 4e8b6f9bca80cd446d45dffd0fd6bede4a51800d..e80f58cedfbc8ba99aa407a3e771f290160e10c7 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: dlux-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'dlux'
+    project-name: 'dlux'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'dlux-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream}'
+    email-upstream: '[dlux] [odlparent]'
+    archive-artifacts: ''
+
 - project:
     name: dlux-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'dlux'
     project-name: 'dlux'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index e475941b8294279aba3d5ab57eac48a67917a509..467c0815a47014828dcf3e5bbd94db86e08af03d 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 62d4258c0c4293def2fc336c55d6f57549167ca0..c80512cf34e7747d403b82d5552ec4457f59942e 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: dluxapps-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    project: 'dluxapps'
+    project-name: 'dluxapps'
+    stream: oxygen
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'dluxapps-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]'
+    archive-artifacts: ''
+
 - project:
     name: dluxapps-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     project: 'dluxapps'
     project-name: 'dluxapps'
     stream: nitrogen
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index aafbeb3b464841842d3ec053252752d131fb61d6..2609772dc2517cdcc1ae0494ede54a55fa083007 100644 (file)
@@ -7,8 +7,11 @@
       - '{project-name}-verify-tox-{stream}'
 
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
+          jdk: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
           jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
index f65d15ebb84c2777ffbf0cc9ee879e5e33e968ae..5c270437c2b1a3149bf12d98ae02c90b3051cc0d 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: eman-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'eman'
+    project-name: 'eman'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'eman-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[eman]'
+    archive-artifacts: ''
+
 - project:
     name: eman-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'eman'
     project-name: 'eman'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index 496fea3e5e8d8151a97b4bde4f693c0b2751310a..4097be1c57a0abef100b1f45f23f23ff1ac4f161 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: faas-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'faas'
+    project-name: 'faas'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'faas-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[faas]'
+    archive-artifacts: ''
+
 - project:
     name: faas-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'faas'
     project-name: 'faas'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index 5c2d89af4dfc5ffbc748d13c3819bea88ce85f39..305192f6645f018b4df5d9f97d756704d3c93fc7 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: federation-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-distribution-check-{stream}'
+
+    project: 'federation'
+    project-name: 'federation'
+    stream: oxygen
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'federation-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[federation] [odlparent] [yangtools] [controller]'
+    archive-artifacts: ''
+
 - project:
     name: federation-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     project: 'federation'
     project-name: 'federation'
     stream: nitrogen
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index 06597d2c0d79e896e129071d9356dcaca446b54c..e91c051e434e05cdd6f6eb396055511dc10466cb 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
@@ -38,7 +41,7 @@
 
     # Mininet configuration
     tools_system_count: 2
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
 
     # Features to install
     install-features: 'odl-genius-rest'
index a8dc7eb20e5272b416de930ce49cadac68f05aa5..d73f5f3ad88241418b2f02cfaaa6be0747ece39a 100644 (file)
@@ -9,9 +9,12 @@
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jdk: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jdk: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jdk: 'openjdk8'
index dfa79ebd600e9006825a3a2974eafeec805a7fa8..d777b6c0c4a5b26392ecf3f807291ae4dccf7671 100644 (file)
@@ -1,4 +1,35 @@
 ---
+- project:
+    name: genius-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'genius'
+    project-name: 'genius'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'genius-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: >
+        controller-merge-{stream},
+        yangtools-merge-{stream},
+        odlparent-merge-{stream},
+        openflowplugin-merge-{stream},
+        neutron-merge-{stream}
+    email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
+    archive-artifacts: ''
+
 - project:
     name: genius-nitrogen
     jobs:
@@ -11,7 +42,7 @@
     stream: nitrogen
     project: 'genius'
     project-name: 'genius'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index 6b428fce658eb7757595836ba370ce3a4c9f27e2..3bc42fc1c85e07107fae55ac69714a8b735cc9b8 100644 (file)
     functionality: 'openstack'
 
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
           install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
+          install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index ff93c2d798f925fa329308db297f6c28f3b03689..6b04d3415f63635399c52d19101c3592ec86c15c 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
@@ -32,7 +35,7 @@
 
     # 3 Ubuntu VMs in JCloud configuration
     tools_system_count: 3
-    tools_system_image: Ubuntu 14.04 - gbp - 20170706-1254
+    tools_system_image: Ubuntu 14.04 - gbp - 20170808-0524
 
     # Features to install
     install-features: 'odl-groupbasedpolicy-ofoverlay,odl-groupbasedpolicy-ui,odl-restconf-all'
index 29ab9460df2856ade65b7351090cd90bd76aff27..2442278ee45fcd3e95f86d53bcda90084af75ad1 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
@@ -33,7 +36,7 @@
 
     # 6 Ubuntu VMs in JCloud configuration
     tools_system_count: 6
-    tools_system_image: Ubuntu 14.04 - gbp - 20170706-1254
+    tools_system_image: Ubuntu 14.04 - gbp - 20170808-0524
 
     # Features to install
     install-features: >
index 407b8a4b39eec0388d43bd23e6289eae8958f1ed..680af62b3ac1a4321d51a82fc9198fb88e78d626 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index e818a669acded5446c419244acafde775b7325d9..690eb6ac11f6d403600b7cfc0f201500ef961796 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 20bb563e6964d1d49a505ccd67f2c47772edf211..c3c5fa3a2a2038836ef8f4fffb56cca793b93b7f 100644 (file)
@@ -1,4 +1,35 @@
 ---
+- project:
+    name: groupbasedpolicy-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'groupbasedpolicy'
+    project-name: 'groupbasedpolicy'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'groupbasedpolicy-settings'
+    mvn-goals: '-U clean install findbugs:findbugs'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: >
+        openflowjava-merge-{stream},
+        openflowplugin-merge-{stream},
+        neutron-merge-{stream},
+        sfc-merge-{stream},
+        ovsdb-merge-{stream}
+    email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
+    archive-artifacts: ''
+
 - project:
     name: groupbasedpolicy-nitrogen
     jobs:
@@ -11,7 +42,7 @@
     stream: nitrogen
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index 6ee1b10e1bcb42569e84e2e5e9b7e34a4c49ec6c..737576a13d1a183d0892f36e57da5453561da601 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: vbd-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'honeycomb/vbd'
+    project-name: 'vbd'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'honeycomb-vbd-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[vbd]'
+    archive-artifacts: ''
+
 - project:
     name: vbd-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'honeycomb/vbd'
     project-name: 'vbd'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index d6276a03d0637c6e8984b3f3533dd19a2baaaa6a..33d0894cf283436fde6b03453c77150ed752e202 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: infrautils-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'infrautils'
+    project-name: 'infrautils'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'infrautils-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream}'
+    email-upstream: '[infrautils] [odlparent]'
+    archive-artifacts: ''
+
 - project:
     name: infrautils-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'infrautils'
     project-name: 'infrautils'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index e596eabe38dec217228cf9f1a5f2b7811e80f54f..5deaf61e74624a2e9866bc33b2001a1e11717e34 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 12438dd18b62c390f19b8f903676431618a33b37..28ee18b4a63f1a06cf69a1c9049d3f98a9ff89a9 100644 (file)
@@ -51,6 +51,7 @@
           goals: |
               clean install dependency:tree -DoutputFile=dependency_tree.txt
               -Dstream={stream}
+              -Dsft.heap.max=4g
               {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx1024m -XX:MaxPermSize=256m'
       goals: >
           clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B
           -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+          -Dsft.heap.max=4g
           -Djenkins -Dmerge -Dstream={stream}
       maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
       settings: 'integration-settings'
index 0504f748a46941fc1deb0e71a5e8a848dadc0179..1dcfe42cb6d92caf5080e7e515f830f31b4eb4a6 100644 (file)
     jre: openjdk8
 
     stream:
-      - nitrogen:
+      - oxygen:
           branch: master
+      - nitrogen:
+          branch: stable/nitrogen
       - carbon:
           branch: stable/carbon
           karaf-version: karaf3
index edfd0d784d8a809194b3e558c884b5112bcead26..ded85ba208d09b7979df20c730a36b6fc7ee5d58 100644 (file)
 
     # CSIT Lists in releng-defaults.yaml
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
+          jdk: 'openjdk8'
+          csit-list: '{csit-list-oxygen}'
+          csit-sanity-list: '{csit-sanity-list-oxygen}'
+          csit-weekly-list: '{csit-weekly-list-oxygen}'
+          schedule-weekly: 'H 23 * * 6'
+          csit-high-frequency-list: ''
+          schedule-high-frequency: ''
+
+      - nitrogen:
+          branch: 'stable/nitrogen'
           jre: 'openjdk8'
           csit-list: '{csit-list-nitrogen}'
           csit-sanity-list: '{csit-sanity-list-nitrogen}'
@@ -51,7 +61,7 @@
           schedule-high-frequency: ''
 
     # tools system image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
 
 # Template: integration-csit-verify-1node-library
 # Goal: Verify changes in csit folder not covered by projects suite verify jobs (e.g. libraries or variables)
               clean install dependency:tree -DoutputFile=dependency_tree.txt
               -Pq
               -Dstream={stream}
+              -Dsft.heap.max=4g
               {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx3072m -Dmaven.compile.fork=true'
index 31c33e71bbea32dc627af5d61b369e03cee79ec4..9ec7e2a3cf0a6f1f273b5400b57d3ea47290ab78 100644 (file)
       # backward incompatible changes in test suites for Carbon
       # TODO: Create test suites for specific release before
       # Carbon if needed.
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index d3d41c8bb87961f1a8092e91c666443d652c9db4..526fd4efc72565fcfa43585ee9a28fa21c8e99d8 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: iotdm-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'iotdm'
+    project-name: 'iotdm'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'iotdm-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'aaa-merge-{stream}'
+    email-upstream: '[iotdm] [aaa]'
+    archive-artifacts: ''
+
 - project:
     name: iotdm-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'iotdm'
     project-name: 'iotdm'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index 07dabe4d7b0f97f77da7053b3bdbe5c80e16d0cf..72f16bdce6338f395a7644b431f74aa622ea4ad7 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
           karaf-version: karaf3
           # yamllint disable-line rule:line-length
           bundleurl: 'https://jenkins.opendaylight.org/releng/view/jsonrpc/job/jsonrpc-merge-nitrogen/lastSuccessfulBuild/org.opendaylight.jsonrpc$jsonrpc-karaf/artifact/org.opendaylight.jsonrpc/jsonrpc-karaf/1.1.0-SNAPSHOT/jsonrpc-karaf-1.1.0-SNAPSHOT.zip'
index 807e498377e3163ca96aa31a4efa65e98e3e3aec..96f5c13b49b774588dbf495b72ad21707b50556a 100644 (file)
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: jsonrpc-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    project: 'jsonrpc'
+    project-name: 'jsonrpc'
+    stream: oxygen
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'jsonrpc-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
+    email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
+    archive-artifacts: ''
+
 - project:
     name: jsonrpc-nitrogen
     jobs:
@@ -10,7 +35,7 @@
     project: 'jsonrpc'
     project-name: 'jsonrpc'
     stream: nitrogen
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index 65f36f3bd774356d4b0f36b4b292245b171573c8..a32ed257f958936e312c8554dcf169e265b4765b 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 09e1051e18c2aa181bd16cfa79b65b062fc0a868..d0ddf734d75f309fb0f37431e9c3944348fd5d13 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index f7c429d5cadd993a4a12392547cccd21a3fa9791..188af6995c97fbefe7d0fe8835bdca088173a09e 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index bc670259facd279970b68dea30bff26cb1c69556..ed3621fdeeebb7b7dd065384c56bba2bc53f2e54 100644 (file)
@@ -9,9 +9,12 @@
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jdk: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jdk: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jdk: 'openjdk8'
index fe0b389cc83d028e1b8991564a51f988aaf62c79..08824947339def512fdc6d4ed13c13342222b9a5 100644 (file)
@@ -1,4 +1,35 @@
 ---
+- project:
+    name: l2switch-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'l2switch'
+    project-name: 'l2switch'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'l2switch-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    dependencies: >
+        odlparent-merge-{stream},
+        yangtools-merge-{stream},
+        controller-merge-{stream},
+        openflowjava-merge-{stream},
+        openflowplugin-merge-{stream}
+    email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
+    archive-artifacts: ''
+
 - project:
     name: l2switch-nitrogen
     jobs:
@@ -11,7 +42,7 @@
     stream: nitrogen
     project: 'l2switch'
     project-name: 'l2switch'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index 9bc220f4a99f4592e60f00412fd3b23eae759bd8..f8312e2cee61c2b7b530a87a1c524e9e77c8f801 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
@@ -31,7 +34,7 @@
       - all:
           scope: 'all'
 
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
 
     # Features to install
     install-features: 'odl-lacp-ui'
index 11d839b92ede389de769da6bc24962e936f55e0c..a092116b30d0a39f3ec5e32c71c9b6543c3d54af 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: lacp-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'lacp'
+    project-name: 'lacp'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    mvn-settings: 'lacp-settings'
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
+    email-upstream: '[lacp] [openflowjava] [openflowplugin]'
+    archive-artifacts: ''
+
 - project:
     name: lacp-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'lacp'
     project-name: 'lacp'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index 7939eca4edf94233231e2fa91114e5fdf02f7e97..314909df00b4bf50d923a4d9b2f613befe008dc0 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 32e42cd963c4dfe0b0bb82962e5f811f1ac7f34a..2da03bc89140ec62e4cd011eb5e18b4a67aeaaf4 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index e4cbd7d62397bc04e33cc7dde5be38033569297e..5c26d2193115f793771acf67282382e234aebf35 100644 (file)
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: lispflowmapping-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'lispflowmapping'
+    project-name: 'lispflowmapping'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'lispflowmapping-settings'
+    mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
+    dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
+    email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
+    archive-artifacts: ''
+    build-node: centos7-java-builder-4c-8g
+
 - project:
     name: lispflowmapping-nitrogen
     jobs:
@@ -11,7 +38,7 @@
     stream: nitrogen
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index 22f9ea8745e556059bcbc959a8ccbf8a22bda268..3537169034c3d83775aef256a3fffa9a144ac104 100644 (file)
 
     # Project branches. Boron for actual testing, Beryllium for sanity.
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 1b81e02e2dced4175417a8ba12cc32dd9c49843f..4117adc4056406977bf15a146172c35d2b1df80d 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: mdsal-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'mdsal'
+    project-name: 'mdsal'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'mdsal-settings'
+    mvn-goals: '-Dmaven.compile.fork=true clean install -Dintegrationtests'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[mdsal] [odlparent] [yangtools]'
+    archive-artifacts: ''
+
 - project:
     name: mdsal-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'mdsal'
     project-name: 'mdsal'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index 8017793965e14c36e7d5c56298e728b7cc88ea03..a921b9506dcaffd961e0d9988e043cc76c53263a 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 534503296cd73d457a636c21a365a20f7a81a6e1..09fdb96569ffa6b5ecdd36c5fb76f388911183a8 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: messaging4transport-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'messaging4transport'
+    project-name: 'messaging4transport'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'messaging4transport-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[messaging4transport]'
+    archive-artifacts: ''
+
 - project:
     name: messaging4transport-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'messaging4transport'
     project-name: 'messaging4transport'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index cba91f67fa734c11b09a4eb5cf720f8d07bb7613..19e1713c24b005fa82b93f63439ed45fbdd699e8 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index e384dfc9955d14d92dd67791c3c49dc6e2d04471..4d0544f1ea83181d45a418ea085243a8a8dd85ba 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: natapp-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'natapp'
+    project-name: 'natapp'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'natapp-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'openflowplugin-merge-{stream}'
+    email-upstream: '[natapp] [openflowplugin]'
+    archive-artifacts: ''
+
 - project:
     name: natapp-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'natapp'
     project-name: 'natapp'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index 250277f1011f40192ce9592844e9b1a20088c032..2a57ab55f2b9adc1d531bcf12af8d89f0db0a9e1 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 82512d6cae3165815ae363a734c86d34fd877287..7a426cb9371e633d75f2ad8059be8379101b9bc9 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: nemo-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'nemo'
+    project-name: 'nemo'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'nemo-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[nemo]'
+    archive-artifacts: ''
+
 - project:
     name: nemo-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'nemo'
     project-name: 'nemo'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index f326bd0eb44bda13a8935655e9fc9f96de36ea45..8cab4579a13a203cb874bdd99c1489790ab488ec 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 46b1935368d8a0c7207192fd667e7119afb3334a..c2db31a0e8ac565d322d2892be64ba39a148e775 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 6bc1e94c1574624b0e86c6a448a7b1c6fce01fc8..6d932287f86c3c3f214d082f345b31e2a5097bd1 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 9dd954c55ffce14b6b8982b0a138d55d9de8a1a6..17beeaf95c3a7a4c4c1e8bf8b40022f758f812dd 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
@@ -27,7 +30,7 @@
           scope: 'only'
 
     # no mininet required
-    tools_system_image: Ubuntu 14.04 - gbp - 20170706-1254
+    tools_system_image: Ubuntu 14.04 - gbp - 20170808-0524
 
     # Features to install
     install-features: 'odl-netconf-callhome-ssh,odl-restconf'
index 0064cf71b6e1e0e66f2c3348de3e5a3e421b7712..c85887f5d0c709290e2fab739e0405cd23e50e1a 100644 (file)
@@ -9,9 +9,12 @@
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jdk: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jdk: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jdk: 'openjdk8'
index 7ea02b322b9f82c74f932ee3e7b2d074f8e92cab..a3837366928282159c41925cf2130f8046460968 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 0d18a02af8ee95503d21df43d94716b5f05d8e1e..baaf142194271f07aec4b3b21723ca7833abb065 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 0be04bad4f26839f41f19450a7f4daf14e6aae70..f34987c73595efda64c557794f53da9ceb11fe17 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: netconf-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'netconf'
+    project-name: 'netconf'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'netconf-settings'
+    mvn-goals: 'clean install -Pintegrationtests'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+    dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
+    archive-artifacts: ''
+
 - project:
     name: netconf-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'netconf'
     project-name: 'netconf'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index 365c36f639edb7df12cf09d4497b304fb0b6e1a1..f653dc9c7fb9cd9b89e290ed48c66df30fee4c6b 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index e65450797ed42f2b20c049aacaf034f24aaf891b..8f02f86dac1a6908316a94ea4f17c7daae09afe6 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: netide-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'netide'
+    project-name: 'netide'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'netide-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'openflowjava-merge-{stream}'
+    email-upstream: '[netide] [openflowjava]'
+    archive-artifacts: ''
+
 - project:
     name: netide-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'netide'
     project-name: 'netide'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index c9ec664e3008132a816160b97b1e2f1a00961520..83d25690b6fba07cbeef0e1d5d8eed5a43ffd37f 100644 (file)
       - upstream-transparent:
           schedule: ''
           sg-mode: 'transparent'
-      - upstream-stateful:
+      - gate-transparent:
           schedule: ''
-          sg-mode: 'stateful'
-      - upstream-learn:
-          schedule: ''
-          sg-mode: 'learn'
-      - gate-stateful:
-          schedule: ''
-          sg-mode: 'stateful'
+          sg-mode: 'transparent'
 
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
       - newton:
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170707-0359'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170808-0528'
       - newton-nodl-v2:
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
           odl-ml2-driver-version: 'v2'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170707-0359'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170808-0528'
 
     tools_system_count: 2
 
index 86b68e38d6c28014069f36c656cad1a2b77f0739..a2c8c6d345bc9a59b65f0b778be6b4ae905875da 100644 (file)
           testplan: '{project}-{topology}-tempest-openstack.txt'
 
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
       - newton:
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170707-0359'
-          openstack_system2_image: 'CentOS 7 - devstack-newton - 20170707-0359'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170808-0528'
+          openstack_system2_image: 'CentOS 7 - devstack-newton - 20170808-0528'
       - newton-nodl-v2:
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
           odl-ml2-driver-version: 'v2'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170707-0359'
-          openstack_system2_image: 'CentOS 7 - devstack-newton - 20170707-0359'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170808-0528'
+          openstack_system2_image: 'CentOS 7 - devstack-newton - 20170808-0528'
       - ocata:
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
           odl-ml2-driver-version: 'v2'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170707-0359'
-          openstack_system2_image: 'CentOS 7 - devstack-newton - 20170707-0359'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170808-0528'
+          openstack_system2_image: 'CentOS 7 - devstack-newton - 20170808-0528'
 
     security-group-mode: '{sg-mode}'
 
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
           odl-ml2-driver-version: 'v2'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170707-0359'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170808-0528'
 
     security-group-mode: 'stateful'
index 911e0eb0870ec2e78a0b4084a4f85bbee7855b6e..ab8f5c76294d12c747a0f12604f8fd2e86868647 100644 (file)
@@ -5,8 +5,11 @@
       - 'netvirt-daily-full-integration-{stream}'
 
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
+          jdk: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
           jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           OVS_VERSION: '{OVS_VERSION}'
           maven-version: '{maven-version}'
           stream: '{stream}'
-      - shell: !include-raw-escape: include-raw-setup-docker.sh
+      - shell: !include-raw-escape: setup-docker.sh
       - inject:
           properties-file: env.properties
       - run-netvirt-sfc-it:
           OVS_VERSION: '{OVS_VERSION}'
           maven-version: '{maven-version}'
           stream: '{stream}'
-      - shell: !include-raw-escape: include-raw-cleanup-docker.sh
+      - shell: !include-raw-escape: cleanup-docker.sh
 
 - job-template:
     name: 'netvirt-daily-full-integration-{stream}'
index 63b886589134340655e0ac62a652837df117fc95..4c29c7dcb93b2cc612d42fb646d2cf72405b3588 100644 (file)
       - newton:
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170707-0359'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170808-0528'
       - newton-nodl-v2:
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
           odl-ml2-driver-version: 'v2'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170707-0359'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170808-0528'
       - ocata:
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
           odl-ml2-driver-version: 'v2'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170707-0359'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170808-0528'
 
     public-bridge: 'br-ex'
index 3400ee73d66348832195280075e2a36db251471b..f2037e97607a100ae9fe33249dc9609a24bb904d 100644 (file)
@@ -9,9 +9,12 @@
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jdk: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jdk: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jdk: 'openjdk8'
index f74d3ce655ceac440799b281373b417ffd1909e6..d3d5e6583b4326f49360fdcc703b9ad25017d8a8 100644 (file)
@@ -1,4 +1,36 @@
 ---
+- project:
+    name: netvirt-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'netvirt'
+    project-name: 'netvirt'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'netvirt-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
+    dependencies: >
+        genius-merge-{stream},
+        neutron-merge-{stream},
+        openflowjava-merge-{stream},
+        openflowplugin-merge-{stream},
+        ovsdb-merge-{stream},
+        sfc-merge-{stream}
+    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
+    archive-artifacts: ''
+
 - project:
     name: netvirt-nitrogen
     jobs:
@@ -11,7 +43,7 @@
     stream: nitrogen
     project: 'netvirt'
     project-name: 'netvirt'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index 998e9780878d18eb5cff09da1590515623db5169..9c7e833c58f865de3fd14fb2fe61487b91f74211 100644 (file)
@@ -1,4 +1,31 @@
 ---
+- project:
+    name: neutron-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'neutron'
+    project-name: 'neutron'
+    build-timeout: 60
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'neutron-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
+    email-upstream: '[neutron] [odlparent] [aaa]'
+    archive-artifacts: ''
+
 - project:
     name: neutron-nitrogen
     jobs:
@@ -12,7 +39,7 @@
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 60
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index b2d166310d1b05c4a8eab29b7cca13ae6da7ae23..58a2909119be09d913112e1f4a145f2d6ca4f8ba 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: next-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'next'
+    project-name: 'next'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'next-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[next]'
+    archive-artifacts: ''
+
 - project:
     name: next-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'next'
     project-name: 'next'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index fffb923a4469a37bc135a7afd366683650b8f58c..b544579d68cd6af7de05ecb2490224d0f4945107 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 4f0378bb343be90e860dbb0163398c70f1d14eb5..318e6ab458227223f3282cd94f9504cbcd9d4650 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: nic-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'nic'
+    project-name: 'nic'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'nic-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}'
+    email-upstream: '[nic] [vtn] [groupbasedpolicy]'
+    archive-artifacts: ''
+
 - project:
     name: nic-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'nic'
     project-name: 'nic'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index c9a7d8fe783fc53f21ed18c53fa7790fe42129f3..c35fc9ed113119e9d0d1a31807edebc52e6859c7 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index ea00461e84903d2ff92f1b7a9c79499071be3acc..a78ea3e49514051cfa487f0711cb48123b520785 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 4d424e136347bf3dc4ccd7a59f0231eb025a94b1..e5a07d504f3530594c173cc2eef54c5fb317add1 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: ocpplugin-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'ocpplugin'
+    project-name: 'ocpplugin'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'ocpplugin-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]'
+    archive-artifacts: ''
+
 - project:
     name: ocpplugin-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'ocpplugin'
     project-name: 'ocpplugin'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index 32d435eda5236cb241336dfd5cd72c164f46be2c..34a0d95417b98a8321f14e1ead836630d9fe40ab 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 874b7483fc3ce501e9cd515274edcf27f80ecd96..51b2264d1ba3fc621349e6e9f235515b4be27079 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: of-config-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'of-config'
+    project-name: 'of-config'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'of-config-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: netconf-merge-{stream}'
+    email-upstream: '[of-config] [netconf]'
+    archive-artifacts: ''
+
 - project:
     name: of-config-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'of-config'
     project-name: 'of-config'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index 8775028260cf4ab89a39e49cceaa148b658929e1..c37c985946b651c1bfe3bcd5dfb132c448def8c4 100644 (file)
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: circuitsw-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'ofextensions/circuitsw'
+    project-name: 'circuitsw'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'ofextensions-circuitsw-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[circuitsw]'
+    archive-artifacts: ''
+
 - project:
     name: circuitsw-nitrogen
     jobs:
@@ -10,7 +35,7 @@
     stream: nitrogen
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index b989102598adb8651e2fc486a8b5b7b9eb843c11..8e41287af2fb15ad3125106263af02026f9be70d 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: openflowjava-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'openflowjava'
+    project-name: 'openflowjava'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'openflowjava-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]'
+    archive-artifacts: ''
+
 - project:
     name: openflowjava-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'openflowjava'
     project-name: 'openflowjava'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index 9b27972717083175621c8a0ba31398456ae5dc8a..78397321dbde1f5701a46341dd06c0ccbae0a9e0 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index c54e0892abfcac8f70788820d2128d2b8e6af25e..d872626d43e8f6f0fc3af93a1a7f5e8ad0da8aa6 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
@@ -32,7 +35,7 @@
 
     # Job images
     odl_system_flavor: '8 GB General Purpose v1'
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158'
 
     # Features to install
     install-features: >
index 2990ae18d4edb4f1be1ca2df305e9b19efe65afe..55644fe52110798fbd603a006115e8616fe14525 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
@@ -32,7 +35,7 @@
 
     # Job images
     odl_system_flavor: 8 GB General Purpose v1
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
 
     # Features to install
     install-features: >
index d3ca6366ac17d6ff6bd4b8f07ef0a04918e3f9fc..0cc02f67022632f88c4323224b6a67d61fa7eff4 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index de3e75387dda4c0862d038b9aa0cd33a600cec8f..f9aefb2cba9482aedf0f3919dede65774e84704c 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
@@ -37,4 +40,4 @@
     robot-options: '-v ODL_OF_PLUGIN:lithium'
 
     # mininet image
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158'
index 01bdaf4956fc92168baf64c5ce81288ce82203b4..dad2261abec9d2be899779162d1969dde02ee4ed 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
@@ -41,4 +44,4 @@
     robot-options: '-v flow_update_time:30s'
 
     # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
index 91a71543c5d8d57e532cabb0bd6d951458df2825..d6b5d045b0a2f6899c33d874351c78941da6b671 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
@@ -39,4 +42,4 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
index 04cbf8a2ac91b56c37d3e4b39191ffb866be54f5..237f0d7fd7fd071a5ad2386e0edb5b3ab4b714ab 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
@@ -39,7 +42,7 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
 
     # Plot Info
     01-plot-title: 'Maximum Links Full Mesh Topology'
index 3d7542c78a4d6fa7a48da54c84e93ae827580e17..173c6bad676b3168859c7a298bf4981567943692 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
@@ -40,7 +43,7 @@
     robot-options: '-v TEST_LENGTH:23h'
 
     # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
 
     # Trigger jobs (on saturday)
     schedule: 'H H * * 6'
index c6c53f17a44121c5607154bf84da8fc6f1888b62..c89469899b85a7fe5682b3f5e92d02d1e9a3f3a5 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
@@ -30,7 +33,7 @@
 
     # Job images
     odl_system_flavor: 8 GB General Purpose v1
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
 
     # Features to install
     install-features: >
index e6adcadd674424bb5997e942567a7fdf30bc340d..1611e41422a8126e9637ffbcd527a518a8615475 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
@@ -30,7 +33,7 @@
 
     # Job images
     odl_system_flavor: '8 GB General Purpose v1'
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158'
 
     # Features to install
     # yamllint disable-line rule:line-length
index 8d6f29461ab5c8b4d21d90c0652a689c907c2e10..cffae65d4c63ee9db8919b297c0858a7ee74a653 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
@@ -36,4 +39,4 @@
     robot-options: '-v SWITCHES:3'
 
     # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
index ed96fa8bf15597ebab17f3b2f918c64157902fec..2a617df4f5033680f0f3b2097db6a2e21a755c94 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 9bd657d8c7354bb141b309af53694cfe1f57a991..8e972b113820671444091b7c3510041c5a064eb6 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 17c1513db039d6887472857e2520cbc2f4545167..4d47c1f04ce4deb774f1f6338be0153026a0fe04 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
@@ -32,7 +35,7 @@
 
     # Job images
     odl_system_flavor: '8 GB General Purpose v1'
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest'
index 39872e910673863f4ace80a13bf4d6c53f226818..5259109a9eaadfaa2451743bd7a578347a427569 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
@@ -38,7 +41,7 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
 
     # Plot Info
     01-plot-title: 'Maximum Switches Linear Topology'
index f18598e874f9ac650fbd78e85d504f61fa52ed27..d1104aa11b78378b450ab514432a19c86b505c7b 100644 (file)
@@ -9,9 +9,12 @@
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jdk: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jdk: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jdk: 'openjdk8'
index dabeeec7abfa7fbab65d852e8077f3de60cab585..bcde0762391f0fa0560d61c98b79416421e50d81 100644 (file)
@@ -1,4 +1,34 @@
 ---
+- project:
+    name: openflowplugin-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'openflowplugin'
+    project-name: 'openflowplugin'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'openflowplugin-settings'
+    mvn-goals: 'clean install javadoc:aggregate'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: >
+        odlparent-merge-{stream},
+        yangtools-merge-{stream},
+        controller-merge-{stream},
+        openflowjava-merge-{stream}
+    email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
+    archive-artifacts: 'model/*/target/site/**'
+
 - project:
     name: openflowplugin-nitrogen
     jobs:
@@ -11,7 +41,7 @@
     stream: nitrogen
     project: 'openflowplugin'
     project-name: 'openflowplugin'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index f097117e0c16f41f6f94f3a8c2009b681e865624..c47747fbb54bb363186d16b6ddd544831eb18efd 100644 (file)
@@ -6,8 +6,11 @@
       - 'opflex-merge-{stream}'
 
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
+          jdk: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
           jdk: openjdk8
       - carbon:
           branch: 'stable/carbon'
index 33a4028dd9d9afd88697c8530a322e49e5e7e7c4..963228095cda3832b30d5d5936d45db318355d53 100644 (file)
@@ -7,7 +7,7 @@
       - 'opflex-openvswitch_tgz-{stream}'
 
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           libuv-build: v1
           libuv-scm: v2
           rapidjson-scm: v2
           openvswitch-build: v2
           openvswitch-scm: v2
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          libuv-build: v1
+          libuv-scm: v2
+          rapidjson-build: v1
+          rapidjson-scm: v2
+          openvswitch-build: v2
+          openvswitch-scm: v2
       - carbon:
           branch: 'stable/carbon'
           libuv-build: v1
index a101c014c0760671c7802d802e8a4e57860b0906..acedccb67ff8aedf031878669746fdefc817e457 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 48ff9f27e52f70e2cd9633044c0fcb70d2020410..32f8f7eb50e9c6e386880be5af7fff875b449b45 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index c5711b65f08d12dd55137aa42642c5caad196694..cffdcd9ca216162e7e44c8fde13dfe20c181085e 100644 (file)
@@ -5,8 +5,11 @@
       - 'ovsdb-daily-full-integration-{stream}'
 
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
+          jdk: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
           jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
@@ -80,7 +83,7 @@
     builders:
       - inject:
           properties-content: OVS_VERSION={OVS_VERSION}
-      - shell: !include-raw-escape: include-raw-setup-docker.sh
+      - shell: !include-raw-escape: setup-docker.sh
       - inject:
           properties-file: env.properties
       - run-southbound-it:
@@ -96,7 +99,7 @@
           OVS_VERSION: '{OVS_VERSION}'
           maven-version: '{maven-version}'
           stream: '{stream}'
-      - shell: !include-raw-escape: include-raw-cleanup-docker.sh
+      - shell: !include-raw-escape: cleanup-docker.sh
 
 - job-template:
     name: 'ovsdb-daily-full-integration-{stream}'
index a0534c36aa6dde04156793d9778b87c299ee18ae..8a907cd99db4543f7121aa795e7e19c888efc2de 100644 (file)
@@ -8,9 +8,12 @@
     project: 'ovsdb'
 
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jdk: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jdk: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jdk: 'openjdk8'
index f669024a6467ad00903f610462411fd6aa54fcb6..0fd1c418af72c5a85edf9ccff9f10d8873a5000d 100644 (file)
@@ -42,7 +42,7 @@
           name: 'ovsdb'
 
     builders:
-      - shell: !include-raw-escape: include-raw-setup-docker.sh
+      - shell: !include-raw-escape: setup-docker.sh
       - inject:
           properties-file: env.properties
       - shell: !include-raw-escape: include-setup-hwvtep-docker.sh
@@ -90,7 +90,7 @@
           settings-type: cfp
           global-settings: 'global-settings'
           global-settings-type: cfp
-      - shell: !include-raw-escape: include-raw-cleanup-docker.sh
+      - shell: !include-raw-escape: cleanup-docker.sh
       - jacoco-nojava-workaround
 
     publishers:
index 07b3cdad30f8a0ee0c89da7a66c6693cb71a0ec2..51e3eae9927ff508553c18d9d1017b6969ad1bc9 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: ovsdb-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'ovsdb'
+    project-name: 'ovsdb'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'ovsdb-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
+    archive-artifacts: ''
+
 - project:
     name: ovsdb-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'ovsdb'
     project-name: 'ovsdb'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index 488e148568f3357852b9117db2a5b8e8cc777aea..cd627056a9d5b1aa6b822412d2a9f37af0659932 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 91696da099e39fb009312c1cbc84a5fbd4f30650..5e39a9e867843ea91b03aa1cccaa4476360bfc06 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: packetcable-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'packetcable'
+    project-name: 'packetcable'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'packetcable-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[packetcable]'
+    archive-artifacts: ''
+
 - project:
     name: packetcable-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'packetcable'
     project-name: 'packetcable'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index 06ba70a8a7ab486253ff9c9dcc55e602d1f36d4c..9af91a42cdcc09c0e055a248f7907d2d81fad970 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: persistence-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'persistence'
+    project-name: 'persistence'
+    branch: 'master'
+    jdk: openjdk7
+    jdks:
+      - openjdk7
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'persistence-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[persistence]'
+    archive-artifacts: ''
+
 - project:
     name: persistence-nitrogen
     jobs:
@@ -10,7 +36,7 @@
     stream: nitrogen
     project: 'persistence'
     project-name: 'persistence'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk7
     jdks:
       - openjdk7
index a8d548b599de4adac4d5887ede76272c92c260d1..a69f1cdb2819adec92f356b74ff0f269f9dff3b7 100644 (file)
     stack-template: csit-2-instance-type.yaml
     docker_system_count: 1
     docker_system_flavor: 4 GB General Purpose v1
-    docker_system_image: CentOS 7 - docker - 20170609-0220
+    docker_system_image: CentOS 7 - docker - 20170808-0528
     odl_system_count: 1
     odl_system_flavor: 4 GB General Purpose v1
-    odl_system_image: CentOS 7 - java-builder - 20170707-0359
+    odl_system_image: CentOS 7 - java-builder - 20170807-2145
     openstack_system_count: 1
     openstack_system_flavor: 8 GB General Purpose v1
-    openstack_system_image: CentOS 7 - devstack - 20170609-0220
+    openstack_system_image: CentOS 7 - devstack - 20170808-0528
     openstack_system2_count: 0
     openstack_system2_flavor: 2 GB General Purpose v1
-    openstack_system2_image: CentOS 7 - devstack - 20170609-0220
+    openstack_system2_image: CentOS 7 - devstack - 20170808-0528
     tools_system_count: 1
     tools_system_flavor: 2 GB General Purpose v1
-    tools_system_image: Ubuntu 14.04 - mininet - 20170609-0220
+    tools_system_image: Ubuntu 14.04 - mininet - 20170808-0158
 
     # Default Robot framework options
     robot-options: ''
     # Manual CSIT job lists used by sanity or periodic in nature.
     csit-high-frequency-list-carbon: >
         netvirt-csit-1node-openstack-newton-nodl-v2-upstream-stateful-carbon
+    csit-sanity-list-oxygen: >
+        openflowplugin-csit-1node-sanity-only-oxygen
     csit-sanity-list-nitrogen: >
         openflowplugin-csit-1node-sanity-only-nitrogen
     csit-sanity-list-carbon: >
         openflowplugin-csit-1node-sanity-only-carbon
     csit-sanity-list-boron: >
         openflowplugin-csit-1node-sanity-only-boron
+    csit-weekly-list-oxygen: >
+        controller-csit-1node-notifications-longevity-only-oxygen,
+        controller-csit-3node-drb-partnheal-longevity-only-oxygen,
+        controller-csit-3node-drb-precedence-longevity-only-oxygen,
+        controller-csit-3node-ddb-expl-lead-movement-longevity-only-oxygen,
+        bgpcep-csit-3node-bgpclustering-longevity-only-oxygen,
+        distribution-deploy-oxygen,
+        distribution-offline-oxygen,
+        openflowplugin-csit-1node-periodic-longevity-only-oxygen
     csit-weekly-list-nitrogen: >
         controller-csit-1node-notifications-longevity-only-nitrogen,
         controller-csit-3node-drb-partnheal-longevity-only-nitrogen,
     # Auto Generated CSIT job lists used
     # in regular distribution test jobs
     # DO NOT EDIT NEXT LINES MANUALLY
+    csit-list-oxygen: >
+        aaa-csit-1node-authn-all-oxygen,
+        aaa-csit-1node-authn-only-oxygen,
+        aaa-csit-1node-idmlite-all-oxygen,
+        aaa-csit-1node-idmlite-only-oxygen,
+        aaa-csit-1node-keystone-all-oxygen,
+        aaa-csit-1node-keystone-only-oxygen,
+        aaa-csit-1node-tls-only-oxygen,
+        alto-csit-1node-setup-all-oxygen,
+        alto-csit-1node-setup-only-oxygen,
+        bgpcep-csit-1node-periodic-bgp-ingest-all-oxygen,
+        bgpcep-csit-1node-periodic-bgp-ingest-only-oxygen,
+        bgpcep-csit-1node-periodic-throughpcep-all-oxygen,
+        bgpcep-csit-1node-periodic-throughpcep-only-oxygen,
+        bgpcep-csit-1node-userfeatures-all-oxygen,
+        bgpcep-csit-1node-userfeatures-only-oxygen,
+        bgpcep-csit-3node-periodic-bgpclustering-all-oxygen,
+        bgpcep-csit-3node-periodic-bgpclustering-ha-only-oxygen,
+        bgpcep-csit-3node-periodic-bgpclustering-only-oxygen,
+        bier-csit-1node-basic-all-oxygen,
+        bier-csit-1node-basic-only-oxygen,
+        capwap-csit-1node-ac-all-oxygen,
+        capwap-csit-1node-ac-only-oxygen,
+        centinel-csit-1node-basic-all-oxygen,
+        centinel-csit-1node-basic-only-oxygen,
+        coe-csit-1node-openstack-ocata-kubernetes-oxygen,
+        coe-csit-3node-openstack-ocata-kubernetes-oxygen,
+        controller-csit-1node-akka1-all-oxygen,
+        controller-csit-1node-akka1-only-oxygen,
+        controller-csit-1node-periodic-benchmark-all-oxygen,
+        controller-csit-1node-periodic-benchmark-only-oxygen,
+        controller-csit-1node-rest-cars-perf-all-oxygen,
+        controller-csit-1node-rest-cars-perf-only-oxygen,
+        controller-csit-3node-clustering-all-oxygen,
+        controller-csit-3node-clustering-only-oxygen,
+        controller-csit-3node-periodic-benchmark-all-oxygen,
+        controller-csit-3node-periodic-benchmark-only-oxygen,
+        controller-csit-3node-rest-clust-cars-perf-only-oxygen,
+        didm-csit-1node-discovery-only-oxygen,
+        distribution-csit-1node-userfeatures-all-oxygen,
+        distribution-csit-1node-userfeatures-only-oxygen,
+        dluxapps-csit-1node-yangman-all-oxygen,
+        dluxapps-csit-1node-yangman-only-oxygen,
+        genius-csit-1node-upstream-all-oxygen,
+        genius-csit-1node-upstream-only-oxygen,
+        genius-csit-3node-upstream-all-oxygen,
+        genius-csit-3node-upstream-only-oxygen,
+        groupbasedpolicy-csit-1node-3-node-all-oxygen,
+        groupbasedpolicy-csit-1node-3-node-only-oxygen,
+        groupbasedpolicy-csit-1node-6node-all-oxygen,
+        groupbasedpolicy-csit-1node-6node-only-oxygen,
+        groupbasedpolicy-csit-1node-openstack-newton-openstack-oxygen,
+        groupbasedpolicy-csit-1node-sxp-only-oxygen,
+        groupbasedpolicy-csit-3node-clustering-all-oxygen,
+        groupbasedpolicy-csit-3node-clustering-only-oxygen,
+        iotdm-csit-1node-basic-all-oxygen,
+        iotdm-csit-1node-basic-only-oxygen,
+        l2switch-csit-1node-periodic-host-scalability-daily-only-oxygen,
+        l2switch-csit-1node-scalability-all-oxygen,
+        l2switch-csit-1node-scalability-only-oxygen,
+        l2switch-csit-1node-switch-all-oxygen,
+        l2switch-csit-1node-switch-only-oxygen,
+        lacp-csit-1node-lacp-all-oxygen,
+        lacp-csit-1node-lacp-only-oxygen,
+        lispflowmapping-csit-1node-msmr-all-oxygen,
+        lispflowmapping-csit-1node-msmr-only-oxygen,
+        lispflowmapping-csit-1node-performance-only-oxygen,
+        lispflowmapping-csit-3node-msmr-all-oxygen,
+        lispflowmapping-csit-3node-msmr-only-oxygen,
+        mdsal-csit-1node-periodic-bindingv1-only-oxygen,
+        messaging4transport-csit-1node-basic-all-oxygen,
+        messaging4transport-csit-1node-basic-only-oxygen,
+        natapp-csit-1node-basic-all-oxygen,
+        natapp-csit-1node-basic-only-oxygen,
+        nemo-csit-1node-engine-all-oxygen,
+        nemo-csit-1node-engine-only-oxygen,
+        netconf-csit-1node-callhome-only-oxygen,
+        netconf-csit-1node-periodic-scale-all-oxygen,
+        netconf-csit-1node-periodic-scale-only-oxygen,
+        netconf-csit-1node-userfeatures-all-oxygen,
+        netconf-csit-1node-userfeatures-only-oxygen,
+        netconf-csit-3node-cluster-stress-all-oxygen,
+        netconf-csit-3node-cluster-stress-only-oxygen,
+        netconf-csit-3node-clustering-all-oxygen,
+        netconf-csit-3node-clustering-only-oxygen,
+        netconf-csit-3node-periodic-clustering-scale-all-oxygen,
+        netconf-csit-3node-periodic-clustering-scale-only-oxygen,
+        netide-csit-1node-basic-all-oxygen,
+        netide-csit-1node-basic-only-oxygen,
+        netvirt-csit-1node-openstack-newton-nodl-v2-upstream-learn-oxygen,
+        netvirt-csit-1node-openstack-newton-nodl-v2-upstream-stateful-oxygen,
+        netvirt-csit-1node-openstack-newton-nodl-v2-upstream-stateful-snat-conntrack-oxygen,
+        netvirt-csit-1node-openstack-newton-nodl-v2-upstream-transparent-oxygen,
+        netvirt-csit-1node-openstack-newton-upstream-learn-oxygen,
+        netvirt-csit-1node-openstack-newton-upstream-stateful-oxygen,
+        netvirt-csit-1node-openstack-newton-upstream-stateful-snat-conntrack-oxygen,
+        netvirt-csit-1node-openstack-newton-upstream-transparent-oxygen,
+        netvirt-csit-1node-openstack-ocata-upstream-learn-oxygen,
+        netvirt-csit-1node-openstack-ocata-upstream-stateful-oxygen,
+        netvirt-csit-1node-openstack-ocata-upstream-stateful-snat-conntrack-oxygen,
+        netvirt-csit-1node-openstack-ocata-upstream-transparent-oxygen,
+        netvirt-csit-3node-openstack-newton-nodl-v2-upstream-learn-oxygen,
+        netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-oxygen,
+        netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-snat-conntrack-oxygen,
+        netvirt-csit-3node-openstack-newton-nodl-v2-upstream-transparent-oxygen,
+        netvirt-csit-3node-openstack-newton-upstream-learn-oxygen,
+        netvirt-csit-3node-openstack-newton-upstream-stateful-oxygen,
+        netvirt-csit-3node-openstack-newton-upstream-stateful-snat-conntrack-oxygen,
+        netvirt-csit-3node-openstack-newton-upstream-transparent-oxygen,
+        netvirt-csit-3node-openstack-ocata-upstream-learn-oxygen,
+        netvirt-csit-3node-openstack-ocata-upstream-stateful-oxygen,
+        netvirt-csit-3node-openstack-ocata-upstream-stateful-snat-conntrack-oxygen,
+        netvirt-csit-3node-openstack-ocata-upstream-transparent-oxygen,
+        netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-learn-oxygen,
+        netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-stateful-oxygen,
+        netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-transparent-oxygen,
+        netvirt-csit-hwvtep-1node-openstack-newton-upstream-learn-oxygen,
+        netvirt-csit-hwvtep-1node-openstack-newton-upstream-stateful-oxygen,
+        netvirt-csit-hwvtep-1node-openstack-newton-upstream-transparent-oxygen,
+        netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-learn-oxygen,
+        netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-stateful-oxygen,
+        netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-transparent-oxygen,
+        netvirt-csit-hwvtep-3node-openstack-newton-upstream-learn-oxygen,
+        netvirt-csit-hwvtep-3node-openstack-newton-upstream-stateful-oxygen,
+        netvirt-csit-hwvtep-3node-openstack-newton-upstream-transparent-oxygen,
+        nic-csit-1node-basic-all-oxygen,
+        nic-csit-1node-basic-only-oxygen,
+        ocpplugin-csit-1node-get-all-oxygen,
+        ocpplugin-csit-1node-get-only-oxygen,
+        ocpplugin-csit-1node-scalability-all-oxygen,
+        ocpplugin-csit-1node-scalability-only-oxygen,
+        of-config-csit-1node-basic-all-oxygen,
+        of-config-csit-1node-basic-only-oxygen,
+        openflowplugin-csit-1node-flow-services-all-oxygen,
+        openflowplugin-csit-1node-flow-services-frs-only-oxygen,
+        openflowplugin-csit-1node-flow-services-only-oxygen,
+        openflowplugin-csit-1node-periodic-bulkomatic-perf-daily-only-oxygen,
+        openflowplugin-csit-1node-periodic-cbench-daily-only-oxygen,
+        openflowplugin-csit-1node-periodic-link-scalability-daily-only-oxygen,
+        openflowplugin-csit-1node-periodic-restconf-perf-daily-only-oxygen,
+        openflowplugin-csit-1node-periodic-scale-stats-collection-daily-frs-only-oxygen,
+        openflowplugin-csit-1node-periodic-scale-stats-collection-daily-only-oxygen,
+        openflowplugin-csit-1node-periodic-sw-scalability-daily-only-oxygen,
+        openflowplugin-csit-1node-scalability-only-oxygen,
+        openflowplugin-csit-3node-clustering-only-oxygen,
+        openflowplugin-csit-3node-periodic-bulkomatic-clustering-daily-only-oxygen,
+        openflowplugin-csit-3node-periodic-bulkomatic-clustering-perf-daily-only-oxygen,
+        openflowplugin-csit-3node-periodic-restconf-clustering-perf-daily-only-oxygen,
+        ovsdb-csit-1node-upstream-southbound-all-oxygen,
+        ovsdb-csit-1node-upstream-southbound-only-oxygen,
+        ovsdb-csit-3node-upstream-clustering-only-oxygen,
+        packetcable-csit-1node-pcmm-all-oxygen,
+        packetcable-csit-1node-pcmm-only-oxygen,
+        sdninterfaceapp-csit-1node-basic-only-oxygen,
+        sfc-csit-3node-docker-full-deploy-all-oxygen,
+        sfc-csit-3node-docker-full-deploy-only-oxygen,
+        sfc-csit-3node-rest-basic-all-oxygen,
+        sfc-csit-3node-rest-basic-only-oxygen,
+        snmp-csit-1node-basic-all-oxygen,
+        snmp-csit-1node-basic-only-oxygen,
+        sxp-csit-1node-basic-all-oxygen,
+        sxp-csit-1node-basic-only-oxygen,
+        sxp-csit-1node-filtering-all-oxygen,
+        sxp-csit-1node-filtering-only-oxygen,
+        sxp-csit-1node-periodic-performance-all-oxygen,
+        sxp-csit-1node-periodic-performance-only-oxygen,
+        sxp-csit-1node-topology-all-oxygen,
+        sxp-csit-1node-topology-only-oxygen,
+        sxp-csit-3node-periodic-clustering-all-oxygen,
+        sxp-csit-3node-periodic-clustering-only-oxygen,
+        sxp-csit-3node-periodic-routing-all-oxygen,
+        sxp-csit-3node-periodic-routing-only-oxygen,
+        topoprocessing-csit-1node-topology-operations-all-oxygen,
+        topoprocessing-csit-1node-topology-operations-only-oxygen,
+        tsdr-csit-1node-cassandra-datastore-only-oxygen,
+        tsdr-csit-1node-elasticsearch-datastore-only-oxygen,
+        tsdr-csit-1node-hbase-datastore-all-oxygen,
+        tsdr-csit-1node-hbase-datastore-only-oxygen,
+        tsdr-csit-1node-hsqldb-datastore-all-oxygen,
+        tsdr-csit-1node-hsqldb-datastore-only-oxygen,
+        unimgr-csit-1node-basic-all-oxygen,
+        unimgr-csit-1node-basic-only-oxygen,
+        unimgr-csit-1node-legato-all-oxygen,
+        unimgr-csit-1node-legato-only-oxygen,
+        usc-csit-1node-channel-all-oxygen,
+        usc-csit-1node-channel-only-oxygen,
+        usc-csit-1node-tcp-all-oxygen,
+        usc-csit-1node-tcp-only-oxygen,
+        usecplugin-csit-1node-basic-all-oxygen,
+        usecplugin-csit-1node-basic-only-oxygen,
+        vtn-csit-1node-coordinator-only-oxygen,
+        vtn-csit-1node-manager-all-oxygen,
+        vtn-csit-1node-manager-only-oxygen,
+        vtn-csit-1node-openstack-newton-neutron-oxygen,
+        vtn-csit-3node-manager-all-oxygen,
+        vtn-csit-3node-manager-only-oxygen,
+        yangtools-csit-1node-periodic-system-only-oxygen
     csit-list-nitrogen: >
         aaa-csit-1node-authn-all-nitrogen,
         aaa-csit-1node-authn-only-nitrogen,
index 42e6d8aeea033a4c190c7041a73cbab9c0778fa7..69e6be6a9e45416d0448df84fdce509f65443f6f 100644 (file)
     builders:
       - shell: |
           git checkout -b auto-update-csit-jobs
+      - integration-list-jobs:
+          blacklist: '{csit-list-blacklist}'
+          search_string: "csit"
+          stream: "oxygen"
+          jobs-filename: "csit_jobs_oxygen.lst"
       - integration-list-jobs:
           blacklist: '{csit-list-blacklist}'
           search_string: "csit"
           search_string: "csit"
           stream: "boron"
           jobs-filename: "csit_jobs_boron.lst"
+      - integration-replace-block-text:
+          starting-regex: "'csit-list-oxygen: >'"
+          ending-regex: "'csit-list-nitrogen: >'"
+          file-with-changes-to-insert: "'csit_jobs_oxygen.lst'"
+          file-to-change: "'jjb/releng-defaults.yaml'"
       - integration-replace-block-text:
           starting-regex: "'csit-list-nitrogen: >'"
           ending-regex: "'csit-list-carbon: >'"
index 6dba248a18a224aaeffe83578ff20c1ec816eb8d..82e772c74fac727c3ca240c9db0f2e676bf9701d 100644 (file)
       - string:
           name: GERRIT_REFSPEC
           default: '{refspec}'
-          description: "GERRIT_REFSPEC parameter if not given by trigger"
+          description: |
+              Gerrit reference to checkout (ex: refs/heads/master,
+              refs/changes/48/61548/1 where 61548 is Gerrit change ID, 1 is
+              patch number and 48 is last two digits of change ID)
       - string:
           name: STACK_NAME
           default: '$SILO-$JOB_NAME-$BUILD_NUMBER'
               clean install dependency:tree
               -DoutputFile=dependency_tree.txt -s fake_remotes.xml
               -Pq
+              -Dsft.heap.max=4g
               -DskipTests=false
               {mvn-opts}
           java-opts:
index a846568d8cd92124ec9bdf406a80488733cdc0aa..46f5d75a666fe9cea014c253040c0b13d61620fd 100644 (file)
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: reservation-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'reservation'
+    project-name: 'reservation'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'reservation-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[reservation]'
+    archive-artifacts: ''
+
 - project:
     name: reservation-nitrogen
     jobs:
@@ -10,7 +35,7 @@
     stream: nitrogen
     project: 'reservation'
     project-name: 'reservation'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index 2afb1f5a93d0b1e34d0fab957480320d43a21fea..2e17d44f7b053f3c88471ac6ba878b803c6fb23d 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 19ffcc184aee9925379481f98a8a4a1940e33bc0..cd3dd21f2fd12129f0afe9c1583279e7a0cab48c 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: sdninterfaceapp-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'sdninterfaceapp'
+    project-name: 'sdninterfaceapp'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'sdninterfaceapp-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'bgpcep-merge-{stream}'
+    email-upstream: '[sdninterfaceapp] [bgpcep]'
+    archive-artifacts: ''
+
 - project:
     name: sdninterfaceapp-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index ba3ee12c03df8883ff440f28628edb67b67b1df2..6d086ea9287dc2454b1ffb5dd0937d87d0451c86 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 2575427cba9e081a59428f69f9c8dbbcc22a3e37..12edbb574cf6c1cf7f620fdceb00cf5b4714bc64 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index d52ce1081b89ee920652e6802c76a533368995ac..113dee043c5e6b2a0fe022e5926f30791b0ee85b 100644 (file)
@@ -9,9 +9,12 @@
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jdk: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jdk: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jdk: 'openjdk8'
index 55c44345176900522502737e0b01ef07d5c12328..c99296b7d32a449c5bd1b171ed02e5681f627e04 100644 (file)
@@ -7,8 +7,11 @@
     # stream:    release stream (eg. stable-boron or beryllium)
     # branch:    git branch (eg. stable/boron or master)
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
+          jdk: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
           jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
index 11aa8359b59b2ebc363ca71b423f8b080d6f8cb1..8d7e86ee357dfbc2c7826b5075d3f950022fb6ab 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: sfc-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'sfc'
+    project-name: 'sfc'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'sfc-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
+    email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
+    archive-artifacts: ''
+
 - project:
     name: sfc-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'sfc'
     project-name: 'sfc'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index 6a93f485ceda4c20bf301604f365e58d22545491..f0512522e0c95d36179e167b0fa52eea738c13e5 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: snbi-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'snbi'
+    project-name: 'snbi'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'snbi-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[snbi]'
+    archive-artifacts: ''
+
 - project:
     name: snbi-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'snbi'
     project-name: 'snbi'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index cf6c2e9a41c66675dab13741c1dbacaa93c35f4f..294350f69ab92a6108713866a10ac3a0921cfab2 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 0618c3b0bfb79d12a2ae72849131339171746886..ad735478677b92a7b006c9953d854bef8ab58346 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: snmp-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'snmp'
+    project-name: 'snmp'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'snmp-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream}'
+    email-upstream: '[snmp] [odlparent]'
+    archive-artifacts: ''
+
 - project:
     name: snmp-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'snmp'
     project-name: 'snmp'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index 2a0ff6b0bf26af7096062c6ce4b76c536d5b8824..b7984cadcebc7ff2a59e2e279959e0bd4ce04652 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: snmp4sdn-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'snmp4sdn'
+    project-name: 'snmp4sdn'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'snmp4sdn-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
+    archive-artifacts: ''
+
 - project:
     name: snmp4sdn-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index b674e0651299db13eacdbe7dc6c0872a7c7ba228..2d0877b36ce68128785b5bfb896625d0d190e31d 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index afd64a358f57fda459547ee870cd41d8a60c09e4..f89a2d4c63e97503e58873fc97a8ba79eaa3aa48 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index b651009edc36bc5e68be8ec9a8b59590b27cb780..b594da84ed39b50045f449e0bb899b61d736063a 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index ece9b88b2d872c0427051031aabe92a4be384310..b8d4c0b5cdf48d1d3dbb6ad04869765d943d2554 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 5b1b39e2b17eba78e316f9510e9d5d92ee4945be..d095e90c11bbfcf13f2764c9719963dd0a89b3f9 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 6448938d6fe38f8330657d6950d036722bb2c0ac..52da04d67c11cd0815f127950f5a966f18743965 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 7eef176c58e4d863722be9c921d6e2fb7ca5234b..7c1c0065cb1234fa7c94fcde958b635de94d5962 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: sxp-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'sxp'
+    project-name: 'sxp'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'sxp-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
+    archive-artifacts: ''
+
 - project:
     name: sxp-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'sxp'
     project-name: 'sxp'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index db349c98c3a3747b62e55ac07c3f15c66dc77325..e56ee94a292239af46984c313e1884454ec66a37 100644 (file)
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: systemmetrics-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    project: 'systemmetrics'
+    project-name: 'systemmetrics'
+    stream: oxygen
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'systemmetrics-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]'
+    archive-artifacts: ''
+
 - project:
     name: systemmetrics-nitrogen
     jobs:
@@ -10,7 +35,7 @@
     project: 'systemmetrics'
     project-name: 'systemmetrics'
     stream: nitrogen
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index 0485111cad0deee85c45f23020b468580b376e61..6fd28578953784f6598ec3170854dd284a711173 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 5bece5691d90cf671dc9689e32ac2995a73885f8..d68579b7cc9f0ea00ea99f3668ae1a61dabe3416 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: topoprocessing-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'topoprocessing'
+    project-name: 'topoprocessing'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'topoprocessing-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
+    archive-artifacts: ''
+
 - project:
     name: topoprocessing-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'topoprocessing'
     project-name: 'topoprocessing'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index b8fff6e13c4eb531db64ecc640821ba1cea05cbf..534cb4fee626e6f35d4d5647609d51f55f4e3767 100644 (file)
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: transportpce-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    project: 'transportpce'
+    project-name: 'transportpce'
+    stream: oxygen
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'transportpce-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[transportpce] [odlparent] [yangtools] [controller]'
+    archive-artifacts: ''
+
 - project:
     name: transportpce-nitrogen
     jobs:
@@ -10,7 +35,7 @@
     project: 'transportpce'
     project-name: 'transportpce'
     stream: nitrogen
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index ec117395302dca6be5636401cfbacc05540ff07f..282068fc61152de2d0acfd7778842a17f2d21593 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 674b57b3f7cc65fbfd1070ddc1d9e743d6c1ece8..efb1bfe5af270d04f4fd83c6c7249856481b1228 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 325c3420c966c569783219f947007a7dd6db8468..fd70cdcda101abfbb1f33cb2d1c8d2f4d2f448c8 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 7300d3a0d3383cbd2a801ce8dbffc9be06590cfb..30a587e4ba9b60a4ac2274d615e1b0687e5d5e5b 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 071a02602586b0f8fd1ae3bcbd14b8d8b5515b30..70637d4f91c5f58399dc921ba8ca8b55f69f22e3 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: tsdr-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'tsdr'
+    project-name: 'tsdr'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'tsdr-settings'
+    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[tsdr]'
+    archive-artifacts: ''
+
 - project:
     name: tsdr-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'tsdr'
     project-name: 'tsdr'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index 6fc975f3126d19209673cfbdfd5a3b6328b54c12..c86ca28794d2644876d5f8eb719628a602bfa52e 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: ttp-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'ttp'
+    project-name: 'ttp'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'ttp-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream}'
+    email-upstream: '[ttp] [odlparent]'
+    archive-artifacts: ''
+
 - project:
     name: ttp-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'ttp'
     project-name: 'ttp'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index e80aee0b93b11c3faf988f289b7a267e9db8b95c..438cc895672bfead3efe0ac740c931cbe5bbbb51 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 7bfbf4a8737cb65dbd1027f30cb1ffc47848021c..626627b24e1090adde60be9337f837ff1006a894 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
@@ -41,4 +44,4 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
index 8e10b9f26d215bb08ecbd6e773e4488ce19cb086..92d64761c6019fdbebdb7bd407a6eefa3cb10419 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: unimgr-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'unimgr'
+    project-name: 'unimgr'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'unimgr-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'ovsdb-merge-{stream}'
+    email-upstream: '[unimgr] [ovsdb]'
+    archive-artifacts: ''
+
 - project:
     name: unimgr-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'unimgr'
     project-name: 'unimgr'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index 8679bab957923e5acb9bb253d6e0df100c7a9ce4..bfb25dd190e00a864c4757bc7be44870261a83da 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index fab1687273627e2c331aea319ca519c64032795d..542cfb2cbc847b0d54fb9d941f803ffe426f5d22 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index f40cab97ac5497798e70a88a0858a0673a442c67..5d97ea7847ce182194c4ead8d0e3bfe2b68e5cf2 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: usc-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'usc'
+    project-name: 'usc'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'usc-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
+    email-upstream: '[usc] [controller] [yangtools] [odlparent]'
+    archive-artifacts: ''
+
 - project:
     name: usc-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'usc'
     project-name: 'usc'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index 3fbd3ebac12ed656e81d5110bdc3674339306b72..4e5b12f12f0f11c323133117da1b01e6b0aa581b 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index 0162b6e60878c9eac9b70dcdd0609971c9fa2ef5..adc56a605f50fe909c5ccf45a6458582e0a41735 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: usecplugin-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'usecplugin'
+    project-name: 'usecplugin'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'usecplugin-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'openflowplugin-merge-{stream}'
+    email-upstream: '[usecplugin] [openflowplugin]'
+    archive-artifacts: ''
+
 - project:
     name: usecplugin-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'usecplugin'
     project-name: 'usecplugin'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index f54f20f5df1484575c5e820c0ef05bf43b834d8c..7612002a67b7114f378cdaf0961ea75fda9c627c 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
@@ -37,4 +40,4 @@
     # Robot custom options
     robot-options: ''
 
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158'
index 5d187b80108fd4040b2919565c7f4f839a871f5c..14921027e172c840df721dab7b1ea4ed5bc8e5ef 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
           karaf-version: karaf3
-          tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
+          tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-          tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
+          tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
 
     install:
       - only:
index a40ff12f655497eaae5fd43fb78961c388fbdb57..96ad8e82ba8bc6b787c8ae7c87ef6eaf2b34fdf5 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
@@ -37,4 +40,4 @@
     # Robot custom options
     robot-options: ''
 
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
index 4e704d0aaa39db148ea36b2b2bbaba459dc27c83..a1c158bc38480ef8cd2d4d2bad21f9efd2a5963e 100644 (file)
     functionality: 'neutron'
 
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
@@ -36,7 +39,7 @@
       - newton:
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170707-0359'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170808-0528'
 
     schedule: ''
 
index 347fe2deb06bb834901b7d3edc85d5e3fe798bde..880b93cf7b3444a826fd23a89447ae7bd01b83fd 100644 (file)
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jdk: 'openjdk8'
           csit-list: >
              vtn-csit-1node-manager-only-{stream},
              vtn-csit-3node-manager-only-{stream}
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jdk: 'openjdk8'
+          csit-list: >
+             vtn-csit-1node-manager-only-{stream},
+             vtn-csit-3node-manager-only-{stream}
       - carbon:
           branch: 'stable/carbon'
           jdk: 'openjdk8'
index 645218ef6c246dc6f70ec66a8de7687730dd0c1a..c252dc565e7c66eaa9ab0d10fcd308695f9b93eb 100644 (file)
@@ -1,4 +1,34 @@
 ---
+- project:
+    name: vtn-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'vtn'
+    project-name: 'vtn'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'vtn-settings'
+    mvn-goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'neutron-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream}'
+    email-upstream: '[vtn] [neutron] [openflowplugin] [ovsdb]'
+
+    # Please do not archive maven sites!!!
+    # Maven sites are published to Nexus at:
+    # https://nexus.opendaylight.org/content/sites/site/
+    archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2'
+
 - project:
     name: vtn-nitrogen
     jobs:
@@ -11,7 +41,7 @@
     stream: nitrogen
     project: 'vtn'
     project-name: 'vtn'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index e4e8812d6f047a07f349e072b12cbbec530c80bc..df5023ddc93ed7201f7c87226e0c6d427682a851 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: yang-push-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'yang-push'
+    project-name: 'yang-push'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'yang-push-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[yang-push]'
+    archive-artifacts: ''
+
 - project:
     name: yang-push-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'yang-push'
     project-name: 'yang-push'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index b09ac1a5ab170c2d5f210af557df60ae4d6a011c..2ea909fd4142c9e1c743352eb55a2a65006816b1 100644 (file)
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: yangide-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'yangide'
+    project-name: 'yangide'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'yangide-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[yangide] [odlparent] [yangtools]'
+    archive-artifacts: ''
+
 - project:
     name: yangide-nitrogen
     jobs:
@@ -10,7 +35,7 @@
     stream: nitrogen
     project: 'yangide'
     project-name: 'yangide'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index bf59fe140b5ae9464297a5d07f219ed90cdb45bb..0b523d00222492cc4eac62c3c529467b65e1adce 100644 (file)
     # Project branches.
     stream:
       # The tested component was only introduced in Carbon.
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
index ded9544cce98a917200e41d0d0298842c8fba72d..5845a22d005b33197b685f28c7eaddd65cde0fa0 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: yangtools-oxygen
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: oxygen
+    project: 'yangtools'
+    project-name: 'yangtools'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'yangtools-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream}'
+    email-upstream: '[yangtools] [odlparent]'
+    archive-artifacts: ''
+
 - project:
     name: yangtools-nitrogen
     jobs:
@@ -11,7 +37,7 @@
     stream: nitrogen
     project: 'yangtools'
     project-name: 'yangtools'
-    branch: 'master'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
index 06a409b079b37b2dc90a65848061afddbc0a9398..b93b84bad0911c34a7f260d56d1dc87815053821 100755 (executable)
@@ -24,7 +24,7 @@ BEGIN {
     endpat = startpat                              # end pattern
     op = "^" ws "---" ws "$"                       # match files starts with "---"
 
-    next_release_tag            = "^" ws "next-release-tag: " curr_tag
+    next_release_tag            = "^" ws "next-release-tag: '{stream}'"
     master                      = "'master'"
     new_branch                  = "'stable/" new_release "'"
     curr_branch                 = "'stable/" curr_release "'"
@@ -39,20 +39,22 @@ BEGIN {
 
     # replace block for autorelease-projects
     #new_rel_yaml_tag           = "- " new_release ":";
-    next_rel_tag_new_yaml_tag   = "    next-release-tag: " new_tag;
+    next_rel_tag_new_yaml_tag   = "    next-release-tag: '{stream}'";
     #br_master_yaml_tag         = "    branch: 'master'";
     jdk_yaml_tag                = "    jdk: 'openjdk8'";
     intg_test_yaml_tag          = "    integration-test: " new_release;
     #curr_rel_yaml_tag          = "- " curr_release ":";
-    next_rel_tag_curr_yaml_tag  = "    next-release-tag: " curr_tag;
+    next_rel_tag_curr_yaml_tag  = "    next-release-tag: '{stream}'";
     #br_stable_curr_yaml_tag    = "    branch: 'stable/" curr_release "'";
 
     # search patterns
     smaster = "^" ws "- master:"
     sstream = "^" ws "stream:"
     srelease = "^" ws "- " curr_release ":"
+    snext_release_tag = "^" ws "next-release-tag:"
     #if (l ~ next_release_tag) { next_release_tag = 1; continue; }
     sbranch = "^" ws "branch: " master
+    sfunctionality = "^" ws "functionality:"
 
     debug = 0                                   # set to 1 to print debug info
     file_format = 2                             # project stream format
@@ -60,6 +62,7 @@ BEGIN {
     release_found = 0
     stream_found = 0
     nrt_found = 0
+    func_found = 0
 }
 
 {
@@ -155,16 +158,24 @@ function process_blk(bs, be, bn,   i, l) {
             l = firstblk[i]
             if (l ~ sstream) { stream_found = 1; }
             if (l ~ srelease) { release_found = 1; indent = substr(l, 1, index(l, "-")-1); continue; }
-            if (l ~ next_release_tag) { nrt_found = 1; continue; }
+            if (l ~ sfunctionality) { func_found = 1; }
+            if (l ~ snext_release_tag) { nrt_found = 1; }
             if (l ~ sbranch) {
                 # append lines
                 if (stream_found && release_found && !nrt_found) {
                     newblk[++nex3] = indent new_rel_yaml_tag;
                     newblk[++nex3] = indent br_master_yaml_tag;
-                    newblk[++nex3] = indent jre_yaml_tag;
+                    # set 'jdk' macro for patch-test jobs
+                    if (!func_found) {
+                        newblk[++nex3] = indent jdk_yaml_tag;
+                    } else {
+                        newblk[++nex3] = indent jre_yaml_tag;
+                    }
                     newblk[++nex3] = indent curr_rel_yaml_tag;
                     newblk[++nex3] = indent br_stable_curr_yaml_tag;
-                    stream_found = 0; release_found = 0;
+                    stream_found = 0;
+                    release_found = 0;
+                    func_found = 0;
                     continue;
                 }
                 if (stream_found && release_found && nrt_found) {
index 780b5a6ea1e73bb8fbbd618d8d916074bb8ca94c..9ee5dafd623d32e8fb3093c1ae816c2ecfb70cbe 100755 (executable)
 #
 ##############################################################################
 
-# List of files exclude
+# List of directories, files to exclude
 declare -a excludes=("releng-defaults.yaml"
-                     "releng-macros.yaml")
+                     "releng-macros.yaml"
+                     "global-jjb"
+                     "lf-infra"
+                     "-macros.yaml"
+                     "validate-autorelease"
+                     "opflex-dependencies.yaml")
 
 TEMP="/tmp/tmp.yaml"
 mod=0
 count=0
 
 function usage {
-    echo "Usage: $(basename $0) options (-n [next release]) (-c [current release]) (-p [previous release]) -h for help";
-    exit 1;
+    echo "Usage: $(basename $0) options (-c [current release]) (-n [next release]) (-p [previous release]) -h for help";
+    echo "example:"
+    echo "branch_cutter.sh -n oxygen -c nitrogen -p carbon"
+    exit 0;
 }
 
 if ( ! getopts ":n:c:p:h" opt ); then
@@ -54,20 +61,20 @@ done
 
 echo "Start Branch Cutting:"
 
-while IFS="" read -r y; do
+while IFS="" read -r file; do
     found=0
-    for f in "${excludes[@]}"; do
-        if [[ $y =~ $f && $found -eq 0 ]]; then
+    for exclude in "${excludes[@]}"; do
+        if [[ $file =~ $exclude && $found -eq 0 ]]; then
             found=1
             break
         fi
     done
     if [[ $found -eq 1 ]]; then
-        echo "Ignore file $y found in excludes list"
+        echo "Ignore file $file found in excludes list"
     else
-        ./branch_cut.awk -v new_reltag="$new_reltag" -v curr_reltag="$curr_reltag" -v prev_reltag="$prev_reltag" "$y" > "$TEMP"
-        [[ ! -s "$TEMP" ]] && echo "$y: excluded"
-        [[ -s "$TEMP" ]] && mv "$TEMP" "$y" && echo "$y: Done" && let "mod++"
+        ./branch_cut.awk -v new_reltag="$new_reltag" -v curr_reltag="$curr_reltag" -v prev_reltag="$prev_reltag" "$file" > "$TEMP"
+        [[ ! -s "$TEMP" ]] && echo "$file: excluded"
+        [[ -s "$TEMP" ]] && mv "$TEMP" "$file" && echo "$file: Done" && let "mod++"
         let "count++"
     fi
 done < <(find ../../jjb -name "*.yaml")