Merge "Disable Lithium jobs"

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

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 73fff6f9a54c204ad9875ec18ca81ce673b0698a..7adbcd8a55297b8cde63d496558ad5845aa8eaa2 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -33,7 +33,7 @@
 
     # CSIT images configuration
     controller-image: 'centos7-java-builder-2c-4g'
-    openstack-image: 'centos7-devstack-2c-4g'
+    openstack-image: 'centos7-devstack-2c-8g'
     mininet-image: 'ubuntu-trusty-mininet-2c-2g'
     mininet-vms: 1
     docker-image: 'centos7-docker-2c-4g'
@@ -43,3 +43,6 @@
 
     # Python
     toxdir: ''
+
+    # Default value to enable optional job disable by overriding it selectively
+    disabled: false