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 76faffa180b61d7d05b40787762fb48a56236797..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 - 20171014-2148
+    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
@@ -110,6 +113,9 @@
         -T1.5C
         {opendaylight-infra-mvn-opts}
 
+    # JavaDoc
+    javadoc-path: org.opendaylight.$PROJECT/$STREAM
+
     # Python
     toxdir: ''