tcwg_kernel* : Reuse {ci_project} and {ci_config}

Change-Id: Id1b8bdf30d34207a2aca87706ca5710462f204d4

3 files changed, 38 insertions, 32 deletions

diff --git a/tcwg_kernel--gnu.yaml b/tcwg_kernel--gnu.yaml
index e45208949a..9a272e596e 100644
--- a/tcwg_kernel--gnu.yaml
+++ b/tcwg_kernel--gnu.yaml
@@ -37,6 +37,8 @@
     jobs:
       - 'tcwg_kernel--{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}-build'
       - 'tcwg_kernel--{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}-bisect'
+    ci_project: 'tcwg_kernel'
+    ci_config: '{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}'
 
 #BEGIN: tcwg/round-robin.yaml.inc
 # -*- mode: Yaml -*-
@@ -527,18 +529,18 @@
       - default-properties
       - build-blocker:
           blocking-jobs:
-            - "tcwg_kernel--{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}-bisect"
+            - "{ci_project}--{ci_config}-bisect"
           queue-scanning: 'ALL'
     parameters:
       - build-parameters:
-          ci_project: 'tcwg_kernel'
-          ci_config: '{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}'
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
           default_git: 'default'
           distro: '{distro}'
     disabled: false
     node: tcwg-x86_64-build
     concurrent: false
-    display-name: 'TCWG Build tcwg_kernel/{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}'
+    display-name: 'TCWG Build {ci_project}/{ci_config}'
     workspace: workspace/tcwg_kernel_$EXECUTOR_NUMBER
     scm:
       - build-scms:
@@ -560,7 +562,7 @@
       - run-build:
           build_script: 'tcwg_kernel-build.sh'
           components: '{components}'
-          rr_project: 'tcwg_kernel--{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}'
+          rr_project: '{ci_project}--{ci_config}'
           job_suffix: ''
     publishers:
       - build-publishers
@@ -578,17 +580,17 @@
           # same regression tends to appear in multiple configurations,
           # run bisections for all configurations in-order.
           blocking-jobs:
-            - "tcwg_kernel--.*-bisect"
+            - "{ci_project}--.*-bisect"
           queue-scanning: 'BUILDABLE'
     parameters:
       - bisect-parameters:
-          ci_project: 'tcwg_kernel'
-          ci_config: '{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}'
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
           distro: '{distro}'
     disabled: false
     node: tcwg-x86_64-build
     concurrent: false
-    display-name: 'TCWG Bisect tcwg_kernel/{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}'
+    display-name: 'TCWG Bisect {ci_project}/{ci_config}'
     workspace: workspace/tcwg_kernel_$EXECUTOR_NUMBER
     scm:
       - jenkins-scripts
@@ -598,8 +600,8 @@
     builders:
       - run-bisect:
           build_script: 'tcwg_kernel-build.sh'
-          rr_project: 'tcwg_kernel--{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}'
+          rr_project: '{ci_project}--{ci_config}'
           job_suffix: ''
     publishers:
       - bisect-publishers
-# checksum: d9acb40c84a4ce58aac1d302a848948f
+# checksum: 8ce262af05cedaba1a201c0e16b7a3a2
diff --git a/tcwg_kernel--llvm.yaml b/tcwg_kernel--llvm.yaml
index f058db7392..7228d0cfcd 100644
--- a/tcwg_kernel--llvm.yaml
+++ b/tcwg_kernel--llvm.yaml
@@ -37,6 +37,8 @@
     jobs:
       - 'tcwg_kernel--{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}-build'
       - 'tcwg_kernel--{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}-bisect'
+    ci_project: 'tcwg_kernel'
+    ci_config: '{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}'
 
 #BEGIN: tcwg/round-robin.yaml.inc
 # -*- mode: Yaml -*-
@@ -527,18 +529,18 @@
       - default-properties
       - build-blocker:
           blocking-jobs:
-            - "tcwg_kernel--{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}-bisect"
+            - "{ci_project}--{ci_config}-bisect"
           queue-scanning: 'ALL'
     parameters:
       - build-parameters:
-          ci_project: 'tcwg_kernel'
-          ci_config: '{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}'
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
           default_git: 'default'
           distro: '{distro}'
     disabled: false
     node: tcwg-x86_64-build
     concurrent: false
-    display-name: 'TCWG Build tcwg_kernel/{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}'
+    display-name: 'TCWG Build {ci_project}/{ci_config}'
     workspace: workspace/tcwg_kernel_$EXECUTOR_NUMBER
     scm:
       - build-scms:
@@ -560,7 +562,7 @@
       - run-build:
           build_script: 'tcwg_kernel-build.sh'
           components: '{components}'
-          rr_project: 'tcwg_kernel--{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}'
+          rr_project: '{ci_project}--{ci_config}'
           job_suffix: ''
     publishers:
       - build-publishers
@@ -578,17 +580,17 @@
           # same regression tends to appear in multiple configurations,
           # run bisections for all configurations in-order.
           blocking-jobs:
-            - "tcwg_kernel--.*-bisect"
+            - "{ci_project}--.*-bisect"
           queue-scanning: 'BUILDABLE'
     parameters:
       - bisect-parameters:
-          ci_project: 'tcwg_kernel'
-          ci_config: '{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}'
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
           distro: '{distro}'
     disabled: false
     node: tcwg-x86_64-build
     concurrent: false
-    display-name: 'TCWG Bisect tcwg_kernel/{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}'
+    display-name: 'TCWG Bisect {ci_project}/{ci_config}'
     workspace: workspace/tcwg_kernel_$EXECUTOR_NUMBER
     scm:
       - jenkins-scripts
@@ -598,8 +600,8 @@
     builders:
       - run-bisect:
           build_script: 'tcwg_kernel-build.sh'
-          rr_project: 'tcwg_kernel--{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}'
+          rr_project: '{ci_project}--{ci_config}'
           job_suffix: ''
     publishers:
       - bisect-publishers
-# checksum: 11578a04cb7f8f73ec849b98ddf82c65
+# checksum: 91d88dad60a066a140b78188e28898de
diff --git a/tcwg_kernel.yaml.in b/tcwg_kernel.yaml.in
index 5c62b9a240..000fd00e20 100644
--- a/tcwg_kernel.yaml.in
+++ b/tcwg_kernel.yaml.in
@@ -44,6 +44,8 @@
     jobs:
       - 'tcwg_kernel--{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}-build'
       - 'tcwg_kernel--{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}-bisect'
+    ci_project: 'tcwg_kernel'
+    ci_config: '{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}'
 
 #include tcwg/round-robin.yaml.inc
 
@@ -55,18 +57,18 @@
       - default-properties
       - build-blocker:
           blocking-jobs:
-            - "tcwg_kernel--{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}-bisect"
+            - "{ci_project}--{ci_config}-bisect"
           queue-scanning: 'ALL'
     parameters:
       - build-parameters:
-          ci_project: 'tcwg_kernel'
-          ci_config: '{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}'
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
           default_git: 'default'
           distro: '{distro}'
     disabled: false
     node: tcwg-x86_64-build
     concurrent: false
-    display-name: 'TCWG Build tcwg_kernel/{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}'
+    display-name: 'TCWG Build {ci_project}/{ci_config}'
     workspace: workspace/tcwg_kernel_$EXECUTOR_NUMBER
     scm:
       - build-scms:
@@ -93,7 +95,7 @@
       - run-build:
           build_script: 'tcwg_kernel-build.sh'
           components: '{components}'
-          rr_project: 'tcwg_kernel--{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}'
+          rr_project: '{ci_project}--{ci_config}'
           job_suffix: ''
     publishers:
       - build-publishers
@@ -111,17 +113,17 @@
           # same regression tends to appear in multiple configurations,
           # run bisections for all configurations in-order.
           blocking-jobs:
-            - "tcwg_kernel--.*-bisect"
+            - "{ci_project}--.*-bisect"
           queue-scanning: 'BUILDABLE'
     parameters:
       - bisect-parameters:
-          ci_project: 'tcwg_kernel'
-          ci_config: '{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}'
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
           distro: '{distro}'
     disabled: false
     node: tcwg-x86_64-build
     concurrent: false
-    display-name: 'TCWG Bisect tcwg_kernel/{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}'
+    display-name: 'TCWG Bisect {ci_project}/{ci_config}'
     workspace: workspace/tcwg_kernel_$EXECUTOR_NUMBER
     scm:
       - jenkins-scripts
@@ -131,7 +133,7 @@
     builders:
       - run-bisect:
           build_script: 'tcwg_kernel-build.sh'
-          rr_project: 'tcwg_kernel--{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}'
+          rr_project: '{ci_project}--{ci_config}'
           job_suffix: ''
     publishers:
       - bisect-publishers