tcwg_bmk_ci*,tcwg_bmk_dev*: Bring the two closer together

Merge definitions of trigger-followup-builds and build-parameters.

Change-Id: Id33823464b9c2cd8fa9e3e0463a28d8c6626a90d

1 files changed, 10 insertions, 45 deletions

diff --git a/tcwg_bmk_dev.yaml.in b/tcwg_bmk_dev.yaml.in
index 4fa6102b8b..9d6262178a 100644
--- a/tcwg_bmk_dev.yaml.in
+++ b/tcwg_bmk_dev.yaml.in
@@ -22,39 +22,6 @@
       - tcwg-benchmark-tk1
       - tcwg-benchmark-tx1
 
-- builder:
-    name: trigger-followup-builds2
-    builders:
-      - build-name-setter:
-          name: 'artifacts/jenkins/build-name'
-          file: true
-      - shell: |
-          #!/bin/bash
-          set -ex
-          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
-            if [ -f $i ]; then
-              echo "ci_project=$ci_project" >> $i
-              echo "ci_config=$ci_config" >> $i
-              echo "binutils_url=$binutils_url" >> $i
-              echo "gcc_url=$gcc_url" >> $i
-              echo "glibc_url=$glibc_url" >> $i
-#if TOOLCHAIN_llvm
-              echo "llvm_url=$llvm_url" >> $i
-#endif
-              echo "mail_recipients=$mail_recipients" >> $i
-              echo "distro=$distro" >> $i
-              echo "scripts_branch=$scripts_branch" >> $i
-              echo "bmk_branch=$bmk_branch" >> $i
-            fi
-          done
-      - trigger-builds:
-          - project: tcwg_bmk_dev/build-tcwg_bmk_{hw}/#{TOOLCHAIN}
-            parameter-factories:
-              - factory: filebuild
-                file-pattern: artifacts/trigger-build-*
-          - project: tcwg_bmk_dev/bisect-tcwg_bmk_{hw}/#{TOOLCHAIN}
-            property-file: artifacts/trigger-bisect
-
 - job-template:
     name: tcwg_bmk_dev/build-tcwg_bmk_{hw}/#{TOOLCHAIN}
     project-type: freestyle
@@ -66,15 +33,9 @@
             - "tcwg_bmk_dev/bisect-tcwg_bmk_{hw}/#{TOOLCHAIN}"
           queue-scanning: 'ALL'
     parameters:
-      - string:
-          name: ci_project
-          default: 'tcwg_bmk-YOUR_ID'
-          description: "CI project ID; used as namespace for git branches"
-      - string:
-          name: ci_config
-          default: #{TOOLCHAIN}-release-aarch64-spec2k6-O2
-          description: "CI configuration ID: #{TOOLCHAIN}-{{toolchain_ver}}-{{target}}-{{bmk}}-{{cflags}}"
       - build-parameters:
+          ci_project: tcwg_bmk-YOUR_ID
+          ci_config: #{TOOLCHAIN}-release-aarch64-spec2k6-O2
           binutils_url: https://git.linaro.org/toolchain/ci/binutils-gdb.git
           gcc_url: https://git.linaro.org/toolchain/ci/gcc.git
           glibc_url: https://git.linaro.org/toolchain/ci/glibc.git
@@ -162,8 +123,10 @@
               build_name="$build_name-bisect"
             fi
             echo "$build_name" > artifacts/jenkins/build-name
-        - trigger-followup-builds2:
-            hw: '{hw}'
+        - trigger-followup-builds:
+            rr_project: 'tcwg_bmk_dev'
+            ci_project: 'tcwg_bmk_{hw}'
+            ci_config: '#{TOOLCHAIN}'
         - shell: |
             #!/bin/bash
             if [ -f artifacts/failures ]; then
@@ -281,8 +244,10 @@
             if [ x"$mail_recipients" != x"default" ]; then
               echo "$mail_recipients" > artifacts/jenkins/mail-recipients.txt
             fi
-        - trigger-followup-builds2:
-            hw: '{hw}'
+        - trigger-followup-builds:
+            rr_project: 'tcwg_bmk_dev'
+            ci_project: 'tcwg_bmk_{hw}'
+            ci_config: '#{TOOLCHAIN}'
     publishers:
         - archive:
             artifacts: 'artifacts/**'