Merge changes from topic 'rm-devstack-ocata-images'

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

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index f2a600d00168f8c6411f16709007a391cf6ba0d3..bbdf8b45587f85699d4d7e08304ed8d13e616342 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
@@ -34,7 +38,7 @@
     nexus-snapshot-repo: opendaylight.snapshot
     git-url: 'ssh://jenkins-$SILO@git.opendaylight.org:29418'
     lftools-version: <1.0.0
-    packer-version: 1.1.3
+    packer-version: 1.2.4
 
     # defaults for parameters installing openstack for csit jobs
     devstack-hash: ''
@@ -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,6 @@
     sm-features: ''
 
     # CSIT images configuration
-    openstack_system_image_ocata: ZZCI - CentOS 7 - devstack-ocata - 20171208-1649
     openstack_system_image_pike: ZZCI - CentOS 7 - devstack-pike - 20171208-1649
     stack-template: csit-2-instance-type.yaml
     docker_system_count: 1
@@ -82,7 +86,7 @@
     docker_system_image: ZZCI - CentOS 7 - docker - 20180417-0311
     odl_system_count: 1
     odl_system_flavor: odl-highcpu-4
-    odl_system_image: ZZCI - CentOS 7 - builder - 20180201-2139
+    odl_system_image: ZZCI - CentOS 7 - builder - 20180611-1830
     openstack_system_count: 1
     openstack_system_flavor: odl-standard-4
     openstack_system_image: ZZCI - CentOS 7 - devstack - 20171208-1648