X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-defaults.yaml;h=89fe3b5b4a97b65cebdf61ce085252383eab2107;hb=8d150807cf859713131d6d80b1918dd49e841ad9;hp=4b8ba08b1e397411167b4c1ca2cdcfadc8f7a225;hpb=0d27c179f6a36800d4acfd0dcf2b5597de88ab88;p=releng%2Fbuilder.git

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 4b8ba08b1..89fe3b5b4 100644
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -4,9 +4,7 @@
     name: global
 
     build-days-to-keep: 30
-    build-num-to-keep: 40
-    build-artifact-days-to-keep: -1
-    build-artifact-num-to-keep: 5
+
     # Timeout in minutes
     build-timeout: 360
     build-node: centos7-java-builder-2c-8g
@@ -14,17 +12,37 @@
     email-recipients: 'jenkins@lists.opendaylight.org'
     odl-ml2-driver-repo: 'https://github.com/openstack/networking-odl'
     server-name: 'OpenDaylight'
+    git-url: 'ssh://jenkins-$SILO@git.opendaylight.org:29418'
 
     # openstack-infra-parameters defaults
     archive-artifacts: ''
     branch: master
 
-   # CSIT images configuration
+    # Distribution bundle URL
+    bundleurl: 'last'
+
+    # CSIT images configuration
     controller-image: 'centos7-java-builder-2c-4g'
     openstack-image: 'centos7-devstack-2c-8g'
     mininet-image: 'ubuntu-trusty-mininet-2c-2g'
     mininet-vms: 1
     docker-image: 'centos7-docker-2c-4g'
+    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 - 20161031-0802
+    odl_system_count: 1
+    odl_system_flavor: 4 GB General Purpose v1
+    odl_system_image: CentOS 7 - java-builder - 20161031-0802
+    openstack_system_count: 1
+    openstack_system_flavor: 8 GB General Purpose v1
+    openstack_system_image: CentOS 7 - devstack - 20161031-0802
+    tools_system_count: 1
+    tools_system_flavor: 2 GB General Purpose v1
+    tools_system_image: Ubuntu 14.04 - mininet - 20161031-0803
+
+    # Robot
+    robot-options: ''
 
     # In case a CSIT job is merged without Java version specified
     jdk: 'openjdk8'