Merge "'Update validate autorelease projects for fluorine"

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

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 549cb0ccbad478da383ed9400d257db7fa839b77..313595b3b5a0e82c033922fca8f7f163198194f7 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -3,8 +3,12 @@
 
 - defaults:
     name: global
+    functionality: global
+    stream: global
     prefix: ''  # A prefix for job names sandbox for example: user-
 
+    testplan: '{project}-{functionality}.txt'
+    streamtestplan: '{project}-{functionality}-{stream}.txt'
     karaf-version: karaf4
     build-days-to-keep: 30
     use-features-boot: 'True'
@@ -26,7 +30,7 @@
     devstack-networking-sfc-plugin-repo: 'https://github.com/openstack/networking-sfc'
 
     # lf-infra defaults
-    jenkins-ssh-credential: opendaylight-jenkins-ssh
+    jenkins-ssh-credential: jenkins-ssh
     gerrit-server-name: OpenDaylight
     mvn-site-id: opendaylight-site
     mvn-snapshot-id: opendaylight-snapshot
@@ -58,6 +62,7 @@
     tenant-network-type: 'vxlan'
     odl-sfc-driver: 'odl'
     odl-snat-mode: 'controller'
+    enable-itm-direct-tunnels: 'false'
     openstack_legacy_default_network_services: 'q-dhcp,q-meta,q-svc'
 
     # openstack-infra-parameters defaults
@@ -74,7 +79,7 @@
     sm-features: ''
 
     # CSIT images configuration
-    openstack_system_image_ocata: ZZCI - CentOS 7 - devstack-ocata - 20171208-1649
+    openstack_system_image_queens: ZZCI - CentOS 7 - devstack-pike - 20171208-1649
     openstack_system_image_pike: ZZCI - CentOS 7 - devstack-pike - 20171208-1649
     stack-template: csit-2-instance-type.yaml
     docker_system_count: 1