From: Anil Belur Date: Mon, 14 Aug 2017 22:38:52 +0000 (+0000) Subject: Merge "Generate versions.csv for autorelease builds" X-Git-Tag: release/nitrogen~164 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=26c20ade21e2629099602ca890b9a67f2b9a2586;hp=7e652f76119aa04d92e5e01d42dd7f470a5f64ed;p=releng%2Fbuilder.git Merge "Generate versions.csv for autorelease builds" --- diff --git a/docs/cloud-images.rst b/docs/cloud-images.rst index e9abb6145..0079def0f 100644 --- a/docs/cloud-images.rst +++ b/docs/cloud-images.rst @@ -8,6 +8,7 @@ Following are the list of published images available to be used with Jenkins job * CentOS 7 - devstack - 20170221-1719 * CentOS 7 - devstack - 20170606-0344 * CentOS 7 - devstack - 20170609-0220 +* CentOS 7 - devstack - 20170808-0528 * CentOS 7 - devstack - newton - 20170117-0005 * CentOS 7 - devstack-mitaka - 20170130-0523 * CentOS 7 - devstack-mitaka - 20170314-2255 @@ -15,12 +16,15 @@ Following are the list of published images available to be used with Jenkins job * CentOS 7 - devstack-newton - 20170314-2256 * CentOS 7 - devstack-newton - 20170606-0427 * CentOS 7 - devstack-newton - 20170707-0359 +* CentOS 7 - devstack-newton - 20170808-0528 * CentOS 7 - devstack-ocata - 20170606-0821 * CentOS 7 - devstack-ocata - 20170609-0221 +* CentOS 7 - devstack-ocata - 20170808-0528 * CentOS 7 - docker - 20170117-0003 * CentOS 7 - docker - 20170120-1434 * CentOS 7 - docker - 20170607-0203 * CentOS 7 - docker - 20170609-0220 +* CentOS 7 - docker - 20170808-0528 * CentOS 7 - java-builder - 20170117-0004 * CentOS 7 - java-builder - 20170126-0058 * CentOS 7 - java-builder - 20170309-2355 @@ -29,18 +33,22 @@ Following are the list of published images available to be used with Jenkins job * CentOS 7 - java-builder - 20170607-1706 * CentOS 7 - java-builder - 20170609-0259 * CentOS 7 - java-builder - 20170707-0359 +* CentOS 7 - java-builder - 20170807-1102 +* CentOS 7 - java-builder - 20170807-2145 * CentOS 7 - robot - 20170117-0004 * CentOS 7 - robot - 20170210-1803 * CentOS 7 - robot - 20170328-0206 * CentOS 7 - robot - 20170526-2050 * CentOS 7 - robot - 20170606-0345 * CentOS 7 - robot - 20170609-0220 +* CentOS 7 - robot - 20170808-0529 * Fedora 23 (20151030 cloud) * Ubuntu 14.04 - devstack - 20170117-0004 * Ubuntu 14.04 - docker - 20170117-0003 * Ubuntu 14.04 - gbp - 20170117-0042 * Ubuntu 14.04 - gbp - 20170210-0536 * Ubuntu 14.04 - gbp - 20170706-1254 +* Ubuntu 14.04 - gbp - 20170808-0524 * Ubuntu 14.04 - mininet - 20170117-0003 * Ubuntu 14.04 - mininet - 20170130-0425 * Ubuntu 14.04 - mininet - 20170207-2055 @@ -48,6 +56,7 @@ Following are the list of published images available to be used with Jenkins job * Ubuntu 14.04 - mininet - 20170606-0534 * Ubuntu 14.04 - mininet - 20170609-0220 * Ubuntu 14.04 - mininet - 20170611-0950 +* Ubuntu 14.04 - mininet - 20170808-0158 * Ubuntu 14.04 - mininet-ovs-2.3 - 20170117-0004 * Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004 * Ubuntu 14.04 - mininet-ovs-23 - 20170130-0415 @@ -63,4 +72,5 @@ Following are the list of published images available to be used with Jenkins job * Ubuntu 16.04 - mininet-ovs-25 - 20170606-0534 * Ubuntu 16.04 - mininet-ovs-25 - 20170609-0221 * Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150 +* Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158 * Ubuntu 16.04 LTS (2016-05-03 cloudimg) diff --git a/docs/jenkins.rst b/docs/jenkins.rst index 276288d11..40057f03b 100644 --- a/docs/jenkins.rst +++ b/docs/jenkins.rst @@ -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 `_ `jenkins-jobs` -below. We also provide -a `pre-built Docker image `_ 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 `_, installing JJB into a -virtual environment is an equally good option. - We recommend 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 `_ 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 `_ created the -`zxiiro/jjb-docker image `_. -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 `_: - -.. 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 `` 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 `_: .. _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 diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index 61074842a..2daa45588 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/aaa/aaa-csit-idmlite.yaml b/jjb/aaa/aaa-csit-idmlite.yaml index e4dfde64a..7c6dc48b9 100644 --- a/jjb/aaa/aaa-csit-idmlite.yaml +++ b/jjb/aaa/aaa-csit-idmlite.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/aaa/aaa-csit-keystone.yaml b/jjb/aaa/aaa-csit-keystone.yaml index c5d3acd66..9ebb3c985 100644 --- a/jjb/aaa/aaa-csit-keystone.yaml +++ b/jjb/aaa/aaa-csit-keystone.yaml @@ -13,9 +13,12 @@ # 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: '' diff --git a/jjb/aaa/aaa-csit-tls.yaml b/jjb/aaa/aaa-csit-tls.yaml index 87d5a899d..2a1569b29 100644 --- a/jjb/aaa/aaa-csit-tls.yaml +++ b/jjb/aaa/aaa-csit-tls.yaml @@ -12,9 +12,12 @@ # 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 diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml index b50d7b35b..9f9560f80 100644 --- a/jjb/aaa/aaa-patch-test.yaml +++ b/jjb/aaa/aaa-patch-test.yaml @@ -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' diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index 5055e5657..1cd045d91 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -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 diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml index a09aedd89..7aa1f894c 100644 --- a/jjb/alto/alto-csit-setup.yaml +++ b/jjb/alto/alto-csit-setup.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml index a47927104..ef206e8df 100644 --- a/jjb/alto/alto.yaml +++ b/jjb/alto/alto.yaml @@ -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 diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml index cd862e853..da93fc970 100644 --- a/jjb/atrium/atrium.yaml +++ b/jjb/atrium/atrium.yaml @@ -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 diff --git a/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh b/jjb/autorelease/autorelease-get-integration-test-variables.sh similarity index 100% rename from jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh rename to jjb/autorelease/autorelease-get-integration-test-variables.sh diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml index 76a3bbebd..b868d9c86 100644 --- a/jjb/autorelease/autorelease-macros.yaml +++ b/jjb/autorelease/autorelease-macros.yaml @@ -63,7 +63,7 @@ - builder: name: autorelease-maven-deploy builders: - - shell: !include-raw: include-raw-autorelease-maven-deploy.sh + - shell: !include-raw: autorelease-maven-deploy.sh - builder: name: autorelease-maven-sources @@ -126,7 +126,7 @@ name: autorelease-get-integration-test-variables builders: - integration-set-variables - - shell: !include-raw: include-raw-autorelease-get-integration-test-variables.sh + - shell: !include-raw: autorelease-get-integration-test-variables.sh - inject: properties-file: variables.prop diff --git a/jjb/autorelease/include-raw-autorelease-maven-deploy.sh b/jjb/autorelease/autorelease-maven-deploy.sh similarity index 100% rename from jjb/autorelease/include-raw-autorelease-maven-deploy.sh rename to jjb/autorelease/autorelease-maven-deploy.sh diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index 6f1fe3be2..624fb59b5 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -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}' @@ -25,7 +30,7 @@ extra-mvn-opts: -Dskip.karaf4.featureTest=true - boron: # Only run once a week since Boron is in maintenance mode - cron: 'H H * * 0' + cron: 'H 12 * * 0' next-release-tag: Boron-SR5 branch: 'stable/boron' jdk: 'openjdk8' diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index 0dd622129..2076bf671 100644 --- a/jjb/autorelease/autorelease-templates.yaml +++ b/jjb/autorelease/autorelease-templates.yaml @@ -50,7 +50,7 @@ refspec: '$GERRIT_REFSPEC' branches: - '$GERRIT_BRANCH' - choosing-strategy: 'gerrit' + choosing-strategy: default skip-tag: true submodule: recursive: true diff --git a/jjb/autorelease/validate-autorelease-nitrogen.yaml b/jjb/autorelease/validate-autorelease-nitrogen.yaml index 4c3ffba85..b6efed418 100644 --- a/jjb/autorelease/validate-autorelease-nitrogen.yaml +++ b/jjb/autorelease/validate-autorelease-nitrogen.yaml @@ -27,6 +27,8 @@ project: dlux - dluxapps: project: dluxapps + - eman: + project: eman - genius: project: genius - groupbasedpolicy: @@ -43,12 +45,16 @@ project: lispflowmapping - mdsal: project: mdsal + - nemo: + project: nemo - netconf: project: netconf - netvirt: project: netvirt - neutron: project: neutron + - nic: + project: nic - ocpplugin: project: ocpplugin - of-config: @@ -73,6 +79,8 @@ project: ttp - unimgr: project: unimgr + - usc: + project: usc - vtn: project: vtn - yangtools: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index 0a299a74b..e12ed8529 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml index bfb143431..c0fdcc41a 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml index 0fa804008..da267c02d 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index e33a01153..7f635b046 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index 28133cb03..bc3b76756 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index 51f796855..f615b9628 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -15,9 +15,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml index 379bb2a52..d96356f3f 100644 --- a/jjb/bgpcep/bgpcep-patch-test.yaml +++ b/jjb/bgpcep/bgpcep-patch-test.yaml @@ -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' diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index d96da0c6b..8e5b708c0 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -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 diff --git a/jjb/bier/bier-csit-basic.yaml b/jjb/bier/bier-csit-basic.yaml index bb57f39ea..e2cb28fa4 100644 --- a/jjb/bier/bier-csit-basic.yaml +++ b/jjb/bier/bier-csit-basic.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml index 8d20008b7..c29d5a2d2 100644 --- a/jjb/bier/bier.yaml +++ b/jjb/bier/bier.yaml @@ -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 diff --git a/jjb/capwap/capwap-csit-ac.yaml b/jjb/capwap/capwap-csit-ac.yaml index dd8982ace..3b2abf952 100644 --- a/jjb/capwap/capwap-csit-ac.yaml +++ b/jjb/capwap/capwap-csit-ac.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml index 11660d701..1abc7a746 100644 --- a/jjb/capwap/capwap.yaml +++ b/jjb/capwap/capwap.yaml @@ -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 diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml index 9cee353f4..b37191925 100644 --- a/jjb/cardinal/cardinal.yaml +++ b/jjb/cardinal/cardinal.yaml @@ -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 diff --git a/jjb/centinel/centinel-csit-basic.yaml b/jjb/centinel/centinel-csit-basic.yaml index 9393f9047..4e9232367 100644 --- a/jjb/centinel/centinel-csit-basic.yaml +++ b/jjb/centinel/centinel-csit-basic.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml index 2853aca36..70074f901 100644 --- a/jjb/centinel/centinel.yaml +++ b/jjb/centinel/centinel.yaml @@ -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 diff --git a/jjb/coe/coe-csit-openstack.yaml b/jjb/coe/coe-csit-openstack.yaml index b1ef2111f..e27b40fc6 100644 --- a/jjb/coe/coe-csit-openstack.yaml +++ b/jjb/coe/coe-csit-openstack.yaml @@ -25,9 +25,12 @@ 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' diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml index c20bc7d9c..be499099b 100644 --- a/jjb/coe/coe.yaml +++ b/jjb/coe/coe.yaml @@ -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 diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml index 7ab56420f..80a9cdbc0 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -12,9 +12,12 @@ # 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' diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index c7812c37d..04bc7ebce 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml index 40dc8c32e..22536d91c 100644 --- a/jjb/controller/controller-csit-cs-chasing-leader.yaml +++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml index cc5101f4a..203c29355 100644 --- a/jjb/controller/controller-csit-cs-partnheal.yaml +++ b/jjb/controller/controller-csit-cs-partnheal.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml index 4c1b0afd0..2ae01632a 100644 --- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml +++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index 37172087c..1a3a82aaf 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index bd0bbc154..e59212078 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index 039c68410..8dc65e547 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml index 123704450..d9f0a7b44 100644 --- a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml index 8dc7c6492..50c623523 100644 --- a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index ab43f6f7a..906fbfd76 100644 --- a/jjb/controller/controller-csit-rest-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-cars-perf.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml index 1d540ac7b..e3ce26442 100644 --- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index 9556f44e8..5f7298626 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -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 diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml index cd47f88a7..e90d1c438 100644 --- a/jjb/coretutorials/coretutorials.yaml +++ b/jjb/coretutorials/coretutorials.yaml @@ -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 diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml index 2330af7b7..01d90ecb2 100644 --- a/jjb/daexim/daexim-csit-basic.yaml +++ b/jjb/daexim/daexim-csit-basic.yaml @@ -10,17 +10,14 @@ # 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: diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index 6fb143be4..d9db87ebd 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -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 @@ -19,7 +19,33 @@ - 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' diff --git a/jjb/didm/didm-csit-discovery.yaml b/jjb/didm/didm-csit-discovery.yaml index a580e0e40..c59eb3f1f 100644 --- a/jjb/didm/didm-csit-discovery.yaml +++ b/jjb/didm/didm-csit-discovery.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml index cabdfe8da..7fefaf3e4 100644 --- a/jjb/didm/didm.yaml +++ b/jjb/didm/didm.yaml @@ -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 diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml index 4e8b6f9bc..e80f58ced 100644 --- a/jjb/dlux/dlux.yaml +++ b/jjb/dlux/dlux.yaml @@ -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 diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml index e475941b8..467c0815a 100644 --- a/jjb/dluxapps/dluxapps-csit-yangman.yaml +++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml index 62d4258c0..c80512cf3 100644 --- a/jjb/dluxapps/dluxapps.yaml +++ b/jjb/dluxapps/dluxapps.yaml @@ -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 diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml index aafbeb3b4..2609772dc 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -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' diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml index f65d15ebb..5c270437c 100644 --- a/jjb/eman/eman.yaml +++ b/jjb/eman/eman.yaml @@ -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 diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml index 496fea3e5..4097be1c5 100644 --- a/jjb/faas/faas.yaml +++ b/jjb/faas/faas.yaml @@ -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 diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml index 5c2d89af4..305192f66 100644 --- a/jjb/federation/federation.yaml +++ b/jjb/federation/federation.yaml @@ -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 diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml index 06597d2c0..e91c051e4 100644 --- a/jjb/genius/genius-csit-genius.yaml +++ b/jjb/genius/genius-csit-genius.yaml @@ -18,9 +18,12 @@ # 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' diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml index a8dc7eb20..d73f5f3ad 100644 --- a/jjb/genius/genius-patch-test.yaml +++ b/jjb/genius/genius-patch-test.yaml @@ -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' diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index dfa79ebd6..d777b6c0c 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -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 diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml index 6b428fce6..3bc42fc1c 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml @@ -19,10 +19,14 @@ 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' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml index ff93c2d79..6b04d3415 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml @@ -12,9 +12,12 @@ # 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' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml index 29ab9460d..2442278ee 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml @@ -13,9 +13,12 @@ # 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: > diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml index 407b8a4b3..680af62b3 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml index e818a669a..690eb6ac1 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index 20bb563e6..c3c5fa3a2 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -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 diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml index 6ee1b10e1..737576a13 100644 --- a/jjb/honeycomb/vbd/vbd.yaml +++ b/jjb/honeycomb/vbd/vbd.yaml @@ -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 diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index d6276a03d..33d0894cf 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -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 diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml index e596eabe3..5deaf61e7 100644 --- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml +++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index 12438dd18..28ee18b4a 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -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' @@ -124,6 +125,7 @@ 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' diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml index 0504f748a..1dcfe42cb 100644 --- a/jjb/integration/distribution/distribution.yaml +++ b/jjb/integration/distribution/distribution.yaml @@ -24,8 +24,10 @@ jre: openjdk8 stream: - - nitrogen: + - oxygen: branch: master + - nitrogen: + branch: stable/nitrogen - carbon: branch: stable/carbon karaf-version: karaf3 diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index 69c978061..8ee7f0b50 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -271,6 +271,39 @@ - opendaylight-infra-stack: stack-template: 'csit-3-instance-type.yaml' +# Macro: integration-infra-stack-4-type +# Operation: Sets environment and then calls opendaylight-infra-stack to spin +# up csit lab using openstack-heat. +# Used by: {project}-csit-* job templates + +- builder: + name: integration-infra-stack-4-type + builders: + - integration-cleanup-workspace + - shell: | + #!/bin/bash + # Setup openstack envirnoment file for use by + # the opendaylight-infra-stack macro + cat > $WORKSPACE/opendaylight-infra-environment.yaml << EOF + parameters: + vm_0_count: {vm_0_count} + vm_0_flavor: {vm_0_flavor} + vm_0_image: {vm_0_image} + vm_1_count: {vm_1_count} + vm_1_flavor: {vm_1_flavor} + vm_1_image: {vm_1_image} + vm_2_count: {vm_2_count} + vm_2_flavor: {vm_2_flavor} + vm_2_image: {vm_2_image} + vm_3_count: {vm_3_count} + vm_3_flavor: {vm_3_flavor} + vm_3_image: {vm_3_image} + EOF + echo "Contents of opendaylight-infra-environment.yaml ..." + cat $WORKSPACE/opendaylight-infra-environment.yaml + - opendaylight-infra-stack: + stack-template: 'csit-4-instance-type.yaml' + # Macro: integration-get-slave-addresses # Operation: this macro gets the IP addresses of the dynamic vms # Used by: {project}-csit-* job templates diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index b62b09ccf..89e41122f 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -1129,16 +1129,20 @@ - timed: '{schedule}' builders: - - integration-infra-stack-3-type: + - integration-infra-stack-4-type: + stack-template: '{stack-template}' vm_0_count: '{odl_system_count}' vm_0_flavor: '{odl_system_flavor}' vm_0_image: '{odl_system_image}' vm_1_count: '{openstack_system_count}' vm_1_flavor: '{openstack_system_flavor}' vm_1_image: '{openstack_system_image}' - vm_2_count: '{tools_system_count}' - vm_2_flavor: '{tools_system_flavor}' - vm_2_image: '{tools_system_image}' + vm_2_count: '{openstack_system2_count}' + vm_2_flavor: '{openstack_system2_flavor}' + vm_2_image: '{openstack_system2_image}' + vm_3_count: '{tools_system_count}' + vm_3_flavor: '{tools_system_flavor}' + vm_3_image: '{tools_system_image}' - integration-install-robotframework - inject: properties-file: 'env.properties' diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 221fda6e1..ded85ba20 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -16,8 +16,18 @@ # 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) @@ -402,9 +412,10 @@ clean install dependency:tree -DoutputFile=dependency_tree.txt -Pq -Dstream={stream} + -Dsft.heap.max=4g {opendaylight-infra-mvn-opts} java-opts: - - '-Xmx7168m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' + - '-Xmx3072m -Dmaven.compile.fork=true' settings: integration-settings settings-type: cfp global-settings: global-settings diff --git a/jjb/iotdm/iotdm-csit-basic.yaml b/jjb/iotdm/iotdm-csit-basic.yaml index 31c33e71b..9ec7e2a3c 100644 --- a/jjb/iotdm/iotdm-csit-basic.yaml +++ b/jjb/iotdm/iotdm-csit-basic.yaml @@ -17,9 +17,12 @@ # 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' diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml index d3d41c8bb..526fd4efc 100644 --- a/jjb/iotdm/iotdm.yaml +++ b/jjb/iotdm/iotdm.yaml @@ -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 diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml index 07dabe4d7..72f16bdce 100644 --- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml +++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml @@ -15,9 +15,12 @@ # 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' diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 807e49837..96f5c13b4 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -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 diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml index 65f36f3bd..a32ed257f 100644 --- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml +++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml index 09e1051e1..d0ddf734d 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml index f7c429d5c..188af6995 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml index bc670259f..ed3621fde 100644 --- a/jjb/l2switch/l2switch-patch-test.yaml +++ b/jjb/l2switch/l2switch-patch-test.yaml @@ -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' diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index fe0b389cc..088249473 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -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 diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml index 9bc220f4a..f8312e2ce 100644 --- a/jjb/lacp/lacp-csit-lacp.yaml +++ b/jjb/lacp/lacp-csit-lacp.yaml @@ -13,9 +13,12 @@ # 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' diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml index 11d839b92..a092116b3 100644 --- a/jjb/lacp/lacp.yaml +++ b/jjb/lacp/lacp.yaml @@ -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 diff --git a/jjb/lf-infra/lf-infra-jobs.yaml b/jjb/lf-infra/lf-infra-jobs.yaml index 153d94762..f6a46f2bc 100644 --- a/jjb/lf-infra/lf-infra-jobs.yaml +++ b/jjb/lf-infra/lf-infra-jobs.yaml @@ -1,4 +1,17 @@ --- +- project: + name: lf-infra-ci-workshop + jobs: + - gerrit-tox-verify + + project-name: lf-infra-ci-workshop + project: releng/ci-workshop + build-node: centos7-java-builder-2c-4g + stream: master + + git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT + gerrit-server-name: LinuxFoundation + - project: name: lf-infra-common-packer jobs: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index 7939eca4e..314909df0 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml index 32e42cd96..2da03bc89 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index e4cbd7d62..5c26d2193 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -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 diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml index 22f9ea874..353716903 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -12,9 +12,12 @@ # 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' diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml index 1b81e02e2..4117adc40 100644 --- a/jjb/mdsal/mdsal.yaml +++ b/jjb/mdsal/mdsal.yaml @@ -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 diff --git a/jjb/messaging4transport/messaging4transport-csit-basic.yaml b/jjb/messaging4transport/messaging4transport-csit-basic.yaml index 801779396..a921b9506 100644 --- a/jjb/messaging4transport/messaging4transport-csit-basic.yaml +++ b/jjb/messaging4transport/messaging4transport-csit-basic.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml index 534503296..09fdb9656 100644 --- a/jjb/messaging4transport/messaging4transport.yaml +++ b/jjb/messaging4transport/messaging4transport.yaml @@ -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 diff --git a/jjb/natapp/natapp-csit-basic.yaml b/jjb/natapp/natapp-csit-basic.yaml index cba91f67f..19e1713c2 100644 --- a/jjb/natapp/natapp-csit-basic.yaml +++ b/jjb/natapp/natapp-csit-basic.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml index e384dfc99..4d0544f1e 100644 --- a/jjb/natapp/natapp.yaml +++ b/jjb/natapp/natapp.yaml @@ -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 diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml index 250277f10..2a57ab55f 100644 --- a/jjb/nemo/nemo-csit-engine.yaml +++ b/jjb/nemo/nemo-csit-engine.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index 82512d6ca..7a426cb93 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -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 diff --git a/jjb/netconf/netconf-cluster-stress.yaml b/jjb/netconf/netconf-cluster-stress.yaml index f326bd0eb..8cab4579a 100644 --- a/jjb/netconf/netconf-cluster-stress.yaml +++ b/jjb/netconf/netconf-cluster-stress.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml index 46b193536..c2db31a0e 100644 --- a/jjb/netconf/netconf-clustering-scale.yaml +++ b/jjb/netconf/netconf-clustering-scale.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml index 6bc1e94c1..6d932287f 100644 --- a/jjb/netconf/netconf-clustering.yaml +++ b/jjb/netconf/netconf-clustering.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml index 9dd954c55..17beeaf95 100644 --- a/jjb/netconf/netconf-csit-callhome.yaml +++ b/jjb/netconf/netconf-csit-callhome.yaml @@ -14,9 +14,12 @@ # 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' diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml index 0064cf71b..c85887f5d 100644 --- a/jjb/netconf/netconf-patch-test.yaml +++ b/jjb/netconf/netconf-patch-test.yaml @@ -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' diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index 7ea02b322..a38373669 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml index 0d18a02af..baaf14219 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -15,9 +15,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index 0be04bad4..f34987c73 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -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 diff --git a/jjb/netide/netide-csit-basic.yaml b/jjb/netide/netide-csit-basic.yaml index 365c36f63..f653dc9c7 100644 --- a/jjb/netide/netide-csit-basic.yaml +++ b/jjb/netide/netide-csit-basic.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml index e65450797..8f02f86da 100644 --- a/jjb/netide/netide.yaml +++ b/jjb/netide/netide.yaml @@ -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 diff --git a/jjb/netvirt/include-raw-cleanup-docker.sh b/jjb/netvirt/cleanup-docker.sh similarity index 100% rename from jjb/netvirt/include-raw-cleanup-docker.sh rename to jjb/netvirt/cleanup-docker.sh diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml index c9ec664e3..217ea2d9b 100644 --- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml @@ -37,9 +37,12 @@ sg-mode: 'stateful' stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' @@ -53,12 +56,12 @@ - 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 diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml index 86b68e38d..a2c8c6d34 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml @@ -55,9 +55,12 @@ 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' @@ -71,20 +74,20 @@ - 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}' @@ -123,6 +126,6 @@ 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' diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml index 911e0eb08..ab8f5c762 100644 --- a/jjb/netvirt/netvirt-full-integration.yaml +++ b/jjb/netvirt/netvirt-full-integration.yaml @@ -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' @@ -131,14 +134,14 @@ 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}' diff --git a/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml index 63b886589..4c29c7dcb 100644 --- a/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml @@ -40,16 +40,16 @@ - 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' diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml index 3400ee73d..f2037e976 100644 --- a/jjb/netvirt/netvirt-patch-test.yaml +++ b/jjb/netvirt/netvirt-patch-test.yaml @@ -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' diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml index f74d3ce65..d3d5e6583 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -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 diff --git a/jjb/netvirt/include-raw-openstack-ci.sh b/jjb/netvirt/openstack-ci.sh similarity index 100% rename from jjb/netvirt/include-raw-openstack-ci.sh rename to jjb/netvirt/openstack-ci.sh diff --git a/jjb/netvirt/include-raw-setup-docker.sh b/jjb/netvirt/setup-docker.sh similarity index 100% rename from jjb/netvirt/include-raw-setup-docker.sh rename to jjb/netvirt/setup-docker.sh diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index 998e97808..9c7e833c5 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -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 diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml index b2d166310..58a290911 100644 --- a/jjb/next/next.yaml +++ b/jjb/next/next.yaml @@ -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 diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml index fffb923a4..b544579d6 100644 --- a/jjb/nic/nic-csit-basic.yaml +++ b/jjb/nic/nic-csit-basic.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml index 4f0378bb3..318e6ab45 100644 --- a/jjb/nic/nic.yaml +++ b/jjb/nic/nic.yaml @@ -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 diff --git a/jjb/ocpplugin/ocpplugin-csit-basic.yaml b/jjb/ocpplugin/ocpplugin-csit-basic.yaml index c9a7d8fe7..c35fc9ed1 100644 --- a/jjb/ocpplugin/ocpplugin-csit-basic.yaml +++ b/jjb/ocpplugin/ocpplugin-csit-basic.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml index ea00461e8..a78ea3e49 100644 --- a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml +++ b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml index 4d424e136..e5a07d504 100644 --- a/jjb/ocpplugin/ocpplugin.yaml +++ b/jjb/ocpplugin/ocpplugin.yaml @@ -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 diff --git a/jjb/of-config/of-config-csit-basic.yaml b/jjb/of-config/of-config-csit-basic.yaml index 32d435eda..34a0d9541 100644 --- a/jjb/of-config/of-config-csit-basic.yaml +++ b/jjb/of-config/of-config-csit-basic.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml index 874b7483f..51b2264d1 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -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 diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml index 877502826..c37c98594 100644 --- a/jjb/ofextensions/circuitsw/circuitsw.yaml +++ b/jjb/ofextensions/circuitsw/circuitsw.yaml @@ -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 diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml index b98910259..8e41287af 100644 --- a/jjb/openflowjava/openflowjava.yaml +++ b/jjb/openflowjava/openflowjava.yaml @@ -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 diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml index 9b2797271..78397321d 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml index c54e0892a..d872626d4 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml @@ -14,9 +14,12 @@ # 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: > diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml index 2990ae18d..55644fe52 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml @@ -14,9 +14,12 @@ # 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: > diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml index d3ca6366a..0cc02f670 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index de3e75387..f9aefb2cb 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -14,9 +14,12 @@ # 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' diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml index 01bdaf495..dad2261ab 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml @@ -12,9 +12,12 @@ # 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 diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index 91a71543c..d6b5d045b 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -14,9 +14,12 @@ # 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 diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml index 04cbf8a2a..237f0d7fd 100644 --- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml @@ -12,9 +12,12 @@ # 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' diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 3d7542c78..173c6bad6 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -13,9 +13,12 @@ # 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' diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml index c6c53f17a..c89469899 100644 --- a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml @@ -12,9 +12,12 @@ # 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: > diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml index e6adcadd6..1611e4142 100644 --- a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml @@ -12,9 +12,12 @@ # 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 diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index 8d6f29461..cffae65d4 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -13,9 +13,12 @@ # 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 diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml index ed96fa8bf..2a617df4f 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-frs.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-frs.yaml index 9bd657d8c..8e972b113 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-frs.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-frs.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml index 17c1513db..4d47c1f04 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml @@ -14,9 +14,12 @@ # 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' diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml index 39872e910..5259109a9 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml @@ -12,9 +12,12 @@ # 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' diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index f18598e87..d1104aa11 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -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' diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index dabeeec7a..bcde07623 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -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 diff --git a/jjb/opflex/deps-inc-v1/include-raw-libuv_tgz-build.sh b/jjb/opflex/deps-inc-v1/libuv_tgz-build.sh similarity index 100% rename from jjb/opflex/deps-inc-v1/include-raw-libuv_tgz-build.sh rename to jjb/opflex/deps-inc-v1/libuv_tgz-build.sh diff --git a/jjb/opflex/deps-inc-v1/include-raw-openvswitch_tgz-build.sh b/jjb/opflex/deps-inc-v1/openvswitch_tgz-build.sh similarity index 100% rename from jjb/opflex/deps-inc-v1/include-raw-openvswitch_tgz-build.sh rename to jjb/opflex/deps-inc-v1/openvswitch_tgz-build.sh diff --git a/jjb/opflex/deps-inc-v1/include-raw-rapidjson_tgz-build.sh b/jjb/opflex/deps-inc-v1/rapidjson_tgz-build.sh similarity index 100% rename from jjb/opflex/deps-inc-v1/include-raw-rapidjson_tgz-build.sh rename to jjb/opflex/deps-inc-v1/rapidjson_tgz-build.sh diff --git a/jjb/opflex/deps-inc-v2/include-raw-openvswitch_tgz-build.sh b/jjb/opflex/deps-inc-v2/openvswitch_tgz-build.sh similarity index 100% rename from jjb/opflex/deps-inc-v2/include-raw-openvswitch_tgz-build.sh rename to jjb/opflex/deps-inc-v2/openvswitch_tgz-build.sh diff --git a/jjb/opflex/include-raw-opflex-build.sh b/jjb/opflex/opflex-build.sh similarity index 100% rename from jjb/opflex/include-raw-opflex-build.sh rename to jjb/opflex/opflex-build.sh diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml index fb2c643ce..c47747fbb 100644 --- a/jjb/opflex/opflex-custom.yaml +++ b/jjb/opflex/opflex-custom.yaml @@ -6,8 +6,11 @@ - 'opflex-merge-{stream}' stream: - - nitrogen: + - oxygen: branch: 'master' + jdk: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' jdk: openjdk8 - carbon: branch: 'stable/carbon' @@ -35,7 +38,7 @@ - copyartifact: project: opflex-openvswitch_tgz-{stream} flatten: true - - shell: !include-raw-escape: include-raw-opflex-build.sh + - shell: !include-raw-escape: opflex-build.sh - job-template: name: 'opflex-verify-{stream}' diff --git a/jjb/opflex/opflex-dependencies.yaml b/jjb/opflex/opflex-dependencies.yaml index 1b49ffd13..963228095 100644 --- a/jjb/opflex/opflex-dependencies.yaml +++ b/jjb/opflex/opflex-dependencies.yaml @@ -7,7 +7,7 @@ - 'opflex-openvswitch_tgz-{stream}' stream: - - nitrogen: + - oxygen: branch: 'master' libuv-build: v1 libuv-scm: v2 @@ -15,6 +15,14 @@ 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 @@ -91,7 +99,7 @@ - builder: name: 'builder-opflex-libuv-v1' builders: - - shell: !include-raw-escape: deps-inc-v1/include-raw-libuv_tgz-build.sh + - shell: !include-raw-escape: deps-inc-v1/libuv_tgz-build.sh - job-template: name: 'opflex-libuv_tgz-{stream}' @@ -124,7 +132,7 @@ - builder: name: 'builder-opflex-rapidjson-v1' builders: - - shell: !include-raw-escape: deps-inc-v1/include-raw-rapidjson_tgz-build.sh + - shell: !include-raw-escape: deps-inc-v1/rapidjson_tgz-build.sh - job-template: name: 'opflex-rapidjson_tgz-{stream}' @@ -157,12 +165,12 @@ - builder: name: 'builder-opflex-openvswitch-v1' builders: - - shell: !include-raw: deps-inc-v1/include-raw-openvswitch_tgz-build.sh + - shell: !include-raw: deps-inc-v1/openvswitch_tgz-build.sh - builder: name: 'builder-opflex-openvswitch-v2' builders: - - shell: !include-raw: deps-inc-v2/include-raw-openvswitch_tgz-build.sh + - shell: !include-raw: deps-inc-v2/openvswitch_tgz-build.sh - job-template: name: 'opflex-openvswitch_tgz-{stream}' diff --git a/jjb/ovsdb/include-raw-cleanup-docker.sh b/jjb/ovsdb/cleanup-docker.sh similarity index 100% rename from jjb/ovsdb/include-raw-cleanup-docker.sh rename to jjb/ovsdb/cleanup-docker.sh diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index a101c014c..acedccb67 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index 48ff9f27e..32f8f7eb5 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index c5711b65f..cffdcd9ca 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -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}' diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml index a0534c36a..8a907cd99 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -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' diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml index f669024a6..0fd1c418a 100644 --- a/jjb/ovsdb/ovsdb-sonar.yaml +++ b/jjb/ovsdb/ovsdb-sonar.yaml @@ -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: diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index 07b3cdad3..51e3eae99 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -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 diff --git a/jjb/ovsdb/include-raw-setup-docker.sh b/jjb/ovsdb/setup-docker.sh similarity index 100% rename from jjb/ovsdb/include-raw-setup-docker.sh rename to jjb/ovsdb/setup-docker.sh diff --git a/jjb/packaging/ansible.yaml b/jjb/packaging/ansible.yaml index 608c48790..ff961d9a0 100644 --- a/jjb/packaging/ansible.yaml +++ b/jjb/packaging/ansible.yaml @@ -44,7 +44,7 @@ build-timeout: '{build-timeout}' builders: - - shell: !include-raw: include-raw-test-ansible-rpm.sh + - shell: !include-raw: test-ansible-rpm.sh triggers: - timed: '@daily' @@ -87,7 +87,7 @@ build-timeout: '{build-timeout}' builders: - - shell: !include-raw: include-raw-test-ansible-deb.sh + - shell: !include-raw: test-ansible-deb.sh triggers: - timed: '@daily' diff --git a/jjb/packaging/include-raw-build-deb.sh b/jjb/packaging/build-deb.sh similarity index 100% rename from jjb/packaging/include-raw-build-deb.sh rename to jjb/packaging/build-deb.sh diff --git a/jjb/packaging/include-raw-build-rpm-snap.sh b/jjb/packaging/build-rpm-snap.sh similarity index 100% rename from jjb/packaging/include-raw-build-rpm-snap.sh rename to jjb/packaging/build-rpm-snap.sh diff --git a/jjb/packaging/include-raw-build-rpm.sh b/jjb/packaging/build-rpm.sh similarity index 100% rename from jjb/packaging/include-raw-build-rpm.sh rename to jjb/packaging/build-rpm.sh diff --git a/jjb/packaging/include-raw-test-ansible-deb.sh b/jjb/packaging/include-raw-test-ansible-deb.sh deleted file mode 100644 index 885139e8c..000000000 --- a/jjb/packaging/include-raw-test-ansible-deb.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -# Options: -# -x: Echo commands -# -e: Fail on errors -# -o pipefail: Fail on errors in scripts this calls, give stacktrace -set -ex -o pipefail - -# Install required packages -virtualenv deb_build -source deb_build/bin/activate -PYTHON="deb_build/bin/python" -$PYTHON -m pip install --upgrade pip - -# Wait for any background apt processes to finish -# There seems to be a backgroud apt process that locks /var/lib/dpkg/lock -# and causes our apt commands to fail. -while pgrep apt > /dev/null; do sleep 1; done - -# Install latest ansible -sudo apt-add-repository ppa:ansible/ansible -sudo apt-get update -sudo apt-get install -y ansible - -git clone https://github.com/dfarrell07/ansible-opendaylight.git -cd ansible-opendaylight -sudo ansible-galaxy install -r requirements.yml -sudo ansible-playbook -i "localhost," -c local examples/deb_repo_install_playbook.yml - -# Add more tests diff --git a/jjb/packaging/include-raw-test-ansible-rpm.sh b/jjb/packaging/include-raw-test-ansible-rpm.sh deleted file mode 100644 index b2c55a43d..000000000 --- a/jjb/packaging/include-raw-test-ansible-rpm.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -# Options: -# -x: Echo commands -# -e: Fail on errors -# -o pipefail: Fail on errors in scripts this calls, give stacktrace -set -ex -o pipefail - -# Install required packages -virtualenv rpm_build -source rpm_build/bin/activate -PYTHON="rpm_build/bin/python" -$PYTHON -m pip install --upgrade pip -sudo yum install -y ansible - -git clone https://github.com/dfarrell07/ansible-opendaylight.git -cd ansible-opendaylight -sudo ansible-galaxy install -r requirements.yml -sudo ansible-playbook -i "localhost," -c local examples/odl_6_testing_playbook.yml - -# Add more tests diff --git a/jjb/packaging/include-raw-install-deb.sh b/jjb/packaging/install-deb.sh similarity index 100% rename from jjb/packaging/include-raw-install-deb.sh rename to jjb/packaging/install-deb.sh diff --git a/jjb/packaging/include-raw-install-rpm.sh b/jjb/packaging/install-rpm.sh similarity index 100% rename from jjb/packaging/include-raw-install-rpm.sh rename to jjb/packaging/install-rpm.sh diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml index 575831939..5f4d1a0e8 100644 --- a/jjb/packaging/packaging.yaml +++ b/jjb/packaging/packaging.yaml @@ -73,7 +73,7 @@ build-timeout: '{build-timeout}' builders: - - shell: !include-raw: include-raw-build-rpm.sh + - shell: !include-raw: build-rpm.sh - lf-infra-deploy-maven-file: global-settings-file: 'global-settings' settings-file: 'packaging-settings' @@ -141,7 +141,7 @@ build-timeout: '{build-timeout}' builders: - - shell: !include-raw: include-raw-build-rpm-snap.sh + - shell: !include-raw: build-rpm-snap.sh - lf-infra-deploy-maven-file: global-settings-file: 'global-settings' settings-file: 'packaging-settings' @@ -186,15 +186,15 @@ build-timeout: '{build-timeout}' builders: - - shell: !include-raw: include-raw-install-rpm.sh - - shell: !include-raw: include-raw-start-odl.sh + - shell: !include-raw: install-rpm.sh + - shell: !include-raw: start-odl.sh - shell: | # Install expect to interact with Karaf shell sudo yum install -y expect # Install nmap to check status of ODL's SSH port sudo yum install -y nmap - shell: !include-raw: include-raw-test-karaf.expect - - shell: !include-raw: include-raw-stop-odl.sh + - shell: !include-raw: stop-odl.sh publishers: # TODO: Remove the archive publisher @@ -242,19 +242,19 @@ build-timeout: '{build-timeout}' builders: - - shell: !include-raw: include-raw-install-rpm.sh - - shell: !include-raw: include-raw-start-odl.sh + - shell: !include-raw: install-rpm.sh + - shell: !include-raw: start-odl.sh - shell: | # Install expect to interact with Karaf shell sudo yum install -y expect # Install nmap to check status of ODL's SSH port sudo yum install -y nmap - shell: !include-raw: include-raw-test-karaf.expect - - shell: !include-raw: include-raw-stop-odl.sh - - shell: !include-raw: include-raw-test-rpm-upgrade.sh - - shell: !include-raw: include-raw-start-odl.sh + - shell: !include-raw: stop-odl.sh + - shell: !include-raw: test-rpm-upgrade.sh + - shell: !include-raw: start-odl.sh - shell: !include-raw: include-raw-test-karaf.expect - - shell: !include-raw: include-raw-stop-odl.sh + - shell: !include-raw: stop-odl.sh publishers: - lf-infra-publish @@ -288,15 +288,15 @@ build-timeout: '{build-timeout}' builders: - - shell: !include-raw: include-raw-install-deb.sh - - shell: !include-raw: include-raw-start-odl.sh + - shell: !include-raw: install-deb.sh + - shell: !include-raw: start-odl.sh - shell: | # Install expect to interact with Karaf shell sudo apt-get install -y expect # Install nmap to check status of ODL's SSH port sudo apt-get install -y nmap - shell: !include-raw: include-raw-test-karaf.expect - - shell: !include-raw: include-raw-stop-odl.sh + - shell: !include-raw: stop-odl.sh publishers: - lf-infra-publish @@ -394,7 +394,7 @@ build-timeout: '{build-timeout}' builders: - - shell: !include-raw: include-raw-build-deb.sh + - shell: !include-raw: build-deb.sh - lf-infra-deploy-maven-file: global-settings-file: 'global-settings' settings-file: 'packaging-settings' diff --git a/jjb/packaging/puppet.yaml b/jjb/packaging/puppet.yaml index ece33cf8e..b92d46977 100644 --- a/jjb/packaging/puppet.yaml +++ b/jjb/packaging/puppet.yaml @@ -52,7 +52,7 @@ build-timeout: '{build-timeout}' builders: - - shell: !include-raw: include-raw-test-puppet.sh + - shell: !include-raw: test-puppet.sh triggers: - timed: '@weekly' @@ -99,7 +99,7 @@ build-timeout: '{build-timeout}' builders: - - shell: !include-raw: include-raw-test-puppet.sh + - shell: !include-raw: test-puppet.sh triggers: - timed: '@daily' diff --git a/jjb/packaging/include-raw-start-odl.sh b/jjb/packaging/start-odl.sh similarity index 100% rename from jjb/packaging/include-raw-start-odl.sh rename to jjb/packaging/start-odl.sh diff --git a/jjb/packaging/include-raw-stop-odl.sh b/jjb/packaging/stop-odl.sh similarity index 100% rename from jjb/packaging/include-raw-stop-odl.sh rename to jjb/packaging/stop-odl.sh diff --git a/jjb/packaging/test-ansible-deb.sh b/jjb/packaging/test-ansible-deb.sh new file mode 100644 index 000000000..912a91f52 --- /dev/null +++ b/jjb/packaging/test-ansible-deb.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +# Options: +# -x: Echo commands +# -e: Fail on errors +# -o pipefail: Fail on errors in scripts this calls, give stacktrace +set -ex -o pipefail + +# Install required packages +virtualenv deb_build +source deb_build/bin/activate +PYTHON="deb_build/bin/python" +$PYTHON -m pip install --upgrade pip + +# Wait for any background apt processes to finish +# There seems to be a backgroud apt process that locks /var/lib/dpkg/lock +# and causes our apt commands to fail. +while pgrep apt > /dev/null; do sleep 1; done + +# Install Ansible +sudo apt-add-repository ppa:ansible/ansible +sudo apt-get update +sudo apt-get install -y ansible + +# Install local version of ansible-opendaylight to path expected by Ansible. +# Could almost do this by setting ANSIBLE_ROLES_PATH=$WORKSPACE, but Ansible +# expects the dir containing the role to have the name of role. The JJB project +# is called "ansible", which causes the cloned repo name to not match the role +# name "opendaylight". So we need a cp/mv either way and this is simplest. +sudo cp -R $WORKSPACE/ansible /etc/ansible/roles/opendaylight + +# Install OpenDaylight via repo using example Ansible playbook +sudo ansible-playbook -i "localhost," -c local $WORKSPACE/ansible/examples/deb_repo_install_playbook.yml + +# Add more tests diff --git a/jjb/packaging/test-ansible-rpm.sh b/jjb/packaging/test-ansible-rpm.sh new file mode 100644 index 000000000..b1588a1cd --- /dev/null +++ b/jjb/packaging/test-ansible-rpm.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +# Options: +# -x: Echo commands +# -e: Fail on errors +# -o pipefail: Fail on errors in scripts this calls, give stacktrace +set -ex -o pipefail + +# Install required packages +virtualenv rpm_build +source rpm_build/bin/activate +PYTHON="rpm_build/bin/python" +$PYTHON -m pip install --upgrade pip + +# Install Ansible +sudo yum install -y ansible + +# Install local version of ansible-opendaylight to path expected by Ansible. +# Could almost do this by setting ANSIBLE_ROLES_PATH=$WORKSPACE, but Ansible +# expects the dir containing the role to have the name of role. The JJB project +# is called "ansible", which causes the cloned repo name to not match the role +# name "opendaylight". So we need a cp/mv either way and this is simplest. +sudo cp -R $WORKSPACE/ansible /etc/ansible/roles/opendaylight + +# Install OpenDaylight via repo using example Ansible playbook +sudo ansible-playbook -i "localhost," -c local $WORKSPACE/ansible/examples/odl_6_testing_playbook.yml + +# Add more tests diff --git a/jjb/packaging/include-raw-test-puppet.sh b/jjb/packaging/test-puppet.sh similarity index 92% rename from jjb/packaging/include-raw-test-puppet.sh rename to jjb/packaging/test-puppet.sh index 22b151176..492e7d934 100644 --- a/jjb/packaging/include-raw-test-puppet.sh +++ b/jjb/packaging/test-puppet.sh @@ -7,7 +7,7 @@ set -ex -o pipefail # Adapted from puppet-opendaylight/Vagrantfile -# https://github.com/dfarrell07/puppet-opendaylight/blob/master/Vagrantfile +# https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging/puppet-opendaylight.git;a=blob;f=Vagrantfile # Install system-wide dependencies # TODO: Are all of these still needed? diff --git a/jjb/packaging/include-raw-test-rpm-upgrade.sh b/jjb/packaging/test-rpm-upgrade.sh similarity index 100% rename from jjb/packaging/include-raw-test-rpm-upgrade.sh rename to jjb/packaging/test-rpm-upgrade.sh diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml index 488e14856..cd627056a 100644 --- a/jjb/packetcable/packetcable-csit-pcmm.yaml +++ b/jjb/packetcable/packetcable-csit-pcmm.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index 91696da09..5e39a9e86 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -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 diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml index 06ba70a8a..9af91a42c 100644 --- a/jjb/persistence/persistence.yaml +++ b/jjb/persistence/persistence.yaml @@ -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 diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml index a8d548b59..a69f1cdb2 100644 --- a/jjb/releng-defaults.yaml +++ b/jjb/releng-defaults.yaml @@ -58,19 +58,19 @@ 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: '' @@ -158,12 +158,23 @@ # 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, @@ -197,6 +208,203 @@ # 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, diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml index bf52f06ec..69e6be6a9 100644 --- a/jjb/releng-jobs.yaml +++ b/jjb/releng-jobs.yaml @@ -47,9 +47,10 @@ - docker - gbp - java-builder: - build-timeout: 60 + build-timeout: 75 - mininet - - mininet-ovs-2.5 + - mininet-ovs-2.5: + build-timeout: 60 - robot exclude: @@ -335,6 +336,11 @@ 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" @@ -350,6 +356,11 @@ 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: >'" diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml index 6dba248a1..82e772c74 100644 --- a/jjb/releng-macros.yaml +++ b/jjb/releng-macros.yaml @@ -41,7 +41,10 @@ - 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' @@ -641,6 +644,7 @@ clean install dependency:tree -DoutputFile=dependency_tree.txt -s fake_remotes.xml -Pq + -Dsft.heap.max=4g -DskipTests=false {mvn-opts} java-opts: diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml index a846568d8..46f5d75a6 100644 --- a/jjb/reservation/reservation.yaml +++ b/jjb/reservation/reservation.yaml @@ -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 diff --git a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml index 2afb1f5a9..2e17d44f7 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml index 19ffcc184..cd3dd21f2 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml @@ -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 diff --git a/jjb/sfc/sfc-csit-full-deploy.yaml b/jjb/sfc/sfc-csit-full-deploy.yaml index ba3ee12c0..6d086ea92 100644 --- a/jjb/sfc/sfc-csit-full-deploy.yaml +++ b/jjb/sfc/sfc-csit-full-deploy.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml index 2575427cb..12edbb574 100644 --- a/jjb/sfc/sfc-csit-rest-basic.yaml +++ b/jjb/sfc/sfc-csit-rest-basic.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/sfc/sfc-patch-test.yaml b/jjb/sfc/sfc-patch-test.yaml index d52ce1081..113dee043 100644 --- a/jjb/sfc/sfc-patch-test.yaml +++ b/jjb/sfc/sfc-patch-test.yaml @@ -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' diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml index 55c443451..c99296b7d 100644 --- a/jjb/sfc/sfc-python.yaml +++ b/jjb/sfc/sfc-python.yaml @@ -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' diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index 11aa8359b..8d7e86ee3 100644 --- a/jjb/sfc/sfc.yaml +++ b/jjb/sfc/sfc.yaml @@ -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 diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml index 6a93f485c..f0512522e 100644 --- a/jjb/snbi/snbi.yaml +++ b/jjb/snbi/snbi.yaml @@ -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 diff --git a/jjb/snmp/snmp-csit-basic.yaml b/jjb/snmp/snmp-csit-basic.yaml index cf6c2e9a4..294350f69 100644 --- a/jjb/snmp/snmp-csit-basic.yaml +++ b/jjb/snmp/snmp-csit-basic.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml index 0618c3b0b..ad7354786 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -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 diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml index 2a0ff6b0b..b7984cadc 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -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 diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml index b674e0651..2d0877b36 100644 --- a/jjb/sxp/sxp-csit-basic.yaml +++ b/jjb/sxp/sxp-csit-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/sxp/sxp-csit-cluster-routing.yaml b/jjb/sxp/sxp-csit-cluster-routing.yaml index afd64a358..f89a2d4c6 100644 --- a/jjb/sxp/sxp-csit-cluster-routing.yaml +++ b/jjb/sxp/sxp-csit-cluster-routing.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml index b651009ed..b594da84e 100644 --- a/jjb/sxp/sxp-csit-clustering.yaml +++ b/jjb/sxp/sxp-csit-clustering.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml index ece9b88b2..b8d4c0b5c 100644 --- a/jjb/sxp/sxp-csit-filtering.yaml +++ b/jjb/sxp/sxp-csit-filtering.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml index 5b1b39e2b..d095e90c1 100644 --- a/jjb/sxp/sxp-csit-performance.yaml +++ b/jjb/sxp/sxp-csit-performance.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index 6448938d6..52da04d67 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index 7eef176c5..7c1c0065c 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -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 diff --git a/jjb/systemmetrics/systemmetrics.yaml b/jjb/systemmetrics/systemmetrics.yaml index db349c98c..e56ee94a2 100644 --- a/jjb/systemmetrics/systemmetrics.yaml +++ b/jjb/systemmetrics/systemmetrics.yaml @@ -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 diff --git a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml index 0485111ca..6fd285789 100644 --- a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml +++ b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml index 5bece5691..d68579b7c 100644 --- a/jjb/topoprocessing/topoprocessing.yaml +++ b/jjb/topoprocessing/topoprocessing.yaml @@ -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 diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index b8fff6e13..534cb4fee 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -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 diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml index ec1173953..282068fc6 100644 --- a/jjb/tsdr/tsdr-csit-cassandra.yaml +++ b/jjb/tsdr/tsdr-csit-cassandra.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/tsdr/tsdr-csit-elasticsearch.yaml b/jjb/tsdr/tsdr-csit-elasticsearch.yaml index 674b57b3f..efb1bfe5a 100644 --- a/jjb/tsdr/tsdr-csit-elasticsearch.yaml +++ b/jjb/tsdr/tsdr-csit-elasticsearch.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml index 325c3420c..fd70cdcda 100644 --- a/jjb/tsdr/tsdr-csit-hbase.yaml +++ b/jjb/tsdr/tsdr-csit-hbase.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml index 7300d3a0d..30a587e4b 100644 --- a/jjb/tsdr/tsdr-csit-hsqldb.yaml +++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index 071a02602..70637d4f9 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -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 diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml index 6fc975f31..c86ca2879 100644 --- a/jjb/ttp/ttp.yaml +++ b/jjb/ttp/ttp.yaml @@ -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 diff --git a/jjb/unimgr/unimgr-csit-basic.yaml b/jjb/unimgr/unimgr-csit-basic.yaml index e80aee0b9..438cc8956 100644 --- a/jjb/unimgr/unimgr-csit-basic.yaml +++ b/jjb/unimgr/unimgr-csit-basic.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/unimgr/unimgr-csit-legato.yaml b/jjb/unimgr/unimgr-csit-legato.yaml index 7bfbf4a87..626627b24 100644 --- a/jjb/unimgr/unimgr-csit-legato.yaml +++ b/jjb/unimgr/unimgr-csit-legato.yaml @@ -13,9 +13,12 @@ # 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 diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml index 8e10b9f26..92d64761c 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -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 diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml index 8679bab95..bfb25dd19 100644 --- a/jjb/usc/usc-csit-channel.yaml +++ b/jjb/usc/usc-csit-channel.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml index fab168727..542cfb2cb 100644 --- a/jjb/usc/usc-csit-tcp.yaml +++ b/jjb/usc/usc-csit-tcp.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index f40cab97a..5d97ea784 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -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 diff --git a/jjb/usecplugin/usecplugin-csit-basic.yaml b/jjb/usecplugin/usecplugin-csit-basic.yaml index 3fbd3ebac..4e5b12f12 100644 --- a/jjb/usecplugin/usecplugin-csit-basic.yaml +++ b/jjb/usecplugin/usecplugin-csit-basic.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml index 0162b6e60..adc56a605 100644 --- a/jjb/usecplugin/usecplugin.yaml +++ b/jjb/usecplugin/usecplugin.yaml @@ -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 diff --git a/jjb/vtn/vtn-csit-3node-manager.yaml b/jjb/vtn/vtn-csit-3node-manager.yaml index f54f20f5d..7612002a6 100644 --- a/jjb/vtn/vtn-csit-3node-manager.yaml +++ b/jjb/vtn/vtn-csit-3node-manager.yaml @@ -13,9 +13,12 @@ # 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' diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml index 5d187b801..14921027e 100644 --- a/jjb/vtn/vtn-csit-coordinator.yaml +++ b/jjb/vtn/vtn-csit-coordinator.yaml @@ -13,19 +13,22 @@ # 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: diff --git a/jjb/vtn/vtn-csit-manager.yaml b/jjb/vtn/vtn-csit-manager.yaml index a40ff12f6..96ad8e82b 100644 --- a/jjb/vtn/vtn-csit-manager.yaml +++ b/jjb/vtn/vtn-csit-manager.yaml @@ -13,9 +13,12 @@ # 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 diff --git a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml index 4e704d0aa..a1c158bc3 100644 --- a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml +++ b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml @@ -20,9 +20,12 @@ 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: '' diff --git a/jjb/vtn/vtn-patch-test.yaml b/jjb/vtn/vtn-patch-test.yaml index 347fe2deb..880b93cf7 100644 --- a/jjb/vtn/vtn-patch-test.yaml +++ b/jjb/vtn/vtn-patch-test.yaml @@ -11,12 +11,18 @@ # 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' diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml index 645218ef6..c252dc565 100644 --- a/jjb/vtn/vtn.yaml +++ b/jjb/vtn/vtn.yaml @@ -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 diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml index e4e8812d6..df5023ddc 100644 --- a/jjb/yang-push/yang-push.yaml +++ b/jjb/yang-push/yang-push.yaml @@ -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 diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml index b09ac1a5a..2ea909fd4 100644 --- a/jjb/yangide/yangide.yaml +++ b/jjb/yangide/yangide.yaml @@ -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 diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml index bf59fe140..0b523d002 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -13,9 +13,12 @@ # 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' diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml index ded9544cc..5845a22d0 100644 --- a/jjb/yangtools/yangtools.yaml +++ b/jjb/yangtools/yangtools.yaml @@ -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 diff --git a/openstack-hot/csit-4-instance-type.yaml b/openstack-hot/csit-4-instance-type.yaml new file mode 100644 index 000000000..79de0db5a --- /dev/null +++ b/openstack-hot/csit-4-instance-type.yaml @@ -0,0 +1,118 @@ +--- +heat_template_version: 2016-04-08 + +parameters: + job_name: + type: string + description: Name of job running this template + silo: + type: string + description: Jenkins Silo job is running in (typically releng|sandbox) + vm_0_count: + type: number + description: Number of VMs for 1st VM type + vm_0_flavor: + type: string + default: 1 GB General Purpose v1 + description: Flavor to run instance on for 1st VM type + vm_0_image: + type: string + description: Image to run instance on for 1st VM type + vm_1_count: + type: number + description: Number of VMs for 2nd VM type + vm_1_flavor: + type: string + default: 1 GB General Purpose v1 + description: Flavor to run instance on for 2nd VM type + vm_1_image: + type: string + description: Image to run instance on for 2nd VM type + vm_2_count: + type: number + description: Number of VMs for 3rd VM type + vm_2_flavor: + type: string + default: 1 GB General Purpose v1 + description: Flavor to run instance on for 3rd VM type + vm_2_image: + type: string + vm_3_count: + type: number + description: Number of VMs for 3rd VM type + vm_3_flavor: + type: string + default: 1 GB General Purpose v1 + description: Flavor to run instance on for 3rd VM type + vm_3_image: + type: string + +resources: + vm_0_group: + type: "OS::Heat::ResourceGroup" + properties: + count: {get_param: vm_0_count} + resource_def: + type: generic-server.yaml + properties: + job_name: {get_param: job_name} + silo: {get_param: silo} + ssh_key: {get_param: silo} + index: "%index%" + vm_flavor: {get_param: vm_0_flavor} + vm_image: {get_param: vm_0_image} + + vm_1_group: + type: "OS::Heat::ResourceGroup" + properties: + count: {get_param: vm_1_count} + resource_def: + type: generic-server.yaml + properties: + job_name: {get_param: job_name} + silo: {get_param: silo} + ssh_key: {get_param: silo} + index: "%index%" + vm_flavor: {get_param: vm_1_flavor} + vm_image: {get_param: vm_1_image} + + vm_2_group: + type: "OS::Heat::ResourceGroup" + properties: + count: {get_param: vm_2_count} + resource_def: + type: generic-server.yaml + properties: + job_name: {get_param: job_name} + silo: {get_param: silo} + ssh_key: {get_param: silo} + index: "%index%" + vm_flavor: {get_param: vm_2_flavor} + vm_image: {get_param: vm_2_image} + vm_3_group: + type: "OS::Heat::ResourceGroup" + properties: + count: {get_param: vm_3_count} + resource_def: + type: generic-server.yaml + properties: + job_name: {get_param: job_name} + silo: {get_param: silo} + ssh_key: {get_param: silo} + index: "%index%" + vm_flavor: {get_param: vm_3_flavor} + vm_image: {get_param: vm_3_image} + +outputs: + vm_0_ips: + description: IP addresses of the 1st vm types + value: {get_attr: [vm_0_group, ip]} + vm_1_ips: + description: IP addresses of the 2nd vm types + value: {get_attr: [vm_1_group, ip]} + vm_2_ips: + description: IP addresses of the 3rd vm types + value: {get_attr: [vm_2_group, ip]} + vm_3_ips: + description: IP addresses of the 4th vm types + value: {get_attr: [vm_3_group, ip]} diff --git a/packer/provision/baseline.sh b/packer/provision/baseline.sh index 8aca86314..6694538f3 100644 --- a/packer/provision/baseline.sh +++ b/packer/provision/baseline.sh @@ -227,9 +227,6 @@ EOF cabal install "Cabal<1.18" # Pull Cabal version that is capable of building shellcheck cabal install --bindir=/usr/local/bin "shellcheck-0.4.6" # Pin shellcheck version - # openldap dev headers are required for lftools - yum install -y openldap-devel - # NLTK_DATA Cache: many jobs that use coala pull down nltk_data wget -nv -O /opt/nltk_data.zip https://github.com/nltk/nltk_data/archive/gh-pages.zip @@ -288,18 +285,18 @@ EOF # add additional repositories sudo add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu $(lsb_release -sc) main universe restricted multiverse" - # facter is not installed by default on the base image and facter package - # gets removed when puppet4 is updated. To fix this use version of facter - # shipped with puppet4. - ensure_ubuntu_install facter - # ensure facter is available in $PATH avoid failures in retry loop - export PATH="/opt/puppetlabs/bin/:$PATH" - echo "---> Installing base packages" apt-get clean apt-get update -m apt-get upgrade -m apt-get dist-upgrade -m + apt-get install facter + + # facter is not installed by default on the base image and facter package + # gets removed when puppet4 is updated. To fix this use version of facter + # shipped with puppet4. + # ensure facter is available in $PATH avoid failures in retry loop + export PATH="/opt/puppetlabs/bin/:$PATH" ensure_ubuntu_install unzip xz-utils git libxml-xpath-perl @@ -390,9 +387,6 @@ EOF cabal update cabal install --bindir=/usr/local/bin "shellcheck-0.4.6" # Pin shellcheck version - # openldap dev headers are required for lftools - ensure_ubuntu_install libldap2-dev libssl-dev libsasl2-dev - # NLTK_DATA Cache: many jobs that use coala pull down nltk_data wget -nv -O /opt/nltk_data.zip https://github.com/nltk/nltk_data/archive/gh-pages.zip