Merge "Migrate sfc to global-jjb Maven jobs"

[releng/builder.git] / jjb / releng-defaults.yaml

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 81efcf2f0fb748c9acbaf77388c30146e2747740..7aada581a3a170f77d5cc7724e24ddafd142bb0e 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -64,13 +64,16 @@
     bundle-url: 'last'
 
     # CSIT images configuration
+    openstack_system_image_newton: 'CentOS 7 - devstack-newton - 20171014-2147'
+    openstack_system_image_ocata: 'CentOS 7 - devstack-ocata - 20171016-0219'
+    openstack_system_image_pike: 'CentOS 7 - devstack-pike - 20171014-2148'
     stack-template: csit-2-instance-type.yaml
     docker_system_count: 1
     docker_system_flavor: 4 GB General Purpose v1
     docker_system_image: CentOS 7 - docker - 20171016-0023
     odl_system_count: 1
     odl_system_flavor: 4 GB General Purpose v1
-    odl_system_image: CentOS 7 - java-builder - 20170807-2145
+    odl_system_image: CentOS 7 - java-builder - 20171030-1039
     openstack_system_count: 1
     openstack_system_flavor: 8 GB General Purpose v1
     openstack_system_image: CentOS 7 - devstack - 20171014-2147
@@ -79,7 +82,7 @@
     openstack_system2_image: CentOS 7 - devstack - 20171014-2147
     tools_system_count: 1
     tools_system_flavor: 2 GB General Purpose v1
-    tools_system_image: Ubuntu 14.04 - mininet - 20170808-0158
+    tools_system_image: Ubuntu 14.04 - mininet - 20171001-1002
 
     # Default Robot framework options
     robot-options: ''
@@ -110,6 +113,9 @@
         -T1.5C
         {opendaylight-infra-mvn-opts}
 
+    # JavaDoc
+    javadoc-path: org.opendaylight.$PROJECT/$STREAM
+
     # Python
     toxdir: ''
 
@@ -192,7 +198,7 @@
         bgpcep-csit-3node-bgpclustering-longevity-only-oxygen,
         distribution-deploy-oxygen,
         distribution-offline-oxygen,
-        openflowplugin-csit-1node-periodic-longevity-only-oxygen
+        openflowplugin-csit-1node-longevity-only-oxygen
     csit-weekly-list-nitrogen: >
         controller-csit-1node-notifications-longevity-only-nitrogen,
         controller-csit-3node-drb-partnheal-longevity-only-nitrogen,
@@ -201,7 +207,7 @@
         bgpcep-csit-3node-bgpclustering-longevity-only-nitrogen,
         distribution-deploy-nitrogen,
         distribution-offline-nitrogen,
-        openflowplugin-csit-1node-periodic-longevity-only-nitrogen
+        openflowplugin-csit-1node-longevity-only-nitrogen
     csit-weekly-list-carbon: >
         controller-csit-1node-notifications-longevity-only-carbon,
         controller-csit-3node-cs-chasing-leader-longevity-only-carbon,
@@ -212,4 +218,4 @@
         bgpcep-csit-3node-bgpclustering-longevity-only-carbon,
         distribution-deploy-carbon,
         distribution-offline-carbon,
-        openflowplugin-csit-1node-periodic-longevity-only-carbon
+        openflowplugin-csit-1node-longevity-only-carbon