X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdefaults.yaml;h=8f91a7f7b4ff7e733724e2f3d5ff98041c85aa01;hb=fb8aea9c9c29651f761019b325dee04957b3d293;hp=ea08713339ef92f922c8dfbaa7295321383eb826;hpb=db825845f79ced9b8f979ab582de919c271d5a86;p=releng%2Fbuilder.git

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index ea0871333..8f91a7f7b 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -3,14 +3,8 @@
 
 - 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'
@@ -89,8 +83,8 @@
     sm-features: ''
 
     # CSIT images configuration
-    openstack_system_image_queens: ZZCI - CentOS 7 - devstack-queens - 20181101-190143.891
-    openstack_system_image_pike: ZZCI - CentOS 7 - devstack-pike - 20171208-1649
+    openstack_queens_system_image: ZZCI - CentOS 7 - devstack-queens - 20181101-190143.891
+    openstack_pike_system_image: ZZCI - CentOS 7 - devstack-pike - 20171208-1649
     stack-template: csit-2-instance-type.yaml
     docker_system_count: 1
     docker_system_flavor: odl-standard-1
@@ -129,7 +123,6 @@
     opendaylight-infra-mvn-opts: |
         --show-version
         --batch-mode
-        -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
         -Djenkins
         -Dmaven.repo.local=/tmp/r
         -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r