Merge "Add a note regarding deploy maven jobs"
authorThanh Ha <thanh.ha@linuxfoundation.org>
Fri, 14 Oct 2016 03:24:28 +0000 (03:24 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 14 Oct 2016 03:24:28 +0000 (03:24 +0000)
155 files changed:
docs/jenkins.rst
jjb/aaa/aaa.yaml
jjb/alto/alto.yaml
jjb/armoury/armoury.yaml
jjb/atrium/atrium.yaml
jjb/autorelease/autorelease-macros.yaml
jjb/autorelease/autorelease-templates.yaml
jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh
jjb/autorelease/include-raw-autorelease-maven-deploy.sh
jjb/bgpcep/bgpcep-csit-userfeatures.yaml
jjb/bgpcep/bgpcep-pcepy.yaml
jjb/bgpcep/bgpcep.yaml
jjb/capwap/capwap.yaml
jjb/cardinal/cardinal.yaml
jjb/centinel/centinel.yaml
jjb/controller/controller-csit-periodic-dsbenchmark.yaml
jjb/controller/controller.yaml
jjb/coretutorials/coretutorials.yaml
jjb/didm/didm.yaml
jjb/discovery/discovery.yaml
jjb/dlux/dlux.yaml
jjb/docs/docs-rtd.yaml
jjb/docs/docs.yaml
jjb/eman/eman.yaml
jjb/faas/faas.yaml
jjb/genius/genius.yaml
jjb/groupbasedpolicy/groupbasedpolicy.yaml
jjb/honeycomb/vbd/vbd.yaml
jjb/infrautils/infrautils.yaml
jjb/integration/distribution/distribution.yaml
jjb/integration/include-raw-integration-configure-clustering.sh
jjb/integration/include-raw-integration-deploy-controller-offline.sh
jjb/integration/include-raw-integration-deploy-controller-run-test.sh
jjb/integration/include-raw-integration-deploy-controller-verify.sh
jjb/integration/include-raw-integration-deploy-devstack-testing.sh
jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
jjb/integration/include-raw-integration-distribution-check.sh
jjb/integration/include-raw-integration-install-robotframework.sh
jjb/integration/include-raw-integration-start-cluster-run-test.sh
jjb/integration/integration-distribution-jobs.yaml
jjb/integration/integration-macros.yaml
jjb/integration/integration-templates.yaml
jjb/integration/integration-test-jobs.yaml
jjb/iotdm/iotdm.yaml
jjb/l2switch/l2switch.yaml
jjb/lacp/lacp.yaml
jjb/lispflowmapping/lispflowmapping.yaml
jjb/mdsal/mdsal.yaml
jjb/messaging4transport/messaging4transport.yaml
jjb/natapp/natapp.yaml
jjb/nemo/nemo.yaml
jjb/netconf/netconf-cluster-stress.yaml [new file with mode: 0644]
jjb/netconf/netconf-scale.yaml
jjb/netconf/netconf.yaml
jjb/netide/netide.yaml
jjb/netvirt/include-raw-openstack-ci.sh
jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml
jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
jjb/netvirt/netvirt-full-integration.yaml
jjb/netvirt/netvirt-openstack.yaml
jjb/netvirt/netvirt-patch-test.yaml
jjb/netvirt/netvirt-sonar.yaml
jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml
jjb/netvirt/netvirt-vpnservice-csit-3node-multi-openstack.yaml
jjb/netvirt/netvirt.yaml
jjb/neutron/include-raw-openstack-ci.sh
jjb/neutron/neutron-daily-openstack-beryllium.yaml
jjb/neutron/neutron.yaml
jjb/next/next.yaml
jjb/nic/nic.yaml
jjb/ocpplugin/ocpplugin.yaml
jjb/odlparent/odlparent.yaml
jjb/of-config/of-config.yaml
jjb/ofextensions/circuitsw/circuitsw.yaml
jjb/openflowjava/openflowjava.yaml
jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-helium-redesign.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-helium-redesign.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-lithium-redesign-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily-old.yaml [new file with mode: 0644]
jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml [new file with mode: 0644]
jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily-old.yaml
jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml
jjb/openflowplugin/openflowplugin-csit-cbench-daily-helium-redesign.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-cbench-daily-lithium-redesign-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-cbench-performance-helium-redesign.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-clustering-helium-redesign.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-clustering-lithium-redesign-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-config-performance-helium-redesign.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services-helium-redesign.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-helium-redesign.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-longevity-helium-redesign.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily-old.yaml [new file with mode: 0644]
jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml [new file with mode: 0644]
jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily-old.yaml [new file with mode: 0644]
jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml [new file with mode: 0644]
jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-helium-redesign.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-scalability-daily-helium-redesign.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-scalability-helium-redesign.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-helium-redesign.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-helium-redesign.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin.yaml
jjb/opflex/deps-inc-v1/include-raw-libuv_tgz-build.sh [moved from jjb/opflex/include-raw-libuv_tgz-build.sh with 100% similarity]
jjb/opflex/deps-inc-v1/include-raw-openvswitch_tgz-build.sh [moved from jjb/opflex/include-raw-openvswitch_tgz-build.sh with 96% similarity]
jjb/opflex/deps-inc-v1/include-raw-rapidjson_tgz-build.sh [moved from jjb/opflex/include-raw-rapidjson_tgz-build.sh with 87% similarity]
jjb/opflex/deps-inc-v2/include-raw-openvswitch_tgz-build.sh [new file with mode: 0644]
jjb/opflex/include-raw-opflex-dep_rpm-build.sh [deleted file]
jjb/opflex/include-raw-ovs_rpm-build.sh [deleted file]
jjb/opflex/opflex-custom.yaml
jjb/opflex/opflex-dependencies-rpm.yaml [deleted file]
jjb/opflex/opflex-dependencies.yaml
jjb/ovsdb/ovsdb-full-integration.yaml
jjb/ovsdb/ovsdb-sonar.yaml
jjb/ovsdb/ovsdb.yaml
jjb/packetcable/packetcable.yaml
jjb/persistence/persistence.yaml
jjb/releng-defaults.yaml
jjb/releng-jobs.yaml
jjb/releng-macros.yaml
jjb/releng-templates-java.yaml
jjb/releng-templates.yaml
jjb/reservation/reservation.yaml
jjb/sdninterfaceapp/sdninterfaceapp.yaml
jjb/sfc/sfc-csit-full-deploy.yaml
jjb/sfc/sfc.yaml
jjb/snbi/snbi.yaml
jjb/snmp/snmp.yaml
jjb/snmp4sdn/snmp4sdn.yaml
jjb/sxp/sxp.yaml
jjb/tcpmd5/tcpmd5.yaml
jjb/topoprocessing/topoprocessing.yaml
jjb/tsdr/tsdr.yaml
jjb/ttp/ttp.yaml
jjb/unimgr/unimgr.yaml
jjb/usc/usc.yaml
jjb/usecplugin/usecplugin.yaml
jjb/vpnservice/vpnservice.yaml
jjb/vtn/vtn.yaml
jjb/yang-push/yang-push.yaml
jjb/yangide/yangide.yaml
jjb/yangtools/yangtools.yaml
packer/provision/java-builder.sh

index 94e285e5797a4f51a1bf7ebcb0d0aaa6bd35585e..86817c585b3f897db4d275b3a8f89c7d6dd7d1c4 100644 (file)
@@ -131,43 +131,56 @@ label.
 Adding New Components to the Minions
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-If your project needs something added to one of the minions used during build
-and test you can help us get things added faster by doing one of the following:
+If your project needs something added to one of the minions, you can help us
+get things added faster by doing one of the following:
 
-* Submit a patch to RelEng/Builder for the `spinup-scripts`_ that
-  configures your new piece of software.
-* Submit a patch to RelEng/Builder for the Vagrant template's bootstrap.sh in
-  the `vagrant-definitions`_ directory that configures your new piece of
-  software.
+* Submit a patch to RelEng/Builder for the `packer/provision`_ scripts that
+  configures your new piece of software during minion boot up.
+* Submit a patch to RelEng/Builder for the Packer's templates  in
+  the `packer/templates`_ directory that configures your new piece of
+  software which get baked into the image.
 
 Going the first route will be faster in the short term as we can inspect the
 changes and make test modifications in the sandbox to verify that it works.
 
+.. note::
+
+   The first route may add additional setup time considering this is run every
+   time the minion is booted.
+
 The second route, however, is better for the community as a whole as it will
-allow others that utilize our Vagrant setups to replicate our systems more
+allow others to utilize our Packer setups to replicate our systems more
 closely. It is, however, more time consuming as an image snapshot needs to be
-created based on the updated Vagrant definition before it can be attached to
-the sandbox for validation testing.
+created based on the updated Packer definitions before it can be attached to
+the Jenkins configuration on sandbox for validation testing.
 
 In either case, the changes must be validated in the sandbox with tests to
 make sure that we don't break current jobs and that the new software features
 are operating as intended. Once this is done the changes will be merged and
-the updates applied to the RelEng Jenkins production silo.
-
-Please note that the combination of a Vagrant minion snapshot and a Jenkins
-spinup script is what defines a given minion. For instance, a minion may be
-defined by the `vagrant-basic-java-node`_ Vagrant definition
-and the `spinup-scripts-controller.sh`_ Jenkins spinup script
-(as the dynamic\_controller minion is). The pair provides the full definition of
-the realized minion. Jenkins starts a minion using the last-spun Vagrant snapshot
-for the specified definition. Once the base Vagrant instance is online Jenkins
-checks out the RelEng/Builder repo on it and executes two scripts. The first is
-`spinup-scripts-basic_settings.sh`_, which is a baseline for all of the minions.
-The second is
-the specialized spinup script, which handles any system updates, new software
-installs or extra environment tweaks that don't make sense in a snapshot. After
-all of these scripts have executed Jenkins will finally attach the minion as an
-actual minion and start handling jobs on it.
+the updates applied to the RelEng Jenkins production silo. Any changes to
+files under `releng/builder/packer`_ will be validated and images would be built
+triggered by verify-packer and merge-packer jobs.
+
+Please note that the combination of a Packer definitions from `vars`, `templates`
+and the `provision` scripts is what defines a given minion. For instance, a minion
+may be defined as `centos7-java-builder`_ which is a combination of Packer OS image
+definitions from `vars/centos.json`_, Packer template definitions from
+`templates/java-buidler.json` and spinup scripts from `provision/java-builder.sh`_.
+This combination provides the full definition of the realized minion.
+
+Jenkins starts a minion using the latest image which is built and linked into the
+Jenkins configuration. Once the base instance is online Jenkins checks out the
+RelEng/Builder repo on it and executes two scripts. The first is
+`provision/baseline.sh`_, which is a baseline for all of the minions.
+
+The second is the specialized script, which handles any system updates,
+new software installs or extra environment tweaks that don't make sense in a
+snapshot. Examples could include installing new package or setting up a virtual
+environment. Its imperative to ensure modifications to these spinup scripts have
+considered time taken to install the packages, as this could increase the build
+time for every job which runs on the image. After all of these scripts have
+executed Jenkins will finally attach the minion as an actual minion and start
+handling jobs on it.
 
 Pool: ODLRPC
 ^^^^^^^^^^^^^^^^^^^
index 2910fc458ff98f1cdcb9023761e93749a73490d4..29d219139cea80a8c84b0b0beb830ff6a580dcb1 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -25,7 +23,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'aaa-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -45,8 +43,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -60,7 +56,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'aaa-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -80,8 +76,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - beryllium:
             disable_autorelease: False
@@ -95,7 +89,7 @@
         - openjdk7
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'aaa-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index fce3c8328431d298ac83602c0a65bfa1a192b4c4..6f5eeb3932709dd82bb75b929550ce376afaa317 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -25,7 +23,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'alto-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -45,8 +43,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -60,7 +56,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'alto-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -80,8 +76,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - beryllium:
             disable_autorelease: False
@@ -96,7 +90,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'alto-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 3a79cda7f64108e0551cb79f754520d8884c5272..0fbb7e5d441c3d526361e20c785e95bd249001c2 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: True
@@ -26,7 +24,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'armoury-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
@@ -46,8 +44,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: True
@@ -62,7 +58,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'armoury-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
@@ -82,8 +78,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - beryllium:
             disable_autorelease: True
@@ -98,7 +92,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'armoury-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
index ba6528d8bac11e12d95a236658ba11d210da91b7..79695fd90c292e815c1809c396b648b382c46afb 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: True
@@ -25,7 +23,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'atrium-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -45,8 +43,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: True
@@ -60,7 +56,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'atrium-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 3c3acfd0c15112af5f9a72d6d3114ab3c7c1d9cc..9bc8417c6edf555114bc1595e7d65d9b495f7ff7 100644 (file)
     - shell:
         !include-raw:
             - include-raw-autorelease-get-integration-test-variables.sh
+    - inject:
+        properties-file: variables.prop
 
 - builder:
     name: autorelease-generate-project-report
index e15c52799789520622bb93cedf8b55ffbd66e57f..26b6d97920572154b20ab33da9f8d9d9f39d992d 100644 (file)
@@ -12,6 +12,8 @@
         artifactDaysToKeep: '14'
 
     parameters:
+        - maven-exec:
+            maven-version: 'mvn33'
         - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
         - timed: 'H 0 * * *'
 
     builders:
+        # force jenkins install of maven version before any shell scripts use it
+        - maven-target:
+            maven-version: 'mvn33'
+            goals: '-version'
+            settings: 'autorelease-settings'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
         - wipe-local-maven-repo
         - jacoco-nojava-workaround
         - shell: "./scripts/list-project-dependencies.sh"
@@ -52,7 +62,7 @@
         - autorelease-distribute-taglist
         - autorelease-generate-release-patches
         - maven-target:
-              maven-version: '{mvn33}'
+              maven-version: 'mvn33'
               pom: 'pom.xml'
               goals: 'clean deploy -V -B -Pintegrationtests,docs,repoBuild -Djenkins -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage'
               java-opts:
@@ -64,7 +74,7 @@
         - autorelease-maven-deploy
         - autorelease-get-integration-test-variables
         - autorelease-maven-sources:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             settings: 'autorelease-settings'
             global-settings: 'odl-global-settings'
         - autorelease-maven-sources-post-process
             cp *.log *.prop $_
 
     publishers:
-    - email-notification:
-        email-prefix: '[autorelease]'
-    - trigger-parameterized-builds:
-        - project: 'integration-distribution-test-{integration-test}'
-          condition: UNSTABLE_OR_BETTER
-          property-file: variables.prop
-          fail-on-missing: true
-    - opendaylight-infra-shiplogs:
-        maven-version: '{mvn33}'
+        - email-notification:
+            email-prefix: '[autorelease]'
+        - trigger-parameterized-builds:
+            - project: 'integration-distribution-test-{integration-test}'
+              condition: UNSTABLE_OR_BETTER
+              property-file: variables.prop
+              fail-on-missing: true
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
 
 - job-template:
     name: 'autorelease-project-report-{stream}'
         - autorelease-sys-stats
 
     publishers:
-    - email-ext:
-        attachments: 'project-reports/*.log'
-        recipients: 'skitt@redhat.com thanh.ha@linuxfoundation.org'
-        reply-to: dev@lists.opendaylight.org
-        content-type: default
-        subject: '[releng] ODL {stream} project report for ${{ENV, var="DATE"}}'
-        body: |
-            This is a project report generated on $DATE listing the commit
-            history of ODL projects for the past week. See attached
-            git-report.log
-
-            Archive also available on Jenkins at $BUILD_URL
-        always: true
-    - opendaylight-infra-shiplogs:
-        maven-version: '{mvn33}'
+        - email-ext:
+            attachments: 'project-reports/*.log'
+            recipients: 'skitt@redhat.com thanh.ha@linuxfoundation.org'
+            reply-to: dev@lists.opendaylight.org
+            content-type: default
+            subject: '[releng] ODL {stream} project report for ${{ENV, var="DATE"}}'
+            body: |
+                This is a project report generated on $DATE listing the commit
+                history of ODL projects for the past week. See attached
+                git-report.log
+                Archive also available on Jenkins at $BUILD_URL
+            always: true
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
index 3f46582899f64d36e5a5022110329ba55c38cbd5..67564700cf77eeec6a7fd50a0261afd994852da7 100644 (file)
 
 NEXUSURL=https://nexus.opendaylight.org/content/repositories/
 VERSION=`grep -m2 '<version>' ${WORKSPACE}/integration/distribution/distribution-karaf/pom.xml | tail -n1 | awk -F'[<|>]' '/version/ { printf $3 }'`
-if [ "x${VERSION}" == "x" ]; then
-    echo "Lithium or sooner, different path needs to be searched."
-    VERSION=`grep -m1 '<version>' ${WORKSPACE}/integration/distribution/distributions/karaf/pom.xml | awk -F'[<|>]' '/version/ { printf $3 }'`
-fi
 echo "VERSION: ${VERSION}"
 REPOID=`grep "Created staging repository with ID" $WORKSPACE/deploy-staged-repository.log | cut -d '"' -f2`
-
 echo BUNDLEURL=${NEXUSURL}/${REPOID}/org/opendaylight/integration/distribution-karaf/${VERSION}/distribution-karaf-${VERSION}.zip > $WORKSPACE/variables.prop
 echo "BUNDLEURL: ${BUNDLEURL}"
index 23e606bb76ced63ee15dbab397ee151b718a9375..630a2206c67e56fff3fa2725a72abd75a860d6fa 100644 (file)
 cd hide/from/pom/files
 mkdir -p m2repo/org/opendaylight/
 
-(IFS='
-'
-for m in `xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -m '//x:modules' -v '//x:module' ../../../../pom.xml`; do
-    rsync -avz --exclude 'maven-metadata*' \
-               --exclude '_remote.repositories' \
-               --exclude 'resolver-status.properties' \
-               "stage/org/opendaylight/$m" m2repo/org/opendaylight/
-done)
-
-# Add exception for integration project since they release under the
-# integration top-level project.
 rsync -avz --exclude 'maven-metadata*' \
            --exclude '_remote.repositories' \
            --exclude 'resolver-status.properties' \
-           "stage/org/opendaylight/integration" m2repo/org/opendaylight/
+           "stage/org/opendaylight" m2repo/org/
 
-mvn -V -B org.sonatype.plugins:nexus-staging-maven-plugin:1.6.2:deploy-staged-repository \
+"$MVN" -V -B org.sonatype.plugins:nexus-staging-maven-plugin:1.6.2:deploy-staged-repository \
     -DrepositoryDirectory="`pwd`/m2repo" \
     -DnexusUrl=https://nexus.opendaylight.org/ \
     -DstagingProfileId="425e43800fea70" \
index c64377e91b7eb68c6ea723590a3948f6bb2e2afc..7d4c346eaa1f7f3fe7d3debdbeddfee38f6d79a2 100644 (file)
@@ -29,7 +29,7 @@
             scope: 'all'
 
     # Features to install
-    # *-all is for Lithium and Beryllium, without -all is for Lithium and Boron.
+    # *-all is for Beryllium and Boron, without -all is for Boron and Carbon.
     install-features: 'odl-restconf,odl-bgpcep-pcep-all,odl-bgpcep-bgp-all,odl-bgpcep-bgp,odl-bgpcep-pcep,odl-netconf-connector-all,odl-bgpcep-bmp,odl-jolokia'
 
     # Robot custom options
index 128dbb3fee557bbdefb1601cfb7caf2ff7427989..3114166ad5bff9ad9f33a0c45165999749afa1dd 100644 (file)
@@ -3,8 +3,6 @@
     jobs:
         - '{project-name}-verify-python-{stream}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             branch: 'master'
index 7bd3ae1d5801dd204b62673d410cb89f1ae48ef4..7807939279d476a430faea6d818f6465ab900419 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -26,7 +24,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'bgpcep-settings'
     mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -46,8 +44,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -62,7 +58,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'bgpcep-settings'
     mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -83,8 +79,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - beryllium:
             disable_autorelease: False
@@ -99,7 +93,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'bgpcep-settings'
     mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index cd35bad16e067374c3f1b403a62b49b8ed708dc6..cdb8ce2c0b31d035a2c99741858ab121fc7bffee 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -25,7 +23,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'capwap-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -45,8 +43,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -60,7 +56,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'capwap-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -80,8 +76,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - beryllium:
             disable_autorelease: False
@@ -96,7 +90,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'capwap-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 6a53e4d0e3c5be5c72f977d9475cd0ba32cdd351..e7f824cc702d465a46020f54c10a26bbd6be0a03 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -25,7 +23,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'cardinal-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -45,8 +43,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -60,7 +56,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'cardinal-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index ce19225cbe2f6c60885830ff9384121df1efe41b..56ace49ef69fdfa23b84f6895cc11fd96c07d977 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -25,7 +23,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'centinel-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -45,8 +43,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -60,7 +56,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'centinel-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -80,8 +76,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - beryllium:
             disable_autorelease: False
@@ -96,7 +90,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'centinel-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 203de7d1f89e5abe33860da65dcbc2bad9a9b3b5..119b4c93afc73d7bd1dd1f0746b3b0a8de174800 100644 (file)
     # Trigger jobs (daily)
     schedule: 'H H * * *'
 
+    # ODL system image to use
+    # The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough.
+    controller-image: 'centos7-java-builder-2c-8g'
+
     # Plot Info
     01-plot-title: 'Performance by structure'
     01-plot-yaxis: 'Average total time [ms]'
index 57803dfd522d2aa2fd46ee6ab4394b4724c13c29..2b933c2a3b71fe0c8be87a01f1da1c0c0338c1cf 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -25,7 +23,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'controller-settings'
     mvn-goals: 'clean install -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
@@ -45,8 +43,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -60,7 +56,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'controller-settings'
     mvn-goals: 'clean install -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
@@ -80,8 +76,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - beryllium:
             disable_autorelease: False
@@ -96,7 +90,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'controller-settings'
     mvn-goals: 'clean install -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
index a31a321f40a2c3f362c63698506e51fa357d8a4d..872737e1c7b3f1a423f83dc89094bf896a9f54e9 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: True
@@ -25,7 +23,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'coretutorials-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -45,8 +43,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: True
@@ -60,7 +56,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'coretutorials-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -80,8 +76,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - beryllium:
             disable_autorelease: True
@@ -95,7 +89,7 @@
         - openjdk7
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'coretutorials-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index e441b5aa861766905522250a3bbd54a571093026..d268c69b1c779216338df430b831573ced8d10e2 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'didm-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'didm-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -90,7 +86,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'didm-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index bf619dc2b3fa94c34b1d6778439cf24f563d169b..440140cb54341f909256f9c461ad87ebba17b1d9 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: True
@@ -24,7 +22,7 @@
         - openjdk7
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'discovery-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: True
@@ -58,7 +54,7 @@
         - openjdk7
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'discovery-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -89,7 +85,7 @@
         - openjdk7
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'discovery-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 9b8f0ef1e7fd02ddb16033b3fb5401e5e6a3d35d..edf8f0470e322028f8155388e3ff7ce513101938 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'dlux-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'dlux-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -90,7 +86,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'dlux-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index c1a1dd31de8229ee8c269653fe19ac986b95c177..fd24db2e424466a8b982643846c3059450268b7e 100644 (file)
@@ -61,7 +61,7 @@
         - email-notification:
             email-prefix: '[docs]'
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 - job-template:
     name: 'docs-verify-rtd-{stream}'
         - email-notification:
             email-prefix: '[docs]'
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
index 806df16ff7369ac4bbd1fbf4232970a981d03337..e94e89118d40c59cb7eb0c6ae54ce3ff4a617cba 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'docs-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'docs-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -90,7 +86,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'docs-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 40f30582209e3a55bbbd5fe1ad490a0bff728259..19762ba5f170ca609100231887ac4f92b76d972d 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'eman-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'eman-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index c58cd5e9e37ae3ffded0a3f042a12ac4e70b4778..68c0778757c2ff4d0b02d6664fa74f2c10dbfb71 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'faas-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'faas-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -90,7 +86,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'faas-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 8ad77d0446d7766f35543aa232b905e0eb970b6f..b88de70de083b4e641b0f45b201d86d21537a0c4 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'genius-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'genius-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index b642999888f55695b8e0e6c3584c53573811886d..063199e1f9adaa226deae6b43ead232bd1135191 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean install findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean install findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -90,7 +86,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean install findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index aad3e73c9b4e909bda642dab4be8979fae0d9d51..fe4eb582a6f3445e838bd0b73701460dcf739f14 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'honeycomb-vbd-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'honeycomb-vbd-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 9aa1681491d94b577e1ef9bba7f05ae91d55cc4c..8d72f8723977df13f3d7e9335dd2f31bafe0fdd8 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'infrautils-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'infrautils-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index b19b53ad5fc00b7e6e9ee0a67b71c46122b1896a..100acd9e936653208a22c57a87057deb9e3c1488 100644 (file)
@@ -6,8 +6,6 @@
         - '{project-name}-sonar'
         - '{project-name}-validate-autorelease-{stream}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             branch: 'master'
index 820c3f60908fdc6f8f8589fb3ca06aeeb455d9cc..d11a9e4740a045c16fe4167ed4842059c20f8c53 100644 (file)
@@ -1,3 +1,9 @@
+#@IgnoreInspection BashAddShebang
+# Activate robotframework virtualenv
+# ${ROBOT_VENV} comes from the include-raw-integration-install-robotframework.sh
+# script.
+source ${ROBOT_VENV}/bin/activate
+
 echo "#################################################"
 echo "##         Configure Cluster and Start         ##"
 echo "#################################################"
@@ -125,6 +131,9 @@ EOF
 # Create the startup script to be run on controllers.
 cat > ${WORKSPACE}/startup-script.sh <<EOF
 
+echo "Redirecting karaf console output to karaf_console.log"
+export KARAF_REDIRECT="/tmp/${BUNDLEFOLDER}/data/log/karaf_console.log"
+
 echo "Starting controller..."
 /tmp/${BUNDLEFOLDER}/bin/start
 
index e5f7fa9d71a9572ef7c97cdc0cbf58d8a09a6dcf..bc525171f46ffeafdce86692d40a613eec67ccf6 100644 (file)
@@ -51,6 +51,9 @@ readlink -e "${JAVA_HOME}/bin/java"
 echo "Default JDK Version, JAVA_HOME should override"
 java -version
 
+echo "Redirecting karaf console output to karaf_console.log"
+export KARAF_REDIRECT="${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"
+
 echo "Starting controller..."
 ${WORKSPACE}/${BUNDLEFOLDER}/bin/start
 
@@ -65,7 +68,9 @@ ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh
 sleep 5
 
 echo "Fetching Karaf logs"
+# TODO: Move instead of copy? Gzip?
 cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log .
+cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log .
 
 echo "Exit with error"
 if [ -f ${WORKSPACE}/error.txt ]; then
index 53dbb002d7b1fe370e05809ca01046410d9e4c43..0b48b807becd1d4fb7e97c36ba59ea3385d60d46 100644 (file)
@@ -85,6 +85,9 @@ EOF
 # Create the startup script to be run on controller.
 cat > ${WORKSPACE}/startup-script.sh <<EOF
 
+echo "Redirecting karaf console output to karaf_console.log"
+export KARAF_REDIRECT="/tmp/${BUNDLEFOLDER}/data/log/karaf_console.log"
+
 echo "Starting controller..."
 /tmp/${BUNDLEFOLDER}/bin/start
 
@@ -162,7 +165,7 @@ fi
 
 echo "Lets's take the karaf thread dump"
 KARAF_PID=$(ssh ${ODL_SYSTEM_IP} "ps aux | grep 'distribution-karaf' | grep -v grep | tr -s ' ' | cut -f2 -d' '")
-ssh ${ODL_SYSTEM_IP} "jstack $KARAF_PID"> ${WORKSPACE}/karaf_threads_before.log
+ssh ${ODL_SYSTEM_IP} "jstack $KARAF_PID"> ${WORKSPACE}/karaf_threads_before.log || true
 
 echo "Locating test plan to use..."
 testplan_filepath="${WORKSPACE}/test/csit/testplans/${STREAMTESTPLAN}"
@@ -190,13 +193,18 @@ pybot -N ${TESTPLAN} -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} -v W
 
 echo "Lets's take the karaf thread dump again"
 KARAF_PID=$(ssh ${ODL_SYSTEM_IP} "ps aux | grep 'distribution-karaf' | grep -v grep | tr -s ' ' | cut -f2 -d' '")
-ssh ${ODL_SYSTEM_IP} "jstack $KARAF_PID"> ${WORKSPACE}/karaf_threads_after.log
+ssh ${ODL_SYSTEM_IP} "jstack $KARAF_PID"> ${WORKSPACE}/karaf_threads_after.log || true
 
-echo "Killing ODL and fetching Karaf log..."
+echo "Killing ODL"
 set +e  # We do not want to create red dot just because something went wrong while fetching logs.
 ssh "${ODL_SYSTEM_IP}" bash -c 'ps axf | grep karaf | grep -v grep | awk '"'"'{print "kill -9 " $1}'"'"' | sh'
 sleep 5
-scp "${ODL_SYSTEM_IP}:/tmp/${BUNDLEFOLDER}/data/log/karaf.log" .
+echo "Compressing karaf.log"
+ssh ${ODL_SYSTEM_IP} gzip --best "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
+echo "Fetching compressed karaf.log"
+scp "${ODL_SYSTEM_IP}:/tmp/${BUNDLEFOLDER}/data/log/karaf.log.gz" .
+# TODO: Should we compress the output log file as well?
+scp "${ODL_SYSTEM_IP}:/tmp/${BUNDLEFOLDER}/data/log/karaf_console.log" .
 true  # perhaps Jenkins is testing last exit code
 
 # vim: ts=4 sw=4 sts=4 et ft=sh :
index 03f02ddb51bb104dd54f72b6334f68ae76b46c5c..f2ab9051bf7ef85e4da3ba46fe76dcdda35aebf9 100644 (file)
@@ -50,6 +50,9 @@ readlink -e "${JAVA_HOME}/bin/java"
 echo "Default JDK Version, JAVA_HOME should override"
 java -version
 
+echo "Redirecting karaf console output to karaf_console.log"
+export KARAF_REDIRECT="${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"
+
 echo "Starting controller..."
 ${WORKSPACE}/${BUNDLEFOLDER}/bin/start
 
@@ -115,6 +118,7 @@ exit_on_log_file_message 'BindException: Address already in use'
 exit_on_log_file_message 'server is unhealthy'
 
 echo "Fetching Karaf logs"
+# TODO: Move instead of copy? Gzip?
 cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log .
 cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log .
 
index d7ef3a5f29716c6481d372446136b8e650755fd1..68bfe24980e0e12250c663e1d7d58dae0eff5608 100644 (file)
@@ -1,3 +1,7 @@
+#@IgnoreInspection BashAddShebang
+# Activate robotframework virtualenv
+# ${ROBOT_VENV} comes from the include-raw-integration-install-robotframework.sh
+# script.
 source ${ROBOT_VENV}/bin/activate
 
 echo "Changing the testplan path..."
index 6d37b0b7bd46b1df7564a1c22ab8a48a358ec62d..ea00cfc4e8a8aceea48c5f82523d12c8ee2a646f 100644 (file)
@@ -282,6 +282,7 @@ do
 done
 
 sleep 5
+# FIXME: Do not create .tar and gzip before copying.
 for i in `seq 1 ${NUM_ODL_SYSTEM}`
 do
     CONTROLLERIP=ODL_SYSTEM_${i}_IP
index 0b079ff1c8ece1cbfd2f428af34b7816fe3a1f31..82c50b07b32f70358ecd845ae3a2ae96c1dd3c23 100644 (file)
@@ -54,6 +54,9 @@ readlink -e "${JAVA_HOME}/bin/java"
 echo "JDK Version should be overriden by JAVA_HOME"
 java -version
 
+echo "Redirecting karaf console output to karaf_console.log"
+export KARAF_REDIRECT="${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"
+
 echo "Starting controller..."
 ${WORKSPACE}/${BUNDLEFOLDER}/bin/start
 
@@ -119,6 +122,7 @@ exit_on_log_file_message 'BindException: Address already in use'
 exit_on_log_file_message 'server is unhealthy'
 
 echo "Fetching Karaf logs"
+# TODO: Move instead of copy? Gzip?
 cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log .
 cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log .
 
index 11739f8068be52f2eed0db3dafe73d417d04fc2f..1566f03981d870743048d220029a473794607ce0 100644 (file)
@@ -25,7 +25,8 @@ set -exu
 pip install --upgrade pip
 
 pip install --upgrade docker-py importlib requests scapy netifaces netaddr ipaddr
-pip install --upgrade robotframework{,-{httplibrary,requests,sshlibrary,selenium2library}}
+pip install --upgrade robotframework{,-{httplibrary,requests,selenium2library}}
+pip install --upgrade robotframework-sshlibrary pycparser==2.13  # TODO: Unfreeze when cryptography stops failing on pycparser-2.14-py2.py3-none-any.whl
 
 # Module jsonpath is needed by current AAA idmlite suite.
 pip install --upgrade jsonpath-rw
@@ -34,7 +35,7 @@ pip install --upgrade jsonpath-rw
 pip install elasticsearch==1.7.0 elasticsearch-dsl==0.0.11
 
 # Module for pyangbind used by lispflowmapping project
-pip install pyangbind==0.5.6
+pip install pyangbind
 
 # Print installed versions.
 pip freeze
index 2e39579ad916d6c1f9c034f9f1f1465ce9252ba4..bbcd8dea909aec03fe2c76f39ff0d29b803c6bb3 100644 (file)
@@ -87,7 +87,7 @@ do
     odl_variables=${odl_variables}" -v ${CONTROLLERIP}:${!CONTROLLERIP}"
     echo "Lets's take the karaf thread dump"
     KARAF_PID=$(ssh ${!CONTROLLERIP} "ps aux | grep 'distribution-karaf' | grep -v grep | tr -s ' ' | cut -f2 -d' '")
-    ssh ${!CONTROLLERIP} "jstack $KARAF_PID"> ${WORKSPACE}/karaf_${i}_threads_before.log
+    ssh ${!CONTROLLERIP} "jstack $KARAF_PID"> ${WORKSPACE}/karaf_${i}_threads_before.log || true
 done
 
 echo "Generating mininet variables..."
@@ -126,7 +126,7 @@ do
     CONTROLLERIP=ODL_SYSTEM_${i}_IP
     echo "Lets's take the karaf thread dump again"
     KARAF_PID=$(ssh ${!CONTROLLERIP} "ps aux | grep 'distribution-karaf' | grep -v grep | tr -s ' ' | cut -f2 -d' '")
-    ssh ${!CONTROLLERIP} "jstack $KARAF_PID"> ${WORKSPACE}/karaf_${i}_threads_after.log
+    ssh ${!CONTROLLERIP} "jstack $KARAF_PID"> ${WORKSPACE}/karaf_${i}_threads_after.log || true
     echo "killing karaf process..."
     ssh "${!CONTROLLERIP}" bash -c 'ps axf | grep karaf | grep -v grep | awk '"'"'{print "kill -9 " $1}'"'"' | sh'
 done
@@ -134,7 +134,12 @@ sleep 5
 for i in `seq 1 ${NUM_ODL_SYSTEM}`
 do
     CONTROLLERIP=ODL_SYSTEM_${i}_IP
-    scp "${!CONTROLLERIP}:/tmp/${BUNDLEFOLDER}/data/log/karaf.log" "odl${i}_karaf.log"
+    echo "Compressing karaf.log ${i}"
+    ssh ${!CONTROLLERIP} gzip --best /tmp/${BUNDLEFOLDER}/data/log/karaf.log
+    echo "Fetching compressed karaf.log ${i}"
+    scp "${!CONTROLLERIP}:/tmp/${BUNDLEFOLDER}/data/log/karaf.log.gz" "odl${i}_karaf.log.gz"
+    # TODO: Gzip also these?
+    scp "${!CONTROLLERIP}:/tmp/${BUNDLEFOLDER}/data/log/karaf_console.log" "odl${i}_karaf_console.log"
 done
 true  # perhaps Jenkins is testing last exit code
 
index f8a1896b21c91e92f781ffb2a1648fedf09902d9..f5b0d4e867c272e901fc50db5fd7ca49061e8bc0 100644 (file)
@@ -70,7 +70,7 @@
             settings-file: 'integration-settings'
 
     maven:
-        maven-name: '{mvn33}'
+        maven-name: 'mvn33'
         root-pom: 'pom.xml'
         goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Djenkins -Dstream={stream}'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -94,7 +94,7 @@
     publishers:
         - jacoco-report
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
         - email-notification:
             email-prefix: '[int/dist]'
 
             settings-file: 'integration-settings'
 
     maven:
-        maven-name: '{mvn33}'
+        maven-name: 'mvn33'
         root-pom: 'pom.xml'
         goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Djenkins -Dmerge -Dstream={stream}'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
             # project is configured in a certain way which ODL is not.
             steps:
             - maven-target:
-                maven-version: '{mvn33}'
+                maven-version: 'mvn33'
                 pom: pom.xml
                 goals: 'site:deploy -V -B -Dstream={stream}'
                 java-opts:
                 global-settings: 'odl-global-settings'
                 global-settings-type: cfp
             - maven-target:
-                maven-version: '{mvn33}'
+                maven-version: 'mvn33'
                 pom: deploy-site.xml
                 goals: 'site:deploy -V -B -Dstream={stream}'
                 java-opts:
             deploy-unstable: false
         - jacoco-report
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
         - email-notification:
             email-prefix: '[int/dist]'
 
             email-prefix: '[int/dist]'
         - integration-csit-archive-build
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 # Template: integration-distribution-offline-{stream}
 # Goal: Verify distribution can start with no internet connection
             email-prefix: '[int/dist]'
         - integration-csit-archive-build
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
index 46ccd1269ec7953ef89c23950cecb8aebb20e8c9..83daad88bdfbfe1b864d2540a43452f326453463 100644 (file)
                     mkdir $WORKSPACE/archives
                     curl --output robot-plugin.zip "$BUILD_URL/robot/report/*zip*/robot-plugin.zip"
                     unzip -d $WORKSPACE/archives robot-plugin.zip
-                    mv *log* *.log *.csv *.png $WORKSPACE/archives || true  # Don't fail if file missing
+                    mv *log* *.log *.log.gz *.csv *.png $WORKSPACE/archives || true  # Don't fail if file missing
             script-only-if-succeeded: False
             script-only-if-failed: False
             mark-unstable-if-failed: True
index ab8cf510ddee523b22dbb8f126eb93b0b76b8d0a..3a6e64c99d0b1584338325da740ebad927d3726f 100644 (file)
             email-prefix: '[{project}]'
         - integration-csit-archive-build
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 - job-template:
     name: '{project}-csit-1node-{functionality}-{install}-{stream}'
                 format: csv
         - integration-csit-archive-build
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 - job-template:
     name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
                 format: csv
         - integration-csit-archive-build
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 - job-template:
     name: '{project}-csit-verify-3node-{functionality}'
             email-prefix: '[{project}]'
         - integration-csit-archive-build
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 - job-template:
     name: '{project}-csit-3node-{functionality}-{install}-{stream}'
                 format: csv
         - integration-csit-archive-build
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 - job-template:
     name: '{project}-csit-3node-docker-{functionality}-{install}-{stream}'
                 format: csv
         - integration-csit-archive-build
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 - job-template:
     name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
                 format: csv
         - integration-csit-archive-build
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 - job-template:
     name: '{project}-csit-1node-openstack-{openstack}-{functionality}-{stream}'
             email-prefix: '[{project}]'
         - integration-csit-archive-build
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 - job-template:
     name: '{project}-csit-3node-openstack-{openstack}-{functionality}-{stream}'
             email-prefix: '[{project}]'
         - integration-csit-archive-build
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 # Template: {project}-patch-test-{stream}
 # Goal: Build a patch and run project specific system test on a distribution containing the change
             global-settings-file: 'odl-global-settings'
             settings-file: 'integration-settings'
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             pom: '{project}/pom.xml'
             goals: 'clean install dependency:tree -V -B -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
             java-opts:
             global-settings-type: cfp
 
     maven:
-        maven-name: '{mvn33}'
+        maven-name: 'mvn33'
         root-pom: 'distribution/pom.xml'
         goals: 'clean install dependency:tree -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
index 2db994f3656dd1486959d04b8b1b29ed2420a178..39c73071670f3990f04c428afa416073fa8dd44b 100644 (file)
             email-prefix: '[integration]'
         - integration-csit-archive-build
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 # Template: integration-distribution-test-{stream}
 # Goal: Verify a distribution through all system test available
             global-settings-file: 'odl-global-settings'
             settings-file: 'integration-settings'
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             pom: '$GERRIT_PROJECT/pom.xml'
             goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Pq -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
             java-opts:
             global-settings-type: cfp
 
     maven:
-        maven-name: '{mvn33}'
+        maven-name: 'mvn33'
         root-pom: 'distribution/pom.xml'
         goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
 
     publishers:
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
         - email-notification:
             email-prefix: '[$GERRIT_PROJECT]'
 
             build-timeout: '1200'
 
     maven:
-        maven-name: '{mvn33}'
+        maven-name: 'mvn33'
         root-pom: 'patch_tester/pom.xml'
         # TODO: Make Maven options configurable. Currently tests are not skipped, everything else is.
         goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -f patch_tester/pom.xml -V -B -Pq -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
 
     publishers:
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
         - email-notification:
             email-prefix: '[int/dist]'
index d715ce755231ec1dd6ddda834cb3065f0753057a..513b0e7b99828ac062593653e7200bc258cb3357 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'iotdm-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'iotdm-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -90,7 +86,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'iotdm-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index cede29eda98c9a956255957d3515d4baea97a532..b49e327a24cdc085f23294db947b16fcac9f7355 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'l2switch-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'l2switch-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
@@ -90,7 +86,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'l2switch-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
index fbf946375fe2608425d933a3991992bc615ab360..1c3d3a9505c70c91bfec5fee055eaed33be91a53 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -25,7 +23,7 @@
     mvn-settings: 'lacp-settings'
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -59,7 +55,7 @@
     mvn-settings: 'lacp-settings'
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
@@ -91,7 +87,7 @@
     mvn-settings: 'lacp-settings'
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
index 014190cebb5d71be144f453f2ea6f7004a8326cf..c0202de72f66c6da9ccca7a0e6da7fc93d4502d6 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{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'
@@ -45,8 +43,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -59,7 +55,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{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'
@@ -92,7 +88,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{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'
index 70b99b1f7b82a14e35af9fd2b109908c8a5666f4..e7d94b8c14405be7b5b764353815664caf0f7c51 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'mdsal-settings'
     mvn-goals: '-Dmaven.compile.fork=true clean install -Dintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'mdsal-settings'
     mvn-goals: '-Dmaven.compile.fork=true clean install -Dintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
@@ -90,7 +86,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'mdsal-settings'
     mvn-goals: '-Dmaven.compile.fork=true clean install -Dintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
index ab0fa13f58e40702a6d52fed4f1f8910937a636d..1c488c94cebb56ebf25656e47886ebf456d2408b 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'messaging4transport-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'messaging4transport-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -90,7 +86,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'messaging4transport-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index f0fe58f41631030c8fa61c25139f34725018c58e..106d0567bfc7805543e1eafa46b3d9697aa379f6 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'natapp-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'natapp-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 509fa5ced4a52147e69d9cec3c5ed4baa3102603..1b7abd66cd806d2909ad671db9d4ec2bf0f13872 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'nemo-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'nemo-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -90,7 +86,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'nemo-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/netconf/netconf-cluster-stress.yaml b/jjb/netconf/netconf-cluster-stress.yaml
new file mode 100644 (file)
index 0000000..3bdbcf7
--- /dev/null
@@ -0,0 +1,42 @@
+- project:
+    name: netconf-csit-cluster-stress
+    jobs:
+        - '{project}-csit-3node-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'netconf'
+
+    # The functionality under test
+    functionality: 'cluster-stress'
+
+    # Project branches
+    stream:
+        - carbon:
+            branch: 'master'
+            jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
+
+    install:
+        - only:
+            scope: 'only'
+        - all:
+            scope: 'all'
+
+    # Features to install
+    # odl-jolokia is added automatically just because this is a 3node job.
+    # Netconf clustered feature is installed at runtime.
+    install-features: 'odl-netconf-ssh,odl-restconf'
+
+    # Robot custom options
+    robot-options: '-v USE_NETCONF_CONNECTOR:False'
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs:
+        controller-distribution-{stream},
+        netconf-distribution-{stream},
+        integration-distribution-merge-{stream}
index d4ec07fbb403f91e82eff9b704ec14235bcc0748..8678b011bc259b7fefb94ead391969d3ebd606c1 100644 (file)
@@ -37,3 +37,6 @@
     # so the job is defined to run once a day.
     # Trigger jobs (daily)
     schedule: 'H H * * *'
+
+    # ODL system configuration
+    controller-image: 'centos7-java-builder-2c-8g'
index 6281faa03e1d603bc0888676c7932f8afba61c16..e769446825a5aad1deb1d2d716e49c64afa4b0a5 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'netconf-settings'
     mvn-goals: 'clean install -Pintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'netconf-settings'
     mvn-goals: 'clean install -Pintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
@@ -96,7 +92,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'netconf-settings'
     mvn-goals: 'clean install -Pintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
index ff5747f20fc3dc220ac637a420f8de03c4321e6a..f3092245fbb50cbbf197258b170d83c1f59167f3 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'netide-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'netide-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -90,7 +86,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'netide-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 9e9ff8fcb9ad4b10fd599b6aac06cba045e13518..9f5f2ac7ae5df414a44d4b32619ac68288804f17 100644 (file)
@@ -83,8 +83,6 @@ fi
 # Use specific build, if asked to do so
 if [ "${ODL_VERSION}" == "beryllium" ] ; then
     DEVSTACK_LOCAL_CONFIG+="ODL_RELEASE=beryllium-snapshot-0.4.0;"
-elif [ "${ODL_VERSION}" == "lithium" ] ; then
-    DEVSTACK_LOCAL_CONFIG+="ODL_RELEASE=lithium-snapshot-0.3.1;"
 fi
 
 # And this runs devstack-gate
index 2ea4cbef5ecdf6e6ada483de2615a3de1c9e0848..e25f66ebaa8427b2bb73546e5dd0500f9c82939e 100644 (file)
@@ -24,9 +24,9 @@
         - mitaka:
             openstack-branch: 'stable/mitaka'
             odl-ml2-version:  'stable/mitaka'
-        - liberty:
-            openstack-branch: 'stable/liberty'
-            odl-ml2-version:  'stable/liberty'
+        - newton:
+            openstack-branch: 'stable/newton'
+            odl-ml2-version:  'master'
 
     openstack-vms: 3
 
@@ -44,4 +44,4 @@
 
     tenant-network-type: 'vxlan'
 
-    security-group-mode: 'none'
\ No newline at end of file
+    security-group-mode: 'none'
index b00958e85c1a625d335fd0581d9a35969cc05b9a..d518096f256623b5ca63704779a465fd41cc528a 100644 (file)
@@ -24,9 +24,9 @@
         - mitaka:
             openstack-branch: 'stable/mitaka'
             odl-ml2-version:  'stable/mitaka'
-        - liberty:
-            openstack-branch: 'stable/liberty'
-            odl-ml2-version:  'stable/liberty'
+        - newton:
+            openstack-branch: 'stable/newton'
+            odl-ml2-version:  'master'
 
     openstack-vms: 4
 
@@ -46,4 +46,4 @@
 
     tenant-network-type: 'vxlan'
 
-    security-group-mode: 'none'
\ No newline at end of file
+    security-group-mode: 'none'
index 53fcce297d0cd86a1ad7a7f5cd0659a6aa496f37..bda7c745a9d2cf06cceae7bb5260503af2b5e454 100644 (file)
@@ -3,8 +3,6 @@
     jobs:
         - 'netvirt-daily-full-integration-{stream}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             branch: 'master'
 - job-template:
     name: 'netvirt-daily-full-integration-{stream}'
 
-    # Required Variables:
-    #     stream:    release stream (eg. stable-lithium or beryllium)
-    #     branch:    git branch (eg. stable/lithium or master)
-
     project-type: freestyle
     node: centos7-docker-2c-4g
     jdk: '{jdk}'
     builders:
         - wipe-org-opendaylight-repo
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             pom: 'pom.xml'
             goals: '-V -B -l build.log clean install dependency:tree -Pq -Dmaven.compile.fork=true'
             properties:
             global-settings-type: cfp
         #  skip 2.4.0 until we figure out conntrack
         #- run-netvirt-it:
-        #    maven-version: '{mvn33}'
+        #    maven-version: 'mvn33'
         #    stream: '{stream}'
         #    OVS_VERSION: '2.4.0'
         - run-netvirt-it:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             stream: '{stream}'
             OVS_VERSION: '2.5.0'
         - jacoco-nojava-workaround
             unstable-if-found: true
             also-check-console-output: false
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
index c913c6eca5eb41e4d91f21e7b62bec48b9fbbb34..984e8d844f64e9bdf5fdbef27b6f5b4249483453 100644 (file)
@@ -85,4 +85,4 @@
             unstable: true
             fixed: true
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
index 4798f9340df04b841b45c7cb7286fa36533a68a2..a87bc589df51c755ac2f96e57da9e67c709c5bfd 100644 (file)
@@ -23,9 +23,9 @@
 
         - current:
             csit-list: >
-                netvirt-vpnservice-csit-1node-openstack-mitaka-openstack-{stream}
+                netvirt-vpnservice-csit-1node-openstack-mitaka-transparent-{stream}
 
         - all:
             csit-list: >
-                netvirt-vpnservice-csit-1node-openstack-mitaka-openstack-{stream},
+                netvirt-vpnservice-csit-1node-openstack-mitaka-transparent-{stream},
                 netvirt-csit-1node-openstack-mitaka-openstack-{stream}
index 812da461543a6f7bd82e6f1b3c968da82a69876e..46342585a950d431078033358b261e5d5f39318a 100644 (file)
@@ -58,7 +58,7 @@
             properties-file: env.properties
         - install-docker-composeSonar
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             pom: 'pom.xml'
             goals: 'clean install dependency:tree -V -B -Dsonar -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
             java-opts:
@@ -70,7 +70,7 @@
         - inject:
             properties-file: env.properties
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             pom: 'vpnservice/it/pom.xml'
             goals: 'verify -V -B -l netvirt-vpnservice-sonar.log -Pintegrationtest -Dsonar -Dskip.karaf.featureTest=true -Dovsdb.controller.address=${{CONTROLLER_IP}} -Ddocker.compose.file=ovs-2.5.0-hwvtep.yml -Ddocker.vEnvWs=$WORKSPACE -Dsgm=transparent'
             properties:
@@ -81,7 +81,7 @@
             global-settings: 'odl-global-settings'
             global-settings-type: cfp
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             pom: 'openstack/net-virt-it/pom.xml'
             goals: 'verify -V -B -l net-virt-sonar.log -Pintegrationtest -Dsonar -Dskip.karaf.featureTest=true -Dovsdb.controller.address=${{CONTROLLER_IP}} -Ddocker.compose.file=ovs-2.5.0-hwvtep.yml -Ddocker.vEnvWs=$WORKSPACE -Dsgm=transparent'
             properties:
@@ -97,7 +97,7 @@
         - inject:
             properties-file: env.properties
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             pom: 'openstack/net-virt-sfc/it/pom.xml'
             goals: 'verify -V -B -l openstack/net-virt-sfc-sonar.log -Pintegrationtest -Dsonar -Dskip.karaf.featureTest=true -Dovsdb.controller.address=${{CONTROLLER_IP}} -Dsgm=transparent'
             properties:
             global-settings: 'odl-global-settings'
             global-settings-type: cfp
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             # We should switch to the recommended configuration of sonar once
             # JJB adds support for configurating the Sonar wrapper:
             #    http://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner+for+Jenkins
         - jacoco-report
         - findbugs
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
index f5af75c7727731b48fee4b2ada0d04ba5a95a2c7..407051640da893352bb89dfc6a935cc2a2111e8f 100644 (file)
@@ -3,11 +3,12 @@
     jobs:
         - '{project}-csit-1node-openstack-{openstack}-{functionality}-{stream}'
 
-    # The project name
     project: 'netvirt-vpnservice'
 
-    # The project name
-    functionality: 'openstack'
+    functionality:
+        - 'transparent'
+        - 'stateful'
+        - 'learn'
 
     stream:
         - carbon:
@@ -21,9 +22,9 @@
         - mitaka:
             openstack-branch: 'stable/mitaka'
             odl-ml2-version:  'stable/mitaka'
-        - liberty:
-            openstack-branch: 'stable/liberty'
-            odl-ml2-version:  'stable/liberty'
+        - newton:
+            openstack-branch: 'stable/newton'
+            odl-ml2-version:  'master'
 
     openstack-vms: 3
 
@@ -41,4 +42,4 @@
 
     tenant-network-type: 'vxlan'
 
-    security-group-mode: 'transparent'
+    security-group-mode: '{functionality}'
index a2d128c8f30bc01a312bfb2ef80542d796462e03..50fad15eeb256ad1a6032c3f715b8cd041454890 100644 (file)
@@ -21,9 +21,9 @@
         - mitaka:
             openstack-branch: 'stable/mitaka'
             odl-ml2-version:  'stable/mitaka'
-        - liberty:
-            openstack-branch: 'stable/liberty'
-            odl-ml2-version:  'stable/liberty'
+        - newton:
+            openstack-branch: 'stable/newton'
+            odl-ml2-version:  'master'
 
     openstack-vms: 4
 
@@ -43,4 +43,4 @@
 
     tenant-network-type: 'vxlan'
 
-    security-group-mode: 'transparent'
\ No newline at end of file
+    security-group-mode: 'transparent'
index 807f0d535f9361be60bc0f6a1e2da97eaa040638..6d1f146af6d75a3a1147edca881697f6fc367e6b 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'netvirt-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'netvirt-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
@@ -90,7 +86,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'netvirt-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'netvirt-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
index f633a69806528e13582ecab4b080954a1f72c7d6..46ff626fe3db9491f8b70feff12fa398c35ca579 100644 (file)
@@ -82,6 +82,7 @@ fi
 
 # Use specific build, if asked to do so
 if [ "${ODL_VERSION}" == "lithium-latest" ] ; then
+    # FIXME: Support more recent ODL release versions.
     DEVSTACK_LOCAL_CONFIG+="ODL_RELEASE=lithium-snapshot;"
 fi
 
index e56d5cb02d6777b8f0340155ade505e7b8ebdec4..f2da9c918ce9b54c15c41bb23e2c9bc4abd99176 100644 (file)
@@ -37,6 +37,7 @@
     builders:
         - inject:
             properties-content: |
+              # FIXME: Should *-beryllium job set lithium version? Add a comment why.
               ODL_VERSION=lithium-latest
               TEMPEST_REGEX=tempest.api.network
               KARAFFEATURE=odl-neutron-dummyprovider-test
index 59b8c8aea53049f21bbd68f30cdd66cfc0c3b210..19071b7d5078aab67300fd53f261052bb308a976 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -25,7 +23,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'neutron-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -45,8 +43,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -59,7 +55,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'neutron-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -90,7 +86,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'neutron-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 5fbed269f64dad4f5b5ac7ad30dc1312116af980..fdd39688ef31bc578fccec7843a59f5825deff41 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'next-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'next-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -90,7 +86,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'next-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 610b433ba5c851c018f35cb8b8d5ea631aa0e5e8..a27668160670ffe2f9f07bb25040435996319e7d 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'nic-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'nic-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -90,7 +86,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'nic-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 58c3370d153952f604e597503559d55f8e009de9..84fa540c9187bba829dc98e3d0f3089b0c694bf9 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'ocpplugin-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'ocpplugin-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index c157d14dd93e448d1b297b6f54d3cc1bdc28d3df..f5526715e9ffa291e1c533c86271e2cc3619fecf 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -25,7 +23,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'odlparent-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -45,8 +43,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -60,7 +56,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'odlparent-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -80,8 +76,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - beryllium:
             disable_autorelease: False
@@ -96,7 +90,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'odlparent-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index cca9d80246745464640ce851f16cc02cd342850c..dc823235b2307b055c84688666dd080260ab86b5 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'of-config-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'of-config-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -90,7 +86,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'of-config-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 99d9f5e15e034c6d78a7bfc20eeba3a2e201c5d2..d4e676ebdb8301608f9cecd050c204a47abd2670 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'ofextensions-circuitsw-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'ofextensions-circuitsw-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -90,7 +86,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'ofextensions-circuitsw-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 12c33b7bf16dd25595550ce35ebcc009fe1b3cb8..afeedb98b025128265b60638d32d611ff544c04d 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'openflowjava-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'openflowjava-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -91,7 +87,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'openflowjava-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-helium-redesign.yaml
deleted file mode 100644 (file)
index 42ff20a..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-- project:
-    name: openflowplugin-csit-bulk-matic-ds-daily-helium-redesign
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'bulk-matic-ds-daily-helium-redesign'
-
-    # Project branches
-    stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-he,odl-openflowplugin-app-bulk-o-matic-he'
-
-    # Robot custom options
-    robot-options: '-v flnr:50000'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'REST setup rate (for 100k flows)'
-    01-plot-yaxis: 'setup time[s], req[flows/s]'
-    01-plot-group: 'Performance Rate'
-    01-plot-data-file: 'flows_setup_time.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign-old.yaml
deleted file mode 100644 (file)
index 4b96c6b..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-- project:
-    name: openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign-old
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'bulk-matic-ds-daily-lithium-redesign'
-
-    # Project branches
-    stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li,odl-openflowplugin-app-bulk-o-matic-li'
-
-    # Robot custom options
-    robot-options: '-v flnr:50000'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'REST setup rate (for 100k flows)'
-    01-plot-yaxis: 'setup time[s], req[flows/s]'
-    01-plot-group: 'Performance Rate'
-    01-plot-data-file: 'flows_setup_time.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-helium-redesign.yaml
deleted file mode 100644 (file)
index 300aadb..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-- project:
-    name: openflowplugin-csit-bulkomatic-clustering-daily-helium-redesign
-    jobs:
-        - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'bulkomatic-clustering-daily-helium-redesign'
-
-    # Project branches
-    stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-he,odl-openflowplugin-app-bulk-o-matic-he'
-
-    # Robot custom options
-    robot-options: '-v ODL_OF_PLUGIN:helium'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-lithium-redesign-old.yaml
deleted file mode 100644 (file)
index 21fc82a..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-- project:
-    name: openflowplugin-csit-bulkomatic-clustering-daily-lithium-redesign-old
-    jobs:
-        - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'bulkomatic-clustering-daily-lithium-redesign'
-
-    # Project branches
-    stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li,odl-openflowplugin-app-bulk-o-matic-li'
-
-    # Robot custom options
-    robot-options: '-v ODL_OF_PLUGIN:lithium'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily-old.yaml
new file mode 100644 (file)
index 0000000..4fe4dc6
--- /dev/null
@@ -0,0 +1,42 @@
+- project:
+    name: openflowplugin-csit-bulkomatic-clustering-perf-daily-old
+    jobs:
+        - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'bulkomatic-clustering-perf-daily'
+
+    # Project branches
+    stream:
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk8'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Job images
+    controller-image: 'centos7-java-builder-4c-8g'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-bulk-o-matic,odl-jolokia,decanter-collector-jmx,decanter-appender-elasticsearch'
+
+    # Robot custom options
+    robot-options: '-v ODL_OF_PLUGIN:helium -v oper_ds_timeout:1000 -v switch_count:32 -v flow_count_per_switch:2000'
+
+    # Trigger jobs (daily)
+    schedule: 'H H * * *'
+
+    # Plot Info
+    01-plot-title: 'Flow Add rate'
+    01-plot-yaxis: 'flow_mods/sec'
+    01-plot-group: 'Java Performance'
+    01-plot-data-file: 'rate.csv'
+    02-plot-title: 'Flow Add time'
+    02-plot-yaxis: 'seconds'
+    02-plot-group: 'Java Performance'
+    02-plot-data-file: 'time.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml
new file mode 100644 (file)
index 0000000..eb33ca7
--- /dev/null
@@ -0,0 +1,46 @@
+- project:
+    name: openflowplugin-csit-bulkomatic-clustering-perf-daily
+    jobs:
+        - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'bulkomatic-clustering-perf-daily'
+
+    # Project branches
+    stream:
+        - carbon:
+            branch: 'master'
+            jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Job images
+    controller-image: 'centos7-java-builder-4c-8g'
+    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-bulk-o-matic,odl-jolokia,decanter-collector-jmx,decanter-appender-elasticsearch'
+
+    # Robot custom options
+    robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count_per_switch:2000'
+
+    # Trigger jobs (daily)
+    schedule: 'H H * * *'
+
+    # Plot Info
+    01-plot-title: 'Flow Add rate'
+    01-plot-yaxis: 'flow_mods/sec'
+    01-plot-group: 'Java Performance'
+    01-plot-data-file: 'rate.csv'
+    02-plot-title: 'Flow Add time'
+    02-plot-yaxis: 'seconds'
+    02-plot-group: 'Java Performance'
+    02-plot-data-file: 'time.csv'
index f4fba155bb4b015715e098d5a723a6a9fdfeedd8..56c3026c2d4ec5b539ea0ee8056ec32f8cf6a096 100644 (file)
 
     # Job images
     controller-image: 'centos7-java-builder-4c-8g'
-    mininet-image: 'ubuntu-trusty-mininet-ovs-23-2c-2g'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-bulk-o-matic,odl-jolokia,decanter-collector-jmx,decanter-appender-elasticsearch'
 
     # Robot custom options
-    robot-options: '-v ODL_OF_PLUGIN:helium'
+    robot-options: '-v ODL_OF_PLUGIN:helium -v switch_count:32 -v flow_count_per_switch:2000'
 
     # Trigger jobs (daily)
     schedule: 'H H * * *'
index 02c0c20f7646a500c3c2aa31dfd4b0eebcdca99e..585b3d4468634603c69c46389b2ec660756e84c7 100644 (file)
 
     # Job images
     controller-image: 'centos7-java-builder-4c-8g'
-    mininet-image: 'ubuntu-trusty-mininet-ovs-23-2c-2g'
+    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-bulk-o-matic,odl-jolokia,decanter-collector-jmx,decanter-appender-elasticsearch'
 
     # Robot custom options
-    robot-options: '-v ODL_OF_PLUGIN:lithium'
+    robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count_per_switch:2000'
 
     # Trigger jobs (daily)
     schedule: 'H H * * *'
diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-helium-redesign.yaml
deleted file mode 100644 (file)
index 6468a1b..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-- project:
-    name: openflowplugin-csit-cbench-helium-redesign-daily
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'cbench-daily-helium-redesign'
-
-    # Project branches
-    stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-he,odl-openflowplugin-drop-test-he'
-
-    # Robot custom options
-    robot-options: '-v duration_in_secs:180 -v throughput_threshold:20000 -v latency_threshold:5000'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'Throughput Mode'
-    01-plot-yaxis: 'flow_mods/sec'
-    01-plot-group: 'Cbench Performance'
-    01-plot-data-file: 'throughput.csv'
-    02-plot-title: 'Latency Mode'
-    02-plot-yaxis: 'flow_mods/sec'
-    02-plot-group: 'Cbench Performance'
-    02-plot-data-file: 'latency.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-lithium-redesign-old.yaml
deleted file mode 100644 (file)
index 2ae81ad..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-- project:
-    name: openflowplugin-csit-cbench-daily-lithium-redesign-old
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'cbench-daily-lithium-redesign'
-
-    # Project branches
-    stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li,odl-openflowplugin-drop-test-li'
-
-    # Robot custom options
-    robot-options: '-v duration_in_secs:180 -v throughput_threshold:20000 -v latency_threshold:5000'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'Throughput Mode'
-    01-plot-yaxis: 'flow_mods/sec'
-    01-plot-group: 'Cbench Performance'
-    01-plot-data-file: 'throughput.csv'
-    02-plot-title: 'Latency Mode'
-    02-plot-yaxis: 'flow_mods/sec'
-    02-plot-group: 'Cbench Performance'
-    02-plot-data-file: 'latency.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-helium-redesign.yaml
deleted file mode 100644 (file)
index 1d76820..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-- project:
-    name: openflowplugin-csit-cbench-performance-helium-redesign
-    jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'cbench-performance-helium-redesign'
-
-    # Project branches
-    stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-he,odl-openflowplugin-drop-test-he'
-
-    # Robot custom options
-    robot-options: '-v throughput_threshold:20000 -v latency_threshold:5000'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
-
-    # Plot Info
-    01-plot-title: 'Throughput Mode'
-    01-plot-yaxis: 'flow_mods/sec'
-    01-plot-group: 'Cbench Performance'
-    01-plot-data-file: 'throughput.csv'
-    02-plot-title: 'Latency Mode'
-    02-plot-yaxis: 'flow_mods/sec'
-    02-plot-group: 'Cbench Performance'
-    02-plot-data-file: 'latency.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign-old.yaml
deleted file mode 100644 (file)
index 26090e6..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-- project:
-    name: openflowplugin-csit-cbench-performance-lithium-redesign-old
-    jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'cbench-performance-lithium-redesign'
-
-    # Project branches
-    stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li,odl-openflowplugin-drop-test-li'
-
-    # Robot custom options
-    robot-options: '-v throughput_threshold:20000 -v latency_threshold:5000'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
-
-    # Plot Info
-    01-plot-title: 'Throughput Mode'
-    01-plot-yaxis: 'flow_mods/sec'
-    01-plot-group: 'Cbench Performance'
-    01-plot-data-file: 'throughput.csv'
-    02-plot-title: 'Latency Mode'
-    02-plot-yaxis: 'flow_mods/sec'
-    02-plot-group: 'Cbench Performance'
-    02-plot-data-file: 'latency.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-helium-redesign.yaml
deleted file mode 100644 (file)
index 2f1fe13..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-- project:
-    name: openflowplugin-csit-clustering-helium-redesign
-    jobs:
-        - '{project}-csit-3node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'clustering-helium-redesign'
-
-    # Project branches
-    stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-he'
-
-    # Robot custom options
-    robot-options: '-v ODL_OF_PLUGIN:helium'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-lithium-redesign-old.yaml
deleted file mode 100644 (file)
index f186ba6..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-- project:
-    name: openflowplugin-csit-clustering-lithium-redesign-old
-    jobs:
-        - '{project}-csit-3node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'clustering-lithium-redesign'
-
-    # Project branches
-    stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li'
-
-    # Robot custom options
-    robot-options: '-v ODL_OF_PLUGIN:lithium'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance-helium-redesign.yaml
deleted file mode 100644 (file)
index a969e9a..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-- project:
-    name: openflowplugin-csit-config-performance-helium-redesign
-    jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'config-performance-helium-redesign'
-
-    # Project branches
-    stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-he'
-
-    # Robot custom options
-    robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
-
-    # Plot Info
-    01-plot-title: 'Flow REST API Rate'
-    01-plot-yaxis: 'http_req/sec'
-    01-plot-group: 'Flow Config Performance'
-    01-plot-data-file: 'rates.csv'
-    02-plot-title: 'Flow Stats Collect Time'
-    02-plot-yaxis: 'seconds'
-    02-plot-group: 'Stats Collect Performance'
-    02-plot-data-file: 'times.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign-old.yaml
deleted file mode 100644 (file)
index 8f349d8..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-- project:
-    name: openflowplugin-csit-config-performance-lithium-redesign-old
-    jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'config-performance-lithium-redesign'
-
-    # Project branches
-    stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li'
-
-    # Robot custom options
-    robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
-
-    # Plot Info
-    01-plot-title: 'Flow REST API Rate'
-    01-plot-yaxis: 'http_req/sec'
-    01-plot-group: 'Flow Config Performance'
-    01-plot-data-file: 'rates.csv'
-    02-plot-title: 'Flow Stats Collect Time'
-    02-plot-yaxis: 'seconds'
-    02-plot-group: 'Stats Collect Performance'
-    02-plot-data-file: 'times.csv'
index 9d6e59516b9d7db63160fedb5098e66f01f9d58d..a5cc21f91a2c0c1f1942bb1720a1e7568165fb0f 100644 (file)
             scope: 'only'
 
     # Features to install
-    install-features: 'odl-restconf,odl-openflowplugin-app-config-pusher,odl-openflowplugin-app-topology,odl-openflowplugin-app-forwardingrules-sync'
+    install-features: 'odl-restconf,odl-openflowplugin-app-config-pusher,odl-openflowplugin-app-topology,odl-openflowplugin-app-forwardingrules-sync,odl-openflowplugin-app-table-miss-enforcer'
 
-    # Robot custom options
-    robot-options: ''
+    # Robot custom options.
+    # We need this delay to verify proper functionality. THIS HAS TO BE REMOVED BEFORE FRS GETS RELEASED.
+    robot-options: '-v flow_update_time:30s'
+
+    # mininet image
+    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-helium-redesign.yaml
deleted file mode 100644 (file)
index 832afd7..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-- project:
-    name: openflowplugin-csit-flow-services-helium-redesign
-    jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'flow-services-helium-redesign'
-
-    # Project branches
-    stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-he'
-
-    # Robot custom options
-    robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign-old.yaml
deleted file mode 100644 (file)
index 00f01f5..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-- project:
-    name: openflowplugin-csit-flow-services-lithium-redesign-old
-    jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'flow-services-lithium-redesign'
-
-    # Project branches
-    stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li'
-
-    # Robot custom options
-    robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
index 19985f2a05d5147f381fb45c0e033902c5c91744..87398148d3ae16955e98c1b419102f367c650b78 100644 (file)
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui'
+    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-table-miss-enforcer'
 
     # Robot custom options
     robot-options: ''
 
+    # mininet image
+    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
+
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
index d6c1ed29bb6367f46fe9fdfc58c2c0dbdfadf80a..08134d3d6f85757a769488e912120c7bed620587 100644 (file)
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui'
+    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-table-miss-enforcer'
 
     # Robot custom options
     robot-options: ''
 
+    # mininet image
+    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
+
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-helium-redesign.yaml
deleted file mode 100644 (file)
index 0e39cbe..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-- project:
-    name: openflowplugin-csit-link-scalability-daily-helium-redesign
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'link-scalability-daily-helium-redesign'
-
-    # Project branches
-    stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-he'
-
-    # Robot custom options
-    robot-options: ''
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'Max number of switch links'
-    01-plot-yaxis: 'Links'
-    01-plot-group: 'Inventory Switch Link Scalability'
-    01-plot-data-file: 'links.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign-old.yaml
deleted file mode 100644 (file)
index d2cc97b..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-- project:
-    name: openflowplugin-csit-link-scalability-daily-lithium-redesign-old
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'link-scalability-daily-lithium-redesign'
-
-    # Project branches
-    stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li'
-
-    # Robot custom options
-    robot-options: ''
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'Max number of switch links'
-    01-plot-yaxis: 'Links'
-    01-plot-group: 'Inventory Switch Link Scalability'
-    01-plot-data-file: 'links.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity-helium-redesign.yaml
deleted file mode 100644 (file)
index 449a37f..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-- project:
-    name: openflowplugin-csit-longevity-helium-redesign
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-    build-timeout: 1440
-
-    # The functionality under test
-    functionality: 'longevity-helium-redesign'
-
-    # Project branches
-    stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-he,decanter-collector-jmx,decanter-appender-elasticsearch'
-
-    # Robot custom options
-    robot-options: '-v TEST_LENGTH:23@hours --escape space:@'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign-old.yaml
deleted file mode 100644 (file)
index e5378a7..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-- project:
-    name: openflowplugin-csit-longevity-lithium-redesign-old
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-    build-timeout: 1440
-
-    # The functionality under test
-    functionality: 'longevity-lithium-redesign'
-
-    # Project branches
-    stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li,decanter-collector-jmx,decanter-appender-elasticsearch'
-
-    # Robot custom options
-    robot-options: '-v TEST_LENGTH:23@hours --escape space:@'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily-old.yaml
new file mode 100644 (file)
index 0000000..3fc3d6a
--- /dev/null
@@ -0,0 +1,42 @@
+- project:
+    name: openflowplugin-csit-restconf-clustering-perf-daily-old
+    jobs:
+        - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'restconf-clustering-perf-daily'
+
+    # Project branches
+    stream:
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk8'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Job images
+    controller-image: 'centos7-java-builder-4c-8g'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui,odl-jolokia,decanter-collector-jmx,decanter-appender-elasticsearch'
+
+    # Robot custom options
+    robot-options: '-v ODL_OF_PLUGIN:helium -v oper_ds_timeout:1000 -v switch_count:32 -v flow_count:64000'
+
+    # Trigger jobs (daily)
+    schedule: 'H H * * *'
+
+    # Plot Info
+    01-plot-title: 'Flow Add rate'
+    01-plot-yaxis: 'flow_mods/sec'
+    01-plot-group: 'REST Performance'
+    01-plot-data-file: 'rate.csv'
+    02-plot-title: 'Flow Add time'
+    02-plot-yaxis: 'seconds'
+    02-plot-group: 'REST Performance'
+    02-plot-data-file: 'time.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml
new file mode 100644 (file)
index 0000000..de48d35
--- /dev/null
@@ -0,0 +1,46 @@
+- project:
+    name: openflowplugin-csit-restconf-clustering-perf-daily
+    jobs:
+        - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'restconf-clustering-perf-daily'
+
+    # Project branches
+    stream:
+        - carbon:
+            branch: 'master'
+            jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Job images
+    controller-image: 'centos7-java-builder-4c-8g'
+    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui,odl-jolokia,decanter-collector-jmx,decanter-appender-elasticsearch'
+
+    # Robot custom options
+    robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count:64000'
+
+    # Trigger jobs (daily)
+    schedule: 'H H * * *'
+
+    # Plot Info
+    01-plot-title: 'Flow Add rate'
+    01-plot-yaxis: 'flow_mods/sec'
+    01-plot-group: 'REST Performance'
+    01-plot-data-file: 'rate.csv'
+    02-plot-title: 'Flow Add time'
+    02-plot-yaxis: 'seconds'
+    02-plot-group: 'REST Performance'
+    02-plot-data-file: 'time.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily-old.yaml
new file mode 100644 (file)
index 0000000..2f68fcb
--- /dev/null
@@ -0,0 +1,42 @@
+- project:
+    name: openflowplugin-csit-restconf-perf-daily-old
+    jobs:
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'restconf-perf-daily'
+
+    # Project branches
+    stream:
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk8'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Job images
+    controller-image: 'centos7-java-builder-4c-8g'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui,odl-jolokia,decanter-collector-jmx,decanter-appender-elasticsearch'
+
+    # Robot custom options
+    robot-options: '-v ODL_OF_PLUGIN:helium -v switch_count:32 -v flow_count:64000'
+
+    # Trigger jobs (daily)
+    schedule: 'H H * * *'
+
+    # Plot Info
+    01-plot-title: 'Flow Add rate'
+    01-plot-yaxis: 'flow_mods/sec'
+    01-plot-group: 'REST Performance'
+    01-plot-data-file: 'rate.csv'
+    02-plot-title: 'Flow Add time'
+    02-plot-yaxis: 'seconds'
+    02-plot-group: 'REST Performance'
+    02-plot-data-file: 'time.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml
new file mode 100644 (file)
index 0000000..d49e2f2
--- /dev/null
@@ -0,0 +1,46 @@
+- project:
+    name: openflowplugin-csit-restconf-perf-daily
+    jobs:
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'restconf-perf-daily'
+
+    # Project branches
+    stream:
+        - carbon:
+            branch: 'master'
+            jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Job images
+    controller-image: 'centos7-java-builder-4c-8g'
+    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui,odl-jolokia,decanter-collector-jmx,decanter-appender-elasticsearch'
+
+    # Robot custom options
+    robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count:64000'
+
+    # Trigger jobs (daily)
+    schedule: 'H H * * *'
+
+    # Plot Info
+    01-plot-title: 'Flow Add rate'
+    01-plot-yaxis: 'flow_mods/sec'
+    01-plot-group: 'REST Performance'
+    01-plot-data-file: 'rate.csv'
+    02-plot-title: 'Flow Add time'
+    02-plot-yaxis: 'seconds'
+    02-plot-group: 'REST Performance'
+    02-plot-data-file: 'time.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-helium-redesign.yaml
deleted file mode 100644 (file)
index d904beb..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-- project:
-    name: openflowplugin-csit-rpc-time-measure-daily-helium-redesign
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'rpc-time-measure-daily-helium-redesign'
-
-    # Project branches
-    stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-he,odl-openflowplugin-app-bulk-o-matic-he'
-
-    # Robot custom options
-    robot-options: ''
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'REST setup rate (for 100k flows)'
-    01-plot-yaxis: 'setup time[s], req[flows/s]'
-    01-plot-group: 'Performance Rate'
-    01-plot-data-file: 'flows_setup_time.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign-old.yaml
deleted file mode 100644 (file)
index 52f9794..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-- project:
-    name: openflowplugin-csit-rpc-time-measure-daily-lithium-redesign-old
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'rpc-time-measure-daily-lithium-redesign'
-
-    # Project branches
-    stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li,odl-openflowplugin-app-bulk-o-matic-li'
-
-    # Robot custom options
-    robot-options: ''
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'REST setup rate (for 100k flows)'
-    01-plot-yaxis: 'setup time[s], req[flows/s]'
-    01-plot-group: 'Performance Rate'
-    01-plot-data-file: 'flows_setup_time.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-helium-redesign.yaml
deleted file mode 100644 (file)
index ad4504c..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-- project:
-    name: openflowplugin-csit-scalability-daily-helium-redesign
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'scalability-daily-helium-redesign'
-
-    # Project branches
-    stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-he'
-
-    # Robot custom options
-    robot-options: '-v MIN_SWITCHES:100 -v MAX_SWITCHES:400 -v STEP_SWITCHES:50'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'Max number of Switches'
-    01-plot-yaxis: 'OpenFlow Switches'
-    01-plot-group: 'Inventory Scalability'
-    01-plot-data-file: 'switches.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign-old.yaml
deleted file mode 100644 (file)
index e81006b..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-- project:
-    name: openflowplugin-csit-scalability-daily-lithium-redesign-old
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'scalability-daily-lithium-redesign'
-
-    # Project branches
-    stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li'
-
-    # Robot custom options
-    robot-options: '-v MIN_SWITCHES:100 -v MAX_SWITCHES:400 -v STEP_SWITCHES:50'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'Max number of Switches'
-    01-plot-yaxis: 'OpenFlow Switches'
-    01-plot-group: 'Inventory Scalability'
-    01-plot-data-file: 'switches.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-helium-redesign.yaml
deleted file mode 100644 (file)
index 6b4b7ab..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-- project:
-    name: openflowplugin-csit-scalability-helium-redesign
-    jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'scalability-helium-redesign'
-
-    # Project branches
-    stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-he,decanter-collector-jmx,decanter-appender-elasticsearch'
-
-    # Robot custom options
-    robot-options: '-v TOPO_TREE_DEPTH:7'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign-old.yaml
deleted file mode 100644 (file)
index 0b9aac6..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-- project:
-    name: openflowplugin-csit-scalability-lithium-redesign-old
-    jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'scalability-lithium-redesign'
-
-    # Project branches
-    stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li,decanter-collector-jmx,decanter-appender-elasticsearch'
-
-    # Robot custom options
-    robot-options: '-v TOPO_TREE_DEPTH:7'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-helium-redesign.yaml
deleted file mode 100644 (file)
index dd00f65..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-- project:
-    name: openflowplugin-csit-scale-stats-collection-daily-helium-redesign
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'scale-stats-collection-daily-helium-redesign'
-
-    # Project branches
-    stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-he'
-
-    # Robot custom options
-    robot-options: '-v flnr:50000'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'Flows (100k) Setup Time'
-    01-plot-yaxis: '[s]'
-    01-plot-group: 'Config Performance'
-    01-plot-data-file: 'flows_setup_time.csv'
-
-    02-plot-title: 'REST setup rate (for 100k flows)'
-    02-plot-yaxis: 'setup time[s], req[flows/s]'
-    02-plot-group: 'Performance Rate'
-    02-plot-data-file: 'flows_install_rate.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign-old.yaml
deleted file mode 100644 (file)
index 076bfd7..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-- project:
-    name: openflowplugin-csit-scale-stats-collection-daily-lithium-redesign-old
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'scale-stats-collection-daily-lithium-redesign'
-
-    # Project branches
-    stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li'
-
-    # Robot custom options
-    robot-options: '-v flnr:50000'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'Flows (100k) Setup Time'
-    01-plot-yaxis: '[s]'
-    01-plot-group: 'Config Performance'
-    01-plot-data-file: 'flows_setup_time.csv'
-
-    02-plot-title: 'REST setup rate (for 100k flows)'
-    02-plot-yaxis: 'setup time[s], req[flows/s]'
-    02-plot-group: 'Performance Rate'
-    02-plot-data-file: 'flows_install_rate.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-helium-redesign.yaml
deleted file mode 100644 (file)
index a401309..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-- project:
-    name: openflowplugin-csit-sw-scalability-daily-helium-redesign
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'sw-scalability-daily-helium-redesign'
-
-    # Project branches
-    stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-he'
-
-    # Robot custom options
-    robot-options: ''
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'Max number of Switches'
-    01-plot-yaxis: 'OpenFlow Switches'
-    01-plot-group: 'Inventory Scalability'
-    01-plot-data-file: 'max_found.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign-old.yaml
deleted file mode 100644 (file)
index 6c706b3..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-- project:
-    name: openflowplugin-csit-sw-scalability-daily-lithium-redesign-old
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'sw-scalability-daily-lithium-redesign'
-
-    # Project branches
-    stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li'
-
-    # Robot custom options
-    robot-options: ''
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'Max number of Switches'
-    01-plot-yaxis: 'OpenFlow Switches'
-    01-plot-group: 'Inventory Scalability'
-    01-plot-data-file: 'max_found.csv'
index 27e4e37ff8f108565322cdee750d8510e0182070..b5f067f02987bb8b8ce63f68004d227e641fae8c 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'openflowplugin-settings'
     mvn-goals: 'clean install javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'openflowplugin-settings'
     mvn-goals: 'clean install javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -90,7 +86,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'openflowplugin-settings'
     mvn-goals: 'clean install javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
similarity index 96%
rename from jjb/opflex/include-raw-openvswitch_tgz-build.sh
rename to jjb/opflex/deps-inc-v1/include-raw-openvswitch_tgz-build.sh
index a0d2e1094ec7969095e4fcfc07c0330d6a068c67..d939f6eaa809bd8275cc8c2a7610fa9d0ea06370 100644 (file)
@@ -11,9 +11,10 @@ mkdir -p "$DESTDIR"
 
 ./boot.sh
 ./configure --prefix="$ROOT" --enable-shared
-make -j8
+make -j4
 DESTDIR=`pwd`/$DESTDIR make install
 find lib ofproto -name "*.h" -exec cp --parents -t "$DESTDIR/$ROOT/include/openvswitch/" {} \;
 
 pushd $DESTDIR
 tar -czf openvswitch.tgz *
+popd
similarity index 87%
rename from jjb/opflex/include-raw-rapidjson_tgz-build.sh
rename to jjb/opflex/deps-inc-v1/include-raw-rapidjson_tgz-build.sh
index e173dc8d12828aa392a3ce0265e201541a5838e7..47b1fa0b374aabf5cb0290c1283d34c24344a9f8 100644 (file)
@@ -13,7 +13,7 @@ mkdir -p "$DESTDIR/$ROOT/include"
 cp -R include/rapidjson "$DESTDIR/$ROOT/include"
 sed -e "s|@INCLUDE_INSTALL_DIR@|$ROOT/include|" \
     -e "s|@PROJECT_NAME@|RapidJSON|" \
-    -e "s|@LIB_VERSION_STRING@|1.0.1|" RapidJSON.pc.in > \
+    -e "s|@LIB_VERSION_STRING@|1.0.2|" RapidJSON.pc.in > \
     "$DESTDIR/$ROOT/lib/pkgconfig/RapidJSON.pc"
 
 pushd $DESTDIR
diff --git a/jjb/opflex/deps-inc-v2/include-raw-openvswitch_tgz-build.sh b/jjb/opflex/deps-inc-v2/include-raw-openvswitch_tgz-build.sh
new file mode 100644 (file)
index 0000000..182fec2
--- /dev/null
@@ -0,0 +1,28 @@
+#!/bin/bash
+# Build script for openvswitch
+
+set -e
+set -x
+
+ROOT=/tmp/opflex-prefix
+DESTDIR=install-root
+
+mkdir -p "$DESTDIR"
+
+./boot.sh
+./configure --prefix="$ROOT" --enable-shared
+make -j4
+DESTDIR=`pwd`/$DESTDIR make install
+
+# OVS headers get installed to weird and inconsistent locations.  Try
+# to clean things up
+mkdir -p $DESTDIR/$ROOT/include/openvswitch/openvswitch
+mv $DESTDIR/$ROOT/include/openvswitch/*.h $DESTDIR/$ROOT/include/openvswitch/openvswitch
+mv $DESTDIR/$ROOT/include/openflow $DESTDIR/$ROOT/include/openvswitch
+cp -t "$DESTDIR/$ROOT/include/openvswitch/" include/*.h
+find lib -name "*.h" -exec cp --parents -t "$DESTDIR/$ROOT/include/openvswitch/" {} \;
+
+pushd $DESTDIR
+tar -czf openvswitch.tgz *
+popd
+
diff --git a/jjb/opflex/include-raw-opflex-dep_rpm-build.sh b/jjb/opflex/include-raw-opflex-dep_rpm-build.sh
deleted file mode 100644 (file)
index 63aa052..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -e
-set -x
-
-LIBUV_VERSION=1.5.0
-wget https://github.com/libuv/libuv/archive/v$LIBUV_VERSION.tar.gz
-mock --define="buildversion $BUILD_NUMBER" -r $MOCK_TARGET --resultdir target/srpm --buildsrpm --spec libuv.spec --sources v$LIBUV_VERSION.tar.gz
-
-RAPIDJSON_VERSION=1.0.2
-wget https://github.com/miloyip/rapidjson/archive/v$RAPIDJSON_VERSION.tar.gz
-mock --define="buildversion $BUILD_NUMBER" -r $TARGET --resultdir target/srpm --buildsrpm --spec rapidjson-devel.spec --sources v$RAPIDJSON_VERSION.tar.gz
-
-mockchain -m --define="buildversion $BUILD_NUMBER" -r $MOCK_TARGET -l target/rpm target/srpm/*.src.rpm
-find target/rpm/results -name "*.rpm" -exec mv {} . \;
diff --git a/jjb/opflex/include-raw-ovs_rpm-build.sh b/jjb/opflex/include-raw-ovs_rpm-build.sh
deleted file mode 100644 (file)
index 9dbe487..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-# Build OVS RPMs
-
-set -e
-set -x
-
-TARGET=epel-7-x86_64
-BASEKERNEL=3.10.0-229.14.1.el7.x86_64
-BVDEFINE=--define="buildversion $BUILD_NUMBER"
-KMDEFINE=--define="kversion $BASEKERNEL"
-
-./boot.sh
-./configure
-make dist
-
-SOURCE_FILE=$(ls *.tar.gz)
-
-mock -r $TARGET --resultdir target/srpm --buildsrpm --spec rhel/openvswitch-gbp-rhel.spec --sources $SOURCE_FILE "$BVDEFINE" "$KMDEFINE"
-mock -r $TARGET --resultdir target/srpm --buildsrpm --spec rhel/openvswitch-gbp-kmod-rhel.spec --sources $SOURCE_FILE "$BVDEFINE" "$KMDEFINE"
-mockchain -r $TARGET -l target/rpm -m --nocheck -m "$BVDEFINE" -m "$KMDEFINE" target/srpm/*.src.rpm
-
-find target/rpm/results -name "*.rpm" -exec mv {} . \;
index f9c5f6367138857b84cdc27a11badf537e77e121..e45b148938d217190434c5313bbec9034b9a24de 100644 (file)
@@ -6,18 +6,16 @@
 #        - 'opflex-daily-{stream}'
 #        - 'opflex-distribution-{stream}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
         - boron:
             branch: 'stable/boron'
-            jdk: openjdk7
+            jdk: openjdk8
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: openjdk7
+            jdk: openjdk8
 
     project: 'opflex'
     archive-artifacts: '**/*.tar.gz'
@@ -26,7 +24,7 @@
     name: opflex-build
     builders:
       - maven-target:
-          maven-version: '{mvn33}'
+          maven-version: 'mvn33'
           pom: genie/pom.xml
           goals: compile
       - copyartifact:
 
     builders:
         - opflex-build:
-            mvn33: '{mvn33}'
+            mvn33: 'mvn33'
             stream: '{stream}'
 
     publishers:
         - email-notification:
             email-prefix: '[opflex]'
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 - job-template:
     name: 'opflex-merge-{stream}'
 
     builders:
         - opflex-build:
-            mvn33: '{mvn33}'
+            mvn33: 'mvn33'
             stream: '{stream}'
 
     publishers:
         - email-notification:
             email-prefix: '[opflex]'
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
diff --git a/jjb/opflex/opflex-dependencies-rpm.yaml b/jjb/opflex/opflex-dependencies-rpm.yaml
deleted file mode 100644 (file)
index 866e46c..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-- project:
-    name: opflex-dependencies-rpm
-    jobs:
-        - 'opflex-dep_rpm-{stream}'
-        - 'opflex-openvswitch_rpm-{stream}'
-
-    stream:
-        - carbon:
-            branch: 'master'
-            jdk: openjdk7
-        - boron:
-            branch: 'stable/boron'
-            jdk: openjdk7
-        - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-
-    project: 'opflex'
-
-- parameter:
-    name: mock-target-parameter
-    parameters:
-        - string:
-            name: MOCK_TARGET
-            default: 'epel-7-x86_64'
-            description: "Target architecture for mock RPM builds"
-
-- scm:
-    name: 'git-opflex-3rdparty'
-    scm:
-        - git:
-            url: https://github.com/noironetworks/3rdparty-rpm.git
-            branches:
-                - 'origin/master'
-            wipe-workspace: true
-
-- job-template:
-    name: 'opflex-dep_rpm-{stream}'
-
-    project-type: freestyle
-    node: centos7-java-builder-2c-8g
-    concurrent: true
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    scm:
-        - git-opflex-3rdparty
-
-    wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    parameters:
-        - mock-target-parameter
-
-    builders:
-        - shell:
-            !include-raw-escape:
-                - include-raw-opflex-dep_rpm-build.sh
-
-    publishers:
-        - email-notification:
-            email-prefix: '[opflex]'
-        - archive:
-            artifacts: '*.rpm'
-
-- job-template:
-    name: 'opflex-openvswitch_rpm-{stream}'
-
-    project-type: freestyle
-    node: centos7-java-builder-2c-8g
-    concurrent: true
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    scm:
-        - git-opflex-ovs
-
-    wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    parameters:
-        - mock-target-parameter
-
-    builders:
-        - shell:
-            !include-raw-escape:
-                - include-raw-ovs_rpm-build.sh
-
-    publishers:
-        - email-notification:
-            email-prefix: '[opflex]'
-        - archive:
-            artifacts: '*.rpm'
index 41795f9a7db933cbe854380ee8170463fb20e6a1..6f68a9434528fae392031f7202fc0922d21dc203 100644 (file)
@@ -8,18 +8,33 @@
     stream:
         - carbon:
             branch: 'master'
-            jdk: openjdk7
+            libuv-build: v1
+            libuv-scm: v2
+            rapidjson-build: v1
+            rapidjson-scm: v2
+            openvswitch-build: v2
+            openvswitch-scm: v2
         - boron:
             branch: 'stable/boron'
-            jdk: openjdk7
+            libuv-build: v1
+            libuv-scm: v1
+            rapidjson-build: v1
+            rapidjson-scm: v1
+            openvswitch-build: v1
+            openvswitch-scm: v1
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: openjdk7
+            libuv-build: v1
+            libuv-scm: v1
+            rapidjson-build: v1
+            rapidjson-scm: v1
+            openvswitch-build: v1
+            openvswitch-scm: v1
 
     project: 'opflex'
 
 - scm:
-    name: 'git-opflex-libuv'
+    name: 'git-opflex-libuv-v1'
     scm:
         - git:
             url: https://github.com/libuv/libuv.git
             wipe-workspace: true
 
 - scm:
-    name: 'git-opflex-rapidjson'
+    name: 'git-opflex-libuv-v2'
+    scm:
+        - git:
+            url: https://github.com/libuv/libuv.git
+            branches:
+                - 'refs/tags/v1.8.0'
+            wipe-workspace: true
+
+- scm:
+    name: 'git-opflex-rapidjson-v1'
     scm:
         - git:
             url: https://github.com/miloyip/rapidjson.git
             wipe-workspace: true
 
 - scm:
-    name: 'git-opflex-ovs'
+    name: 'git-opflex-rapidjson-v2'
+    scm:
+        - git:
+            url: https://github.com/miloyip/rapidjson.git
+            branches:
+                - 'refs/tags/v1.0.2'
+            wipe-workspace: true
+
+- scm:
+    name: 'git-opflex-ovs-v1'
     scm:
         - git:
             url: https://github.com/noironetworks/ovs.git
                 - 'origin/noiro'
             wipe-workspace: true
 
+- scm:
+    name: 'git-opflex-ovs-v2'
+    scm:
+        - git:
+            url: https://github.com/openvswitch/ovs.git
+            branches:
+                - 'refs/tags/v2.6.0'
+            wipe-workspace: true
+
+- builder:
+    name: 'builder-opflex-libuv-v1'
+    builders:
+        - shell:
+            !include-raw-escape:
+                - deps-inc-v1/include-raw-libuv_tgz-build.sh
+
 - job-template:
     name: 'opflex-libuv_tgz-{stream}'
 
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     scm:
-        - git-opflex-libuv
+        - git-opflex-libuv-{libuv-scm}
 
     wrappers:
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
 
     builders:
-        - shell:
-            !include-raw-escape:
-                - include-raw-libuv_tgz-build.sh
+        - builder-opflex-libuv-{libuv-build}
 
     publishers:
         - email-notification:
         - archive:
             artifacts: 'install-root/*.tgz'
 
+- builder:
+    name: 'builder-opflex-rapidjson-v1'
+    builders:
+        - shell:
+            !include-raw-escape:
+                - deps-inc-v1/include-raw-rapidjson_tgz-build.sh
+
 - job-template:
     name: 'opflex-rapidjson_tgz-{stream}'
 
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     scm:
-        - git-opflex-rapidjson
+        - git-opflex-rapidjson-{rapidjson-scm}
 
     wrappers:
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
 
     builders:
-        - shell:
-            !include-raw-escape:
-                - include-raw-rapidjson_tgz-build.sh
+        - builder-opflex-rapidjson-{rapidjson-build}
 
     publishers:
         - email-notification:
         - archive:
             artifacts: 'install-root/*.tgz'
 
+- builder:
+    name: 'builder-opflex-openvswitch-v1'
+    builders:
+        - shell:
+            !include-raw:
+                - deps-inc-v1/include-raw-openvswitch_tgz-build.sh
+
+- builder:
+    name: 'builder-opflex-openvswitch-v2'
+    builders:
+        - shell:
+            !include-raw:
+                - deps-inc-v2/include-raw-openvswitch_tgz-build.sh
+
 - job-template:
     name: 'opflex-openvswitch_tgz-{stream}'
 
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     scm:
-        - git-opflex-ovs
+        - git-opflex-ovs-{openvswitch-scm}
 
     wrappers:
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
 
     builders:
-        - shell:
-            !include-raw-escape:
-                - include-raw-openvswitch_tgz-build.sh
+        - builder-opflex-openvswitch-{openvswitch-build}
 
     publishers:
         - email-notification:
index 7fe777dc112598a2fdee7bbd338eb3345020bc4a..39f3e92320c429c7dc21e7e9fad6b5a288bbd1b6 100644 (file)
@@ -3,8 +3,6 @@
     jobs:
         - 'ovsdb-daily-full-integration-{stream}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             branch: 'master'
 - job-template:
     name: 'ovsdb-daily-full-integration-{stream}'
 
-    # Required Variables:
-    #     stream:    release stream (eg. stable-lithium or beryllium)
-    #     branch:    git branch (eg. stable/lithium or master)
-
     project-type: freestyle
     node: centos7-docker-2c-4g
     jdk: '{jdk}'
     builders:
         - wipe-org-opendaylight-repo
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             pom: 'pom.xml'
             goals: '-V -B -l build.log clean install dependency:tree -Pq -Dmaven.compile.fork=true'
             properties:
             global-settings: 'odl-global-settings'
             global-settings-type: cfp
         - run-ovsdb-it:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             stream: '{stream}'
             OVS_VERSION: '2.4.0'
         - run-ovsdb-it:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             stream: '{stream}'
             OVS_VERSION: '2.5.0'
         - jacoco-nojava-workaround
         - email-notification:
             email-prefix: '[ovsdb]'
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
index 69d59299d8cbbff2302d9acc04f526a64a2cd525..44487210bf7adf3f01b2690568c9170aa058fdcb 100644 (file)
@@ -50,7 +50,7 @@
             !include-raw-escape:
                 - include-setup-hwvtep-docker.sh
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             pom: 'pom.xml'
             goals: 'clean install dependency:tree -V -B -Dsonar -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
             java-opts:
@@ -62,7 +62,7 @@
         - inject:
             properties-file: env.properties
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             pom: 'pom.xml'
             goals: 'verify -V -B -Pintegrationtest -Dsonar -Dskip.karaf.featureTest=true -Dovsdb.controller.address=${{CONTROLLER_IP}} -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
             properties:
@@ -74,7 +74,7 @@
             global-settings: 'odl-global-settings'
             global-settings-type: cfp
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             # We should switch to the recommended configuration of sonar once
             # JJB adds support for configurating the Sonar wrapper:
             #    http://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner+for+Jenkins
@@ -93,4 +93,4 @@
             email-prefix: '[ovsdb]'
         - jacoco-report
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
index 428425aa153b8c5a8de24a0abd6c8f76501f5029..e5791b883f1b648b47bc1b34fe0de4635abf8495 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -25,7 +23,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'ovsdb-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -45,8 +43,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -60,7 +56,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'ovsdb-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -80,8 +76,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - beryllium:
             disable_autorelease: False
@@ -96,7 +90,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'ovsdb-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index a73ac969361b144a72a01144bfbd86e4b9161de5..32dbb6cb5fc825de84d6b7c01c32d32bbb7fbd5e 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'packetcable-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'packetcable-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -90,7 +86,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'packetcable-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 531ee28e84136f78a0a827734507bdcfa1372797..08ad24273291df8fb6d25c4cda1598fbb50edfb8 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: True
@@ -25,7 +23,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'persistence-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -45,8 +43,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: True
@@ -60,7 +56,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'persistence-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -92,7 +88,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'persistence-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 5973ee550040e185b8ecd212af0bd4ebd41fb872..875b6c078b600ef557600fb25620751daaf2d369 100644 (file)
     archive-artifacts: ''
     branch: master
 
-    # Maven versions
-    mvn30: 'Maven 3.0.5'
-    mvn31: 'Maven 3.1.1'
-    mvn32: 'Maven 3.2.5'
-    mvn33: 'Maven 3.3.9'
-
     # Plot configuration
     01-plot-title: ''
     01-plot-yaxis: ''
index 87f0d9b2a60dc872471afc9ed72ebd940ba302df..8bd83398a4b730ee73cd4e85e43f91e0d0716f7a 100644 (file)
         - email-notification:
             email-prefix: '[releng]'
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 - job-template:
     name: builder-verify-python
         - email-notification:
             email-prefix: '[releng]'
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 - job-template:
     name: 'builder-merge'
         - email-notification:
             email-prefix: '[releng]'
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 - job-template:
     name: 'builder-weekly'
         - email-notification:
             email-prefix: '[releng]'
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 - job-template:
     name: builder-check-poms
         - email-notification:
             email-prefix: '[releng]'
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 - job-template:
     name: 'builder-verify-packer-{platforms}-{templates}'
         - email-notification:
             email-prefix: '[{project}]'
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 - job-template:
     name: 'builder-merge-packer-{platforms}-{templates}'
         - email-notification:
             email-prefix: '[{project}]'
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
index c6961aee37b78810c9f2a3618f83952473970fe3..3dabc46b9980974f7e364bac80ec40f6cc4d3e03 100644 (file)
             default: '{stage-id}'
             description: 'Nexus staging profile id'
 
+- parameter:
+    name: maven-exec
+    parameters:
+      - string:
+          name: MVN
+          default: '/w/tools/hudson.tasks.Maven_MavenInstallation/{maven-version}/bin/mvn'
+          description: 'Maven selector to be used by shell scripts'
+
 - scm:
     name: git-scm
     scm:
             script-only-if-failed: False
             mark-unstable-if-failed: True
         - workspace-cleanup:
+            exclude:
+              # autorelease-release-{stream} reqires vaiables.prop file to be preserved
+              # as the downstream test jobs fails invoke without automatically
+              - variables.prop
             fail-build: false
 
 - builder:
index 1226b9ca8b6ac0ed8bd51148cfe75f4b2f7d2e04..7b7b7aef1de7269925602abb0360f4f05deeb1da 100644 (file)
@@ -40,7 +40,7 @@
             global-settings-file: 'odl-global-settings'
             settings-file: '{mvn-settings}'
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             pom: 'pom.xml'
             goals: 'clean install dependency:tree com.sonatype.clm:clm-maven-plugin:index -V -B -Pq -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
             java-opts:
         - email-notification:
             email-prefix: '[{project-name}]'
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 - job-template:
     name: '{project-name}-distribution-{stream}'
 
     # Required variables:
-    #     stream:    release stream (eg. stable-lithium or beryllium)
-    #     branch:    git branch (eg. stable/lithium or master)
+    #     stream:    release stream (eg. boron or carbon)
+    #     branch:    git branch (eg. stable/boron or master)
 
     # Need to keep jobs that deploy to Nexus at end of build as Maven
     # projects. Maybe reconsider this once upstream moves deploy to a
             settings-file: '{mvn-settings}'
 
     maven:
-        maven-name: '{mvn33}'
+        maven-name: 'mvn33'
         root-pom: 'pom.xml'
         goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
             unique-version: true
             deploy-unstable: false
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 - job-template:
     # Template: {name}-distribution-check-{stream}
                 - patchset-created-event:
                     exclude-drafts: 'true'
                     exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'true'
+                    exclude-no-code-change: 'false'
                 - draft-published-event
                 - comment-added-contains-event:
                     comment-contains-value: 'test-distribution'
 
     builders:
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             pom: '$GERRIT_PROJECT/pom.xml'
             goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Pq -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
             java-opts:
             global-settings: 'odl-global-settings'
             global-settings-type: cfp
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             pom: 'distribution/pom.xml'
             goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
             java-opts:
         - archive:
             artifacts: '*.zip'
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 - job-template:
     name: '{project-name}-integration-{stream}'
     # is successfully built.
     #
     # Required Variables:
-    #     stream:    release stream (eg. stable-lithium or beryllium)
-    #     branch:    git branch (eg. stable/lithium or master)
+    #     stream:    release stream (eg. boron or carbon)
+    #     branch:    git branch (eg. stable/boron or master)
 
     project-type: freestyle
     node: '{build-node}'
             global-settings-file: 'odl-global-settings'
             settings-file: '{mvn-settings}'
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             goals: '{mvn-goals} -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
             java-opts:
               - '{mvn-opts}'
         - findbugs
         - jacoco-report
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 - job-template:
     name: '{project-name}-merge-{stream}'
     # and deploy artifacts to Nexus.
     #
     # Required Variables:
-    #     stream:    release stream (eg. stable-lithium or beryllium)
-    #     branch:    git branch (eg. stable/lithium or master)
+    #     stream:    release stream (eg. boron or carbon)
+    #     branch:    git branch (eg. stable/boron or master)
 
     # Need to keep jobs that deploy to Nexus at end of build as Maven
     # projects. Maybe reconsider this once upstream moves deploy to a
             settings-file: '{mvn-settings}'
 
     maven:
-        maven-name: '{mvn33}'
+        maven-name: 'mvn33'
         goals: '{mvn-goals} -V -B -Djenkins -Dmerge -Dstream={stream} -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '{mvn-opts}'
         settings: '{mvn-settings}'
             # project is configured in a certain way which ODL is not.
             steps:
             - maven-target:
-                maven-version: '{mvn33}'
+                maven-version: 'mvn33'
                 pom: pom.xml
                 goals: 'site:deploy -V -B -Dstream={stream}'
                 java-opts:
                 global-settings: 'odl-global-settings'
                 global-settings-type: cfp
             - maven-target:
-                maven-version: '{mvn33}'
+                maven-version: 'mvn33'
                 pom: deploy-site.xml
                 goals: 'site:deploy -V -B -Dstream={stream}'
                 java-opts:
             deploy-unstable: false
         - jacoco-report
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 - job-template:
     name: '{project-name}-periodic-{stream}'
     # builder.
     #
     # Required Variables:
-    #     stream:    release stream (eg. stable-lithium or beryllium)
-    #     branch:    git branch (eg. stable/lithium or master)
+    #     stream:    release stream (eg. boron or carbon)
+    #     branch:    git branch (eg. stable/boron or master)
 
     project-type: freestyle
     node: '{build-node}'
             global-settings-file: 'odl-global-settings'
             settings-file: '{mvn-settings}'
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             goals: '{mvn-goals} -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
             java-opts:
               - '{mvn-opts}'
         - jacoco-report
         - findbugs
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 - job-template:
     name: '{project-name}-sonar'
             global-settings-file: 'odl-global-settings'
             settings-file: '{mvn-settings}'
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             goals: '{mvn-goals} -V -B -Djenkins -Dsonar -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
             maven-opts:
               - '{mvn-opts}'
             global-settings: 'odl-global-settings'
             global-settings-type: cfp
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             # We should switch to the recommended configuration of sonar once
             # JJB adds support for configurating the Sonar wrapper:
             #    http://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner+for+Jenkins
         - jacoco-report
         - findbugs
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 - job-template:
     name: '{project-name}-validate-autorelease-{stream}'
         - autorelease-checkout-gerrit-patch
         - autorelease-generate-release-patches
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             pom: validate-pom.xml
             goals: 'clean install dependency:tree -V -B -T1.5C -Pq -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
             java-opts:
             global-settings: 'odl-global-settings'
             global-settings-type: cfp
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             pom: 'pom.xml'
             goals: 'clean validate -V -B -Pq -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
             java-opts:
         - email-notification:
             email-prefix: '[autorelease] [{project-name}]'
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 - job-template:
     name: '{project-name}-verify-{stream}-{maven}-{jdks}'
     # The purpose of this job template is to setup a ODL verify job
     #
     # Required Variables:
-    #     stream:    release stream (eg. stable-lithium or beryllium)
-    #     branch:    git branch (eg. stable/lithium or master)
+    #     stream:    release stream (eg. boron or carbon)
+    #     branch:    git branch (eg. stable/boron or master)
 
     project-type: freestyle
     node: '{build-node}'
index 1313166fdaa2984ab035b1c06fec46c3d43e9052..270820027e00aa11dc34578a4eaa0023b1b540ae 100644 (file)
@@ -42,7 +42,7 @@
             global-settings-file: 'odl-global-settings'
             settings-file: 'autorelease-settings'
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             pom: 'pom.xml'
             goals: 'clean deploy -V -B -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Djenkins -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage'
             java-opts:
@@ -57,7 +57,7 @@
         - email-notification:
             email-prefix: '[releng]'
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 
 - job-template:
         - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - releng-fetch-p2zip-if-necessary:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             settings: '{mvn-settings}'
             global-settings: 'odl-global-settings'
         - releng-generate-p2pom
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             pom: 'pom.xml'
             goals: 'clean deploy -V -B -Dmaven.repo.local=/tmp/r'
             settings: '{mvn-settings}'
@@ -98,7 +98,7 @@
             global-settings: 'odl-global-settings'
             global-settings-type: cfp
         - releng-update-p2composite-metadata:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             settings: '{mvn-settings}'
             global-settings: 'odl-global-settings'
 
         - email-notification:
             email-prefix: '[releng]'
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 # Python Related
 
     # template.
     #
     # Required Variables:
-    #     stream:    release stream (eg. stable-lithium or beryllium)
-    #     branch:    git branch (eg. stable/lithium or master)
+    #     stream:    release stream (eg. boron or carbon)
+    #     branch:    git branch (eg. stable/boron or master)
     #     toxdir:    directory containing the project's tox.ini relative to
     #                the workspace. Empty works if tox.ini is at project root.
 
         - email-notification:
             email-prefix: '[{project}]'
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 - job-template:
     name: '{project-name}-merge-rtd-{stream}'
         - email-notification:
             email-prefix: '[{project}]'
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 # Node related
 
     # virtualenv for nodejs.
     #
     # Required Variables:
-    #     stream:    release stream (eg. stable-lithium or beryllium)
-    #     branch:    git branch (eg. stable/lithium or master)
+    #     stream:    release stream (eg. boron or carbon)
+    #     branch:    git branch (eg. stable/boron or master)
     #     nodedir:   directory of nodejs project to run node test against
     #     nodever:   version of node to install in virtualenv
 
         - email-notification:
             email-prefix: '[{project}]'
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
index 26f1a3741b81a3fa2a18562df3d1897bdcda63f9..f103c6c0b0c6496a011bbbdf6ccfb6a99da9d67f 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'reservation-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'reservation-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -90,7 +86,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'reservation-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 31a1a1d467fa76249666e6a176afb71c8d3dd71d..98b63db9803cc1874a9e3ac114f3c7a7c220b712 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'sdninterfaceapp-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'sdninterfaceapp-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -90,7 +86,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'sdninterfaceapp-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 69dfee28f4557ea06e90afea24fe0958c5313687..042edc14f44d31d0d6d59c84ecbe39468694cd82 100644 (file)
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
 
     install:
+        - only:
+            scope: 'only'
         - all:
             scope: 'all'
 
-
     # Features to install
-    install-features: 'odl-sfc-provider-rest'
+    install-features: 'odl-sfc-provider,odl-sfc-ui,odl-sfc-openflow-renderer,odl-sfc-scf-openflow,odl-sfc-sb-rest,odl-sfc-ovs,odl-sfc-netconf'
 
     # Robot custom options
     robot-options: ''
index 24ab840082356283ebd5ca70b89ad5dad5e804ea..588885324c5383c6a2aecc34ba64a980e9bfcd18 100644 (file)
@@ -24,7 +24,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'sfc-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
@@ -58,7 +58,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'sfc-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
@@ -90,7 +90,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'sfc-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
index 8eb15b68874358adfb15e04ef93f571511838635..a1d9106ea13ae46051dc2a7b2730f98ec5a0da3e 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'snbi-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'snbi-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -91,7 +87,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'snbi-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 527ca9a638a186113bd711a9a683059ac21324d8..918a3d51a441d04c84fab2170c5d83d054241955 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'snmp-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'snmp-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -90,7 +86,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'snmp-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 74fb6a8e6eba871879b863fbec77860744bfb96c..a59c749effe46585bac57058a6921d3b06e5de10 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'snmp4sdn-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'snmp4sdn-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -90,7 +86,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'snmp4sdn-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 46df7cfc3938c30689f0e5d5550659da8e73261d..bae967075ba6a3f0ce637f2ed848b8cbd6fd5697 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'sxp-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'sxp-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -90,7 +86,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'sxp-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index fbaeb0699b89ab42ef3472b40b190d764a5827aa..2425a79da3ffe6f719a783d5ca76dd8bbb1bd9c1 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -25,7 +23,7 @@
 
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'tcpmd5-settings'
     mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -45,8 +43,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -60,7 +56,7 @@
 
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'tcpmd5-settings'
     mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -92,7 +88,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'tcpmd5-settings'
     mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 83547537cc73a249d1161d2f06736039e50ced85..c9170f7d1cfea614b8e1df2f88e3989a58e512af 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -25,7 +23,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'topoprocessing-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -45,8 +43,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -60,7 +56,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'topoprocessing-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -94,7 +90,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'topoprocessing-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     branch: 'master'
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'topoprocessing-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 29370953915526319606ed91921013d09f292ae4..36ebeff235f9cf958bb691da68356541a7a993e7 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'tsdr-settings'
     mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'tsdr-settings'
     mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -90,7 +86,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'tsdr-settings'
     mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 3206832a3aff8ebd744f01c39d997c5a8ae92631..250c982e52ec68e1975904c02f0cfe0212b9f079 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'ttp-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'ttp-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -90,7 +86,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'ttp-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index fdb871b5cf56a46239b76ba1295a498b2d61a3ab..0e35e0db055ff5046530b0d4261fee9aa81263e2 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -25,7 +23,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'unimgr-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -45,8 +43,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -60,7 +56,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'unimgr-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -94,7 +90,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'unimgr-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index e48a52662848612b2633d705cc03acddb6553ad3..90b163260a8395f40d85a5ed4fad42d9ef0fd993 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'usc-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'usc-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -90,7 +86,7 @@
       - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'usc-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 3ed7bc179fb5ee2302afb5ff59fa1983597e015d..cf838c68a1267ee43e0a8a317443d4d75817545b 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'usecplugin-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'usecplugin-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -91,7 +87,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'usecplugin-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 799942d8b917faab1ebf0ea2d7295b7e21bf0b55..ea1a970901e9575274b2f78ec69abb3abc8b50d9 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'vpnservice-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'vpnservice-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -78,8 +74,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - beryllium:
             disable_autorelease: False
@@ -93,7 +87,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'vpnservice-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index f16dab708866c3970eeffffb891b82b95d6c9481..0209c75bdd6f5402f2a61608b7f5a6b17a8319de 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{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'
@@ -48,8 +46,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -62,7 +58,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{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'
@@ -85,8 +81,6 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
 
     stream:
         - beryllium:
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{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'
index 68fb7ce2a2c5febff409ee52c94a4cefbba08ada..9b6312b94799075a43662ca441a6739d6aba859a 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'yang-push-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'yang-push-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -78,8 +74,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
       - beryllium:
           disable_autorelease: False
@@ -93,7 +87,7 @@
       - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'yang-push-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 1d43faf6b542e26773623e68ad6cd5f03756145d..afd52bf4ad70c9e54ac487074c0e0f0e18cc65d3 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: True
@@ -25,7 +23,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'yangide-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -45,8 +43,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: True
@@ -60,7 +56,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'yangide-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index a2472d9925cdc38c8e001bb5b0dcf59c1909d4dd..936624b7aceb2bd846029be9a165b734d3fcbfc9 100644 (file)
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -25,7 +23,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'yangtools-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -45,8 +43,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -60,9 +56,9 @@
         - openjdk8
     maven:
         - mvn32:
-            mvn-version: '{mvn32}'
+            mvn-version: 'mvn32'
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'yangtools-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -96,9 +92,9 @@
       - openjdk8
     maven:
         - mvn32:
-            mvn-version: '{mvn32}'
+            mvn-version: 'mvn32'
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'yangtools-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 095f1e38450cb2e2379fe550b978a6c3941576b3..c039e5976a223a6f0e3334eec3a75ac8fdffe453 100644 (file)
@@ -36,7 +36,7 @@ rpm --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E032808
 #Added the mono tools repository
 yum-config-manager -y --add-repo http://download.mono-project.com/repo/centos/
 #install the mono toolchain and nuget
-yum -y install mono-complete-4.2.3.4 nuget-2.8.7+md510+dhx1
+yum -y install mono-complete nuget
 #end changes for vsemprovider in VTN
 
 # The following installs hashicorp's packer binary which is required  for