Merge "Add sfc features and update carbon project branch"

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

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 15c995b6024ed2b688be5f626f78b15c161cb3da..5973ee550040e185b8ecd212af0bd4ebd41fb872 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -9,6 +9,11 @@
     build-artifact-num-to-keep: 5
     # Timeout in minutes
     build-timeout: 360
+    build-node: centos7-java-builder-2c-8g
+
+    # openstack-infra-parameters defaults
+    archive-artifacts: ''
+    branch: master
 
     # Maven versions
     mvn30: 'Maven 3.0.5'
@@ -27,10 +32,11 @@
     02-plot-data-file: 'plot-data.csv'
 
     # CSIT images configuration
-    controller-image: 'centos7-java'
-    openstack-image: 'centos7-devstack'
-    mininet-image: 'ubuntu-trusty-mininet'
+    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'
 
     # In case a CSIT job is merged without Java version specified
     jdk: 'openjdk8'