Merge "Upgrade build node and increase build timeout"

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

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index dd99e39df603f00ef8f8790c0f9b1813a32c10a9..632fb631fb789de7f1a9d763ef42220ed97243b3 100644 (file)
--- 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'