tcwg/round-robin.yaml.inc: Cleanup parameter definitions

Change-Id: Ic7392b3c3c0eee306b050eab57d200a7057c9504

9 files changed, 319 insertions, 361 deletions

diff --git a/tcwg/round-robin.yaml.inc b/tcwg/round-robin.yaml.inc
index 100a704b27..d79b85c7b8 100644
--- a/tcwg/round-robin.yaml.inc
+++ b/tcwg/round-robin.yaml.inc
@@ -100,6 +100,14 @@
     name: default-parameters
     parameters:
       - string:
+          name: ci_project
+          default: '{ci_project}'
+          description: "CI project ID; used as namespace for git branches"
+      - string:
+          name: ci_config
+          default: '{ci_config}'
+          description: "CI configuration ID"
+      - string:
           name: extra_build_params
           default: ""
           description: "Extra parameters to pass to the build script"
@@ -122,7 +130,6 @@
           description: 'Benchmark scripts revision to use'
 #endif
 
-
 - builder:
     name: trigger-followup-builds
     builders:
@@ -163,66 +170,51 @@
           users:
             - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
 
+
 - parameter:
-    name: build-parameters
+    name: component-parameters
     parameters:
       - string:
-          name: ci_project
-          default: '{ci_project}'
-          description: "CI project ID; used as namespace for git branches"
+          name: '{component}_url'
+          default: '{url}'
+          description: "{component} git URL"
       - string:
-          name: ci_config
-          default: '{ci_config}'
-          description: "CI configuration ID"
+          name: '{component}_branch'
+          default: '{branch}'
+          description: "{component} branch or sha1 to build, or 'baseline'"
+
+- parameter:
+    name: build-parameters
+    parameters:
 #if COMPONENTS_binutils
-      - string:
-          name: binutils_url
-          default: '{binutils_url}'
-          description: "binutils git URL"
-      - string:
-          name: binutils_branch
-          default: '{default_branch}'
-          description: "binutils branch or sha1 to build, or 'baseline'"
+      - component-parameters:
+          component: binutils
+          url: '{binutils_url}'
+          branch: '{default_branch}'
 #endif
 #if COMPONENTS_gcc
-      - string:
-          name: gcc_url
-          default: '{gcc_url}'
-          description: "gcc git URL"
-      - string:
-          name: gcc_branch
-          default: '{default_branch}'
-          description: "gcc branch or sha1 to build, or 'baseline'"
+      - component-parameters:
+          component: gcc
+          url: '{gcc_url}'
+          branch: '{default_branch}'
 #endif
 #if COMPONENTS_glibc
-      - string:
-          name: glibc_url
-          default: '{glibc_url}'
-          description: "glibc git URL"
-      - string:
-          name: glibc_branch
-          default: '{default_branch}'
-          description: "glibc branch or sha1 to build, or 'baseline'"
+      - component-parameters:
+          component: glibc
+          url: '{glibc_url}'
+          branch: '{default_branch}'
 #endif
 #if COMPONENTS_llvm
-      - string:
-          name: llvm_url
-          default: '{llvm_url}'
-          description: "llvm git URL"
-      - string:
-          name: llvm_branch
-          default: '{default_branch}'
-          description: "llvm branch or sha1 to build, or 'baseline'"
+      - component-parameters:
+          component: llvm
+          url: '{llvm_url}'
+          branch: '{default_branch}'
 #endif
 #if COMPONENTS_linux
-      - string:
-          name: linux_url
-          default: '{linux_url}'
-          description: "linux git URL"
-      - string:
-          name: linux_branch
-          default: default
-          description: "linux branch or sha1 to build"
+      - component-parameters:
+          component: linux
+          url: '{linux_url}'
+          branch: '{default_branch}'
 #endif
       - choice:
           name: update_baseline
@@ -232,7 +224,9 @@
             - init
             - push
           description: "What to do with baseline in this build"
-      - default-parameters
+      - default-parameters:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
 
 - builder:
     name: run-build
@@ -373,14 +367,6 @@
     name: bisect-parameters
     parameters:
       - string:
-          name: ci_project
-          default: '{ci_project}'
-          description: "CI project ID; used as namespace for git branches"
-      - string:
-          name: ci_config
-          default: '{ci_config}'
-          description: "CI configuration ID"
-      - string:
           name: current_project
           default: ""
           description: "Project to bisect"
@@ -395,7 +381,9 @@
       - file:
           name: jenkins-scripts/replay_log
           description: "Replay part of bisect using provided bisect log"
-      - default-parameters
+      - default-parameters:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
 
 - builder:
     name: run-bisect
diff --git a/tcwg_bmk_ci_gnu.yaml b/tcwg_bmk_ci_gnu.yaml
index 8ee57ba032..6534e56b1b 100644
--- a/tcwg_bmk_ci_gnu.yaml
+++ b/tcwg_bmk_ci_gnu.yaml
@@ -135,6 +135,14 @@
     name: default-parameters
     parameters:
       - string:
+          name: ci_project
+          default: '{ci_project}'
+          description: "CI project ID; used as namespace for git branches"
+      - string:
+          name: ci_config
+          default: '{ci_config}'
+          description: "CI configuration ID"
+      - string:
           name: extra_build_params
           default: ""
           description: "Extra parameters to pass to the build script"
@@ -155,7 +163,6 @@
           default: master
           description: 'Benchmark scripts revision to use'
 
-
 - builder:
     name: trigger-followup-builds
     builders:
@@ -194,41 +201,34 @@
           users:
             - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
 
+
 - parameter:
-    name: build-parameters
+    name: component-parameters
     parameters:
       - string:
-          name: ci_project
-          default: '{ci_project}'
-          description: "CI project ID; used as namespace for git branches"
-      - string:
-          name: ci_config
-          default: '{ci_config}'
-          description: "CI configuration ID"
+          name: '{component}_url'
+          default: '{url}'
+          description: "{component} git URL"
       - string:
-          name: binutils_url
-          default: '{binutils_url}'
-          description: "binutils git URL"
-      - string:
-          name: binutils_branch
-          default: '{default_branch}'
-          description: "binutils branch or sha1 to build, or 'baseline'"
-      - string:
-          name: gcc_url
-          default: '{gcc_url}'
-          description: "gcc git URL"
-      - string:
-          name: gcc_branch
-          default: '{default_branch}'
-          description: "gcc branch or sha1 to build, or 'baseline'"
-      - string:
-          name: glibc_url
-          default: '{glibc_url}'
-          description: "glibc git URL"
-      - string:
-          name: glibc_branch
-          default: '{default_branch}'
-          description: "glibc branch or sha1 to build, or 'baseline'"
+          name: '{component}_branch'
+          default: '{branch}'
+          description: "{component} branch or sha1 to build, or 'baseline'"
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - component-parameters:
+          component: binutils
+          url: '{binutils_url}'
+          branch: '{default_branch}'
+      - component-parameters:
+          component: gcc
+          url: '{gcc_url}'
+          branch: '{default_branch}'
+      - component-parameters:
+          component: glibc
+          url: '{glibc_url}'
+          branch: '{default_branch}'
       - choice:
           name: update_baseline
           choices:
@@ -237,7 +237,9 @@
             - init
             - push
           description: "What to do with baseline in this build"
-      - default-parameters
+      - default-parameters:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
 
 - builder:
     name: run-build
@@ -345,14 +347,6 @@
     name: bisect-parameters
     parameters:
       - string:
-          name: ci_project
-          default: '{ci_project}'
-          description: "CI project ID; used as namespace for git branches"
-      - string:
-          name: ci_config
-          default: '{ci_config}'
-          description: "CI configuration ID"
-      - string:
           name: current_project
           default: ""
           description: "Project to bisect"
@@ -367,7 +361,9 @@
       - file:
           name: jenkins-scripts/replay_log
           description: "Replay part of bisect using provided bisect log"
-      - default-parameters
+      - default-parameters:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
 
 - builder:
     name: run-bisect
@@ -552,4 +548,4 @@
           ci_project_config: 'tcwg_bmk_{hw}-gnu-{toolchain_ver}-{target}-{bmk}-{cflags}'
     publishers:
         - bisect-publishers
-# checksum: c63246ec0a21346e07348c907aebb9b5
+# checksum: d51354f06d6e3c4ffd33cb139ade1d79
diff --git a/tcwg_bmk_ci_llvm.yaml b/tcwg_bmk_ci_llvm.yaml
index d30f20164f..99266435d4 100644
--- a/tcwg_bmk_ci_llvm.yaml
+++ b/tcwg_bmk_ci_llvm.yaml
@@ -152,6 +152,14 @@
     name: default-parameters
     parameters:
       - string:
+          name: ci_project
+          default: '{ci_project}'
+          description: "CI project ID; used as namespace for git branches"
+      - string:
+          name: ci_config
+          default: '{ci_config}'
+          description: "CI configuration ID"
+      - string:
           name: extra_build_params
           default: ""
           description: "Extra parameters to pass to the build script"
@@ -172,7 +180,6 @@
           default: master
           description: 'Benchmark scripts revision to use'
 
-
 - builder:
     name: trigger-followup-builds
     builders:
@@ -211,49 +218,38 @@
           users:
             - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
 
+
 - parameter:
-    name: build-parameters
+    name: component-parameters
     parameters:
       - string:
-          name: ci_project
-          default: '{ci_project}'
-          description: "CI project ID; used as namespace for git branches"
-      - string:
-          name: ci_config
-          default: '{ci_config}'
-          description: "CI configuration ID"
-      - string:
-          name: binutils_url
-          default: '{binutils_url}'
-          description: "binutils git URL"
+          name: '{component}_url'
+          default: '{url}'
+          description: "{component} git URL"
       - string:
-          name: binutils_branch
-          default: '{default_branch}'
-          description: "binutils branch or sha1 to build, or 'baseline'"
-      - string:
-          name: gcc_url
-          default: '{gcc_url}'
-          description: "gcc git URL"
-      - string:
-          name: gcc_branch
-          default: '{default_branch}'
-          description: "gcc branch or sha1 to build, or 'baseline'"
-      - string:
-          name: glibc_url
-          default: '{glibc_url}'
-          description: "glibc git URL"
-      - string:
-          name: glibc_branch
-          default: '{default_branch}'
-          description: "glibc branch or sha1 to build, or 'baseline'"
-      - string:
-          name: llvm_url
-          default: '{llvm_url}'
-          description: "llvm git URL"
-      - string:
-          name: llvm_branch
-          default: '{default_branch}'
-          description: "llvm branch or sha1 to build, or 'baseline'"
+          name: '{component}_branch'
+          default: '{branch}'
+          description: "{component} branch or sha1 to build, or 'baseline'"
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - component-parameters:
+          component: binutils
+          url: '{binutils_url}'
+          branch: '{default_branch}'
+      - component-parameters:
+          component: gcc
+          url: '{gcc_url}'
+          branch: '{default_branch}'
+      - component-parameters:
+          component: glibc
+          url: '{glibc_url}'
+          branch: '{default_branch}'
+      - component-parameters:
+          component: llvm
+          url: '{llvm_url}'
+          branch: '{default_branch}'
       - choice:
           name: update_baseline
           choices:
@@ -262,7 +258,9 @@
             - init
             - push
           description: "What to do with baseline in this build"
-      - default-parameters
+      - default-parameters:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
 
 - builder:
     name: run-build
@@ -370,14 +368,6 @@
     name: bisect-parameters
     parameters:
       - string:
-          name: ci_project
-          default: '{ci_project}'
-          description: "CI project ID; used as namespace for git branches"
-      - string:
-          name: ci_config
-          default: '{ci_config}'
-          description: "CI configuration ID"
-      - string:
           name: current_project
           default: ""
           description: "Project to bisect"
@@ -392,7 +382,9 @@
       - file:
           name: jenkins-scripts/replay_log
           description: "Replay part of bisect using provided bisect log"
-      - default-parameters
+      - default-parameters:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
 
 - builder:
     name: run-bisect
@@ -581,4 +573,4 @@
           ci_project_config: 'tcwg_bmk_{hw}-llvm-{toolchain_ver}-{target}-{bmk}-{cflags}'
     publishers:
         - bisect-publishers
-# checksum: 843a8a3e97cbb7750f52be90396dce1e
+# checksum: 23b2b4b483b83e956e42d37e8d22b6ea
diff --git a/tcwg_bmk_dev_gnu.yaml b/tcwg_bmk_dev_gnu.yaml
index 5244df4a47..aa5af9cd6c 100644
--- a/tcwg_bmk_dev_gnu.yaml
+++ b/tcwg_bmk_dev_gnu.yaml
@@ -67,6 +67,14 @@
     name: default-parameters
     parameters:
       - string:
+          name: ci_project
+          default: '{ci_project}'
+          description: "CI project ID; used as namespace for git branches"
+      - string:
+          name: ci_config
+          default: '{ci_config}'
+          description: "CI configuration ID"
+      - string:
           name: extra_build_params
           default: ""
           description: "Extra parameters to pass to the build script"
@@ -87,7 +95,6 @@
           default: master
           description: 'Benchmark scripts revision to use'
 
-
 - builder:
     name: trigger-followup-builds
     builders:
@@ -126,41 +133,34 @@
           users:
             - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
 
+
 - parameter:
-    name: build-parameters
+    name: component-parameters
     parameters:
       - string:
-          name: ci_project
-          default: '{ci_project}'
-          description: "CI project ID; used as namespace for git branches"
-      - string:
-          name: ci_config
-          default: '{ci_config}'
-          description: "CI configuration ID"
+          name: '{component}_url'
+          default: '{url}'
+          description: "{component} git URL"
       - string:
-          name: binutils_url
-          default: '{binutils_url}'
-          description: "binutils git URL"
-      - string:
-          name: binutils_branch
-          default: '{default_branch}'
-          description: "binutils branch or sha1 to build, or 'baseline'"
-      - string:
-          name: gcc_url
-          default: '{gcc_url}'
-          description: "gcc git URL"
-      - string:
-          name: gcc_branch
-          default: '{default_branch}'
-          description: "gcc branch or sha1 to build, or 'baseline'"
-      - string:
-          name: glibc_url
-          default: '{glibc_url}'
-          description: "glibc git URL"
-      - string:
-          name: glibc_branch
-          default: '{default_branch}'
-          description: "glibc branch or sha1 to build, or 'baseline'"
+          name: '{component}_branch'
+          default: '{branch}'
+          description: "{component} branch or sha1 to build, or 'baseline'"
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - component-parameters:
+          component: binutils
+          url: '{binutils_url}'
+          branch: '{default_branch}'
+      - component-parameters:
+          component: gcc
+          url: '{gcc_url}'
+          branch: '{default_branch}'
+      - component-parameters:
+          component: glibc
+          url: '{glibc_url}'
+          branch: '{default_branch}'
       - choice:
           name: update_baseline
           choices:
@@ -169,7 +169,9 @@
             - init
             - push
           description: "What to do with baseline in this build"
-      - default-parameters
+      - default-parameters:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
 
 - builder:
     name: run-build
@@ -269,14 +271,6 @@
     name: bisect-parameters
     parameters:
       - string:
-          name: ci_project
-          default: '{ci_project}'
-          description: "CI project ID; used as namespace for git branches"
-      - string:
-          name: ci_config
-          default: '{ci_config}'
-          description: "CI configuration ID"
-      - string:
           name: current_project
           default: ""
           description: "Project to bisect"
@@ -291,7 +285,9 @@
       - file:
           name: jenkins-scripts/replay_log
           description: "Replay part of bisect using provided bisect log"
-      - default-parameters
+      - default-parameters:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
 
 - builder:
     name: run-bisect
@@ -472,4 +468,4 @@
             ci_project_config: 'tcwg_bmk_{hw}'
     publishers:
         - bisect-publishers
-# checksum: 65d89e1e86ee3a0c25d90dc2635a28bb
+# checksum: 984eb574dd9a8b8ee5935af035b42ef2
diff --git a/tcwg_bmk_dev_llvm.yaml b/tcwg_bmk_dev_llvm.yaml
index 415b84ae74..b759ef48d2 100644
--- a/tcwg_bmk_dev_llvm.yaml
+++ b/tcwg_bmk_dev_llvm.yaml
@@ -81,6 +81,14 @@
     name: default-parameters
     parameters:
       - string:
+          name: ci_project
+          default: '{ci_project}'
+          description: "CI project ID; used as namespace for git branches"
+      - string:
+          name: ci_config
+          default: '{ci_config}'
+          description: "CI configuration ID"
+      - string:
           name: extra_build_params
           default: ""
           description: "Extra parameters to pass to the build script"
@@ -101,7 +109,6 @@
           default: master
           description: 'Benchmark scripts revision to use'
 
-
 - builder:
     name: trigger-followup-builds
     builders:
@@ -140,49 +147,38 @@
           users:
             - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
 
+
 - parameter:
-    name: build-parameters
+    name: component-parameters
     parameters:
       - string:
-          name: ci_project
-          default: '{ci_project}'
-          description: "CI project ID; used as namespace for git branches"
-      - string:
-          name: ci_config
-          default: '{ci_config}'
-          description: "CI configuration ID"
-      - string:
-          name: binutils_url
-          default: '{binutils_url}'
-          description: "binutils git URL"
+          name: '{component}_url'
+          default: '{url}'
+          description: "{component} git URL"
       - string:
-          name: binutils_branch
-          default: '{default_branch}'
-          description: "binutils branch or sha1 to build, or 'baseline'"
-      - string:
-          name: gcc_url
-          default: '{gcc_url}'
-          description: "gcc git URL"
-      - string:
-          name: gcc_branch
-          default: '{default_branch}'
-          description: "gcc branch or sha1 to build, or 'baseline'"
-      - string:
-          name: glibc_url
-          default: '{glibc_url}'
-          description: "glibc git URL"
-      - string:
-          name: glibc_branch
-          default: '{default_branch}'
-          description: "glibc branch or sha1 to build, or 'baseline'"
-      - string:
-          name: llvm_url
-          default: '{llvm_url}'
-          description: "llvm git URL"
-      - string:
-          name: llvm_branch
-          default: '{default_branch}'
-          description: "llvm branch or sha1 to build, or 'baseline'"
+          name: '{component}_branch'
+          default: '{branch}'
+          description: "{component} branch or sha1 to build, or 'baseline'"
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - component-parameters:
+          component: binutils
+          url: '{binutils_url}'
+          branch: '{default_branch}'
+      - component-parameters:
+          component: gcc
+          url: '{gcc_url}'
+          branch: '{default_branch}'
+      - component-parameters:
+          component: glibc
+          url: '{glibc_url}'
+          branch: '{default_branch}'
+      - component-parameters:
+          component: llvm
+          url: '{llvm_url}'
+          branch: '{default_branch}'
       - choice:
           name: update_baseline
           choices:
@@ -191,7 +187,9 @@
             - init
             - push
           description: "What to do with baseline in this build"
-      - default-parameters
+      - default-parameters:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
 
 - builder:
     name: run-build
@@ -291,14 +289,6 @@
     name: bisect-parameters
     parameters:
       - string:
-          name: ci_project
-          default: '{ci_project}'
-          description: "CI project ID; used as namespace for git branches"
-      - string:
-          name: ci_config
-          default: '{ci_config}'
-          description: "CI configuration ID"
-      - string:
           name: current_project
           default: ""
           description: "Project to bisect"
@@ -313,7 +303,9 @@
       - file:
           name: jenkins-scripts/replay_log
           description: "Replay part of bisect using provided bisect log"
-      - default-parameters
+      - default-parameters:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
 
 - builder:
     name: run-bisect
@@ -495,4 +487,4 @@
             ci_project_config: 'tcwg_bmk_{hw}'
     publishers:
         - bisect-publishers
-# checksum: 1b4de7831ac5727b6e7078bdf69bdd9c
+# checksum: 2b851b0c24312cb5f2357cc06c0c1176
diff --git a/tcwg_gnu.yaml b/tcwg_gnu.yaml
index 3d1059a47f..5c26f4c1c2 100644
--- a/tcwg_gnu.yaml
+++ b/tcwg_gnu.yaml
@@ -100,6 +100,14 @@
     name: default-parameters
     parameters:
       - string:
+          name: ci_project
+          default: '{ci_project}'
+          description: "CI project ID; used as namespace for git branches"
+      - string:
+          name: ci_config
+          default: '{ci_config}'
+          description: "CI configuration ID"
+      - string:
           name: extra_build_params
           default: ""
           description: "Extra parameters to pass to the build script"
@@ -116,7 +124,6 @@
           default: master
           description: 'Scripts revision to use'
 
-
 - builder:
     name: trigger-followup-builds
     builders:
@@ -154,33 +161,30 @@
           users:
             - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
 
+
 - parameter:
-    name: build-parameters
+    name: component-parameters
     parameters:
       - string:
-          name: ci_project
-          default: '{ci_project}'
-          description: "CI project ID; used as namespace for git branches"
-      - string:
-          name: ci_config
-          default: '{ci_config}'
-          description: "CI configuration ID"
-      - string:
-          name: binutils_url
-          default: '{binutils_url}'
-          description: "binutils git URL"
-      - string:
-          name: binutils_branch
-          default: '{default_branch}'
-          description: "binutils branch or sha1 to build, or 'baseline'"
+          name: '{component}_url'
+          default: '{url}'
+          description: "{component} git URL"
       - string:
-          name: gcc_url
-          default: '{gcc_url}'
-          description: "gcc git URL"
-      - string:
-          name: gcc_branch
-          default: '{default_branch}'
-          description: "gcc branch or sha1 to build, or 'baseline'"
+          name: '{component}_branch'
+          default: '{branch}'
+          description: "{component} branch or sha1 to build, or 'baseline'"
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - component-parameters:
+          component: binutils
+          url: '{binutils_url}'
+          branch: '{default_branch}'
+      - component-parameters:
+          component: gcc
+          url: '{gcc_url}'
+          branch: '{default_branch}'
       - choice:
           name: update_baseline
           choices:
@@ -189,7 +193,9 @@
             - init
             - push
           description: "What to do with baseline in this build"
-      - default-parameters
+      - default-parameters:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
 
 - builder:
     name: run-build
@@ -286,14 +292,6 @@
     name: bisect-parameters
     parameters:
       - string:
-          name: ci_project
-          default: '{ci_project}'
-          description: "CI project ID; used as namespace for git branches"
-      - string:
-          name: ci_config
-          default: '{ci_config}'
-          description: "CI configuration ID"
-      - string:
           name: current_project
           default: ""
           description: "Project to bisect"
@@ -308,7 +306,9 @@
       - file:
           name: jenkins-scripts/replay_log
           description: "Replay part of bisect using provided bisect log"
-      - default-parameters
+      - default-parameters:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
 
 - builder:
     name: run-bisect
@@ -396,7 +396,6 @@
       - build-parameters:
           ci_project: 'tcwg_gnu'
           ci_config: '{toolchain_name}-{toolchain_ver}-{target}-{type_of_test}'
-          description: "CI configuration ID"
           binutils_url: '{binutils_url}'
           gcc_url: '{gcc_url}'
           default_branch: 'default'
@@ -466,4 +465,4 @@
           ci_project_config: '{toolchain_name}-{toolchain_ver}-{target}-{type_of_test}'
     publishers:
       - bisect-publishers
-# checksum: 588e1ae170fca93f9b7b3835fc154eac
+# checksum: 643e3348818ad62e92fc9d87950709a9
diff --git a/tcwg_gnu.yaml.in b/tcwg_gnu.yaml.in
index 88f1f7503c..0e8cbbd599 100644
--- a/tcwg_gnu.yaml.in
+++ b/tcwg_gnu.yaml.in
@@ -66,7 +66,6 @@
       - build-parameters:
           ci_project: 'tcwg_gnu'
           ci_config: '{toolchain_name}-{toolchain_ver}-{target}-{type_of_test}'
-          description: "CI configuration ID"
           binutils_url: '{binutils_url}'
           gcc_url: '{gcc_url}'
           default_branch: 'default'
diff --git a/tcwg_kernel-gnu.yaml b/tcwg_kernel-gnu.yaml
index cc7c892b42..4f591f8505 100644
--- a/tcwg_kernel-gnu.yaml
+++ b/tcwg_kernel-gnu.yaml
@@ -123,6 +123,14 @@
     name: default-parameters
     parameters:
       - string:
+          name: ci_project
+          default: '{ci_project}'
+          description: "CI project ID; used as namespace for git branches"
+      - string:
+          name: ci_config
+          default: '{ci_config}'
+          description: "CI configuration ID"
+      - string:
           name: extra_build_params
           default: ""
           description: "Extra parameters to pass to the build script"
@@ -139,7 +147,6 @@
           default: master
           description: 'Scripts revision to use'
 
-
 - builder:
     name: trigger-followup-builds
     builders:
@@ -177,41 +184,34 @@
           users:
             - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
 
+
 - parameter:
-    name: build-parameters
+    name: component-parameters
     parameters:
       - string:
-          name: ci_project
-          default: '{ci_project}'
-          description: "CI project ID; used as namespace for git branches"
-      - string:
-          name: ci_config
-          default: '{ci_config}'
-          description: "CI configuration ID"
-      - string:
-          name: binutils_url
-          default: '{binutils_url}'
-          description: "binutils git URL"
-      - string:
-          name: binutils_branch
-          default: '{default_branch}'
-          description: "binutils branch or sha1 to build, or 'baseline'"
-      - string:
-          name: gcc_url
-          default: '{gcc_url}'
-          description: "gcc git URL"
-      - string:
-          name: gcc_branch
-          default: '{default_branch}'
-          description: "gcc branch or sha1 to build, or 'baseline'"
-      - string:
-          name: linux_url
-          default: '{linux_url}'
-          description: "linux git URL"
+          name: '{component}_url'
+          default: '{url}'
+          description: "{component} git URL"
       - string:
-          name: linux_branch
-          default: default
-          description: "linux branch or sha1 to build"
+          name: '{component}_branch'
+          default: '{branch}'
+          description: "{component} branch or sha1 to build, or 'baseline'"
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - component-parameters:
+          component: binutils
+          url: '{binutils_url}'
+          branch: '{default_branch}'
+      - component-parameters:
+          component: gcc
+          url: '{gcc_url}'
+          branch: '{default_branch}'
+      - component-parameters:
+          component: linux
+          url: '{linux_url}'
+          branch: '{default_branch}'
       - choice:
           name: update_baseline
           choices:
@@ -220,7 +220,9 @@
             - init
             - push
           description: "What to do with baseline in this build"
-      - default-parameters
+      - default-parameters:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
 
 - builder:
     name: run-build
@@ -317,14 +319,6 @@
     name: bisect-parameters
     parameters:
       - string:
-          name: ci_project
-          default: '{ci_project}'
-          description: "CI project ID; used as namespace for git branches"
-      - string:
-          name: ci_config
-          default: '{ci_config}'
-          description: "CI configuration ID"
-      - string:
           name: current_project
           default: ""
           description: "Project to bisect"
@@ -339,7 +333,9 @@
       - file:
           name: jenkins-scripts/replay_log
           description: "Replay part of bisect using provided bisect log"
-      - default-parameters
+      - default-parameters:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
 
 - builder:
     name: run-bisect
@@ -480,4 +476,4 @@
           ci_project_config: '{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}'
     publishers:
       - bisect-publishers
-# checksum: be7b43d9984e0009d4f76fecd95db440
+# checksum: 63ba7afdb3b258eebda0fd25d7e687b0
diff --git a/tcwg_kernel-llvm.yaml b/tcwg_kernel-llvm.yaml
index ab755e4eb6..af14a11191 100644
--- a/tcwg_kernel-llvm.yaml
+++ b/tcwg_kernel-llvm.yaml
@@ -106,6 +106,14 @@
     name: default-parameters
     parameters:
       - string:
+          name: ci_project
+          default: '{ci_project}'
+          description: "CI project ID; used as namespace for git branches"
+      - string:
+          name: ci_config
+          default: '{ci_config}'
+          description: "CI configuration ID"
+      - string:
           name: extra_build_params
           default: ""
           description: "Extra parameters to pass to the build script"
@@ -122,7 +130,6 @@
           default: master
           description: 'Scripts revision to use'
 
-
 - builder:
     name: trigger-followup-builds
     builders:
@@ -160,33 +167,30 @@
           users:
             - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
 
+
 - parameter:
-    name: build-parameters
+    name: component-parameters
     parameters:
       - string:
-          name: ci_project
-          default: '{ci_project}'
-          description: "CI project ID; used as namespace for git branches"
-      - string:
-          name: ci_config
-          default: '{ci_config}'
-          description: "CI configuration ID"
-      - string:
-          name: llvm_url
-          default: '{llvm_url}'
-          description: "llvm git URL"
-      - string:
-          name: llvm_branch
-          default: '{default_branch}'
-          description: "llvm branch or sha1 to build, or 'baseline'"
+          name: '{component}_url'
+          default: '{url}'
+          description: "{component} git URL"
       - string:
-          name: linux_url
-          default: '{linux_url}'
-          description: "linux git URL"
-      - string:
-          name: linux_branch
-          default: default
-          description: "linux branch or sha1 to build"
+          name: '{component}_branch'
+          default: '{branch}'
+          description: "{component} branch or sha1 to build, or 'baseline'"
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - component-parameters:
+          component: llvm
+          url: '{llvm_url}'
+          branch: '{default_branch}'
+      - component-parameters:
+          component: linux
+          url: '{linux_url}'
+          branch: '{default_branch}'
       - choice:
           name: update_baseline
           choices:
@@ -195,7 +199,9 @@
             - init
             - push
           description: "What to do with baseline in this build"
-      - default-parameters
+      - default-parameters:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
 
 - builder:
     name: run-build
@@ -292,14 +298,6 @@
     name: bisect-parameters
     parameters:
       - string:
-          name: ci_project
-          default: '{ci_project}'
-          description: "CI project ID; used as namespace for git branches"
-      - string:
-          name: ci_config
-          default: '{ci_config}'
-          description: "CI configuration ID"
-      - string:
           name: current_project
           default: ""
           description: "Project to bisect"
@@ -314,7 +312,9 @@
       - file:
           name: jenkins-scripts/replay_log
           description: "Replay part of bisect using provided bisect log"
-      - default-parameters
+      - default-parameters:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
 
 - builder:
     name: run-bisect
@@ -451,4 +451,4 @@
           ci_project_config: '{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}'
     publishers:
       - bisect-publishers
-# checksum: e4e02da99bb3bd805873f4cd31352729
+# checksum: 87973cf5da5ed85ab854f8eca97dd3c8