X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-defaults.yaml;h=1fa078c85f12b1854c5bff4233ffabf1a1b1edab;hb=10833fd3e59e313340cd9f20f7876cc466bd13dc;hp=85ce51653df475a882e37ac2fef289a573d4cf81;hpb=9a10200dc0d11335e5a0a5cac924f6ffd95d1689;p=releng%2Fbuilder.git

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 85ce51653..1fa078c85 100644
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -25,8 +25,6 @@
     # lf-infra defaults
     jenkins-ssh-credential: opendaylight-jenkins-ssh
     gerrit-server-name: OpenDaylight
-    # server-name is deprecated, use gerrit-server-name moving forward.
-    server-name: 'OpenDaylight'
     mvn-site-id: opendaylight-site
     mvn-staging-id: opendaylight-staging
     git-url: 'ssh://jenkins-$SILO@git.opendaylight.org:29418'
@@ -64,22 +62,25 @@
     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 - 20170808-0528
+    openstack_system_image: CentOS 7 - devstack - 20171014-2147
     openstack_system2_count: 0
     openstack_system2_flavor: 2 GB General Purpose v1
-    openstack_system2_image: CentOS 7 - devstack - 20170808-0528
+    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 +111,9 @@
         -T1.5C
         {opendaylight-infra-mvn-opts}
 
+    # JavaDoc
+    javadoc-path: org.opendaylight.$PROJECT/$STREAM
+
     # Python
     toxdir: ''
 
@@ -192,7 +196,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 +205,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 +216,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