X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fdefaults.yaml;h=2f3bc4087eb3615993b88274b07807acf7885db8;hb=d9940a1954bf6956b7282174802c8419c6479fec;hp=bbc01757f5108bc2cb5d1a31428596d0ab3fb9ed;hpb=3b7c722fe676e9c3ae8ca93e1b8a3657abf03745;p=releng%2Fbuilder.git

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index bbc01757f..2f3bc4087 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -3,8 +3,14 @@
 
 - defaults:
     name: global
+    functionality: global
+    stream: global
     prefix: ''  # A prefix for job names sandbox for example: user-
 
+    scriptplan: '{project}.txt'
+    configplan: '{project}.txt'
+    testplan: '{project}-{functionality}.txt'
+    streamtestplan: '{project}-{functionality}-{stream}.txt'
     karaf-version: karaf4
     build-days-to-keep: 30
     use-features-boot: 'True'
@@ -26,7 +32,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
@@ -60,6 +66,10 @@
     odl-snat-mode: 'controller'
     enable-itm-direct-tunnels: 'false'
     openstack_legacy_default_network_services: 'q-dhcp,q-meta,q-svc'
+    os-cmb-cnt: 1
+    os-ctl-cnt: 0
+    os-cmp-cnt: 0
+    os-std-topo: '0cmb-1ctl-2cmp'
 
     # openstack-infra-parameters defaults
     archive-artifacts: ''
@@ -75,7 +85,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
@@ -188,9 +198,9 @@
 
     # Manual CSIT job lists used by sanity or periodic in nature.
     csit-high-frequency-list-fluorine: >
-        netvirt-csit-1node-openstack-queens-upstream-stateful-fluorine
+        netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-fluorine
     csit-high-frequency-list-oxygen: >
-        netvirt-csit-1node-openstack-queens-upstream-stateful-oxygen
+        netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-oxygen
     csit-sanity-list-fluorine: >
         openflowplugin-csit-1node-sanity-only-fluorine,
         distribution-sanity-fluorine