tcwg/round-robin.yaml.inc: Better order parameters of {build_script}

... so that it's easier to delete unneeded parameters when copy-pasting
command line for a local build.

Change-Id: I4a90cc5969f89490d7ede1d2f084d02134ee2cf3

11 files changed, 79 insertions, 79 deletions

diff --git a/tcwg/round-robin.yaml.inc b/tcwg/round-robin.yaml.inc
index 623b458c75..6c24c3d86d 100644
--- a/tcwg/round-robin.yaml.inc
+++ b/tcwg/round-robin.yaml.inc
@@ -309,17 +309,17 @@
               -- \
               ./jenkins-scripts/{build_script} \
               %% artifacts/jenkins/manifest.sh \
-              --BUILD_URL "$BUILD_URL" \
-              --scripts_branch "$scripts_branch" \
+              ==rr[ci_project] $ci_project \
+              ==rr[ci_config] $ci_config \
+              $extra_build_params \
 #if RR_tcwg_bmk
               --bmk_branch "$bmk_branch" \
 #endif
-              ==rr[ci_project] $ci_project \
-              ==rr[ci_config] $ci_config \
+              --scripts_branch "$scripts_branch" \
               $branch_opt \
               ==rr[mode] "jenkins-full" \
               ==rr[update_baseline] "$update_baseline" \
-              $extra_build_params &
+              --BUILD_URL "$BUILD_URL" &
             res=0 && wait $! || res=$?
 
             # If we didn't run the docker command
@@ -447,13 +447,13 @@
               --JIRA_PASSWORD "$TCWG_JIRA_PASSWORD" \
 #endif
               -- \
-              --scripts_branch "$scripts_branch" \
+              ==rr[ci_project] $ci_project \
+              ==rr[ci_config] $ci_config \
+              $extra_build_params \
 #if RR_tcwg_bmk
               --bmk_branch "$bmk_branch" \
 #endif
-              ==rr[ci_project] $ci_project \
-              ==rr[ci_config] $ci_config \
-              $extra_build_params
+              --scripts_branch "$scripts_branch"
 
             if [ x"$mail_recipients" != x"default" ]; then
               echo "$mail_recipients" > artifacts/jenkins/mail-recipients.txt
diff --git a/tcwg_binutils.yaml b/tcwg_binutils.yaml
index 7b5664dd68..e5658eda6e 100644
--- a/tcwg_binutils.yaml
+++ b/tcwg_binutils.yaml
@@ -231,14 +231,14 @@
               -- \
               ./jenkins-scripts/{build_script} \
               %% artifacts/jenkins/manifest.sh \
-              --BUILD_URL "$BUILD_URL" \
-              --scripts_branch "$scripts_branch" \
               ==rr[ci_project] $ci_project \
               ==rr[ci_config] $ci_config \
+              $extra_build_params \
+              --scripts_branch "$scripts_branch" \
               $branch_opt \
               ==rr[mode] "jenkins-full" \
               ==rr[update_baseline] "$update_baseline" \
-              $extra_build_params &
+              --BUILD_URL "$BUILD_URL" &
             res=0 && wait $! || res=$?
 
             # If we didn't run the docker command
@@ -348,10 +348,10 @@
               --build_script "./jenkins-scripts/{build_script}" \
               --JIRA_PASSWORD "$TCWG_JIRA_PASSWORD" \
               -- \
-              --scripts_branch "$scripts_branch" \
               ==rr[ci_project] $ci_project \
               ==rr[ci_config] $ci_config \
-              $extra_build_params
+              $extra_build_params \
+              --scripts_branch "$scripts_branch"
 
             if [ x"$mail_recipients" != x"default" ]; then
               echo "$mail_recipients" > artifacts/jenkins/mail-recipients.txt
@@ -461,4 +461,4 @@
           docker_arch: '{docker_arch}'
     publishers:
       - bisect-publishers
-# checksum: c9326b379ef95cd9de5a3a33aca56a35
+# checksum: 89b2a0da833191dae94ba5fdfd79edf1
diff --git a/tcwg_bmk_ci_gnu.yaml b/tcwg_bmk_ci_gnu.yaml
index 4ff9285d64..4a37374e75 100644
--- a/tcwg_bmk_ci_gnu.yaml
+++ b/tcwg_bmk_ci_gnu.yaml
@@ -311,15 +311,15 @@
               -- \
               ./jenkins-scripts/{build_script} \
               %% artifacts/jenkins/manifest.sh \
-              --BUILD_URL "$BUILD_URL" \
-              --scripts_branch "$scripts_branch" \
-              --bmk_branch "$bmk_branch" \
               ==rr[ci_project] $ci_project \
               ==rr[ci_config] $ci_config \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" \
               $branch_opt \
               ==rr[mode] "jenkins-full" \
               ==rr[update_baseline] "$update_baseline" \
-              $extra_build_params &
+              --BUILD_URL "$BUILD_URL" &
             res=0 && wait $! || res=$?
 
             # If we didn't run the docker command
@@ -428,11 +428,11 @@
               --build_script "./jenkins-scripts/{build_script}" \
               --JIRA_PASSWORD "$TCWG_JIRA_PASSWORD" \
               -- \
-              --scripts_branch "$scripts_branch" \
-              --bmk_branch "$bmk_branch" \
               ==rr[ci_project] $ci_project \
               ==rr[ci_config] $ci_config \
-              $extra_build_params
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch"
 
             if [ x"$mail_recipients" != x"default" ]; then
               echo "$mail_recipients" > artifacts/jenkins/mail-recipients.txt
@@ -542,4 +542,4 @@
           ci_project_config: 'tcwg_bmk_{hw}-gnu-{toolchain_ver}-{target}-{bmk}-{cflags}'
     publishers:
         - bisect-publishers
-# checksum: 4d8fa54e73e4446545990f532a4dc5e8
+# checksum: 88b54507c22c9fb008238bd53e65cc4f
diff --git a/tcwg_bmk_ci_gnu_eabi.yaml b/tcwg_bmk_ci_gnu_eabi.yaml
index 91ef7c0830..2c23495fff 100644
--- a/tcwg_bmk_ci_gnu_eabi.yaml
+++ b/tcwg_bmk_ci_gnu_eabi.yaml
@@ -308,15 +308,15 @@
               -- \
               ./jenkins-scripts/{build_script} \
               %% artifacts/jenkins/manifest.sh \
-              --BUILD_URL "$BUILD_URL" \
-              --scripts_branch "$scripts_branch" \
-              --bmk_branch "$bmk_branch" \
               ==rr[ci_project] $ci_project \
               ==rr[ci_config] $ci_config \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" \
               $branch_opt \
               ==rr[mode] "jenkins-full" \
               ==rr[update_baseline] "$update_baseline" \
-              $extra_build_params &
+              --BUILD_URL "$BUILD_URL" &
             res=0 && wait $! || res=$?
 
             # If we didn't run the docker command
@@ -425,11 +425,11 @@
               --build_script "./jenkins-scripts/{build_script}" \
               --JIRA_PASSWORD "$TCWG_JIRA_PASSWORD" \
               -- \
-              --scripts_branch "$scripts_branch" \
-              --bmk_branch "$bmk_branch" \
               ==rr[ci_project] $ci_project \
               ==rr[ci_config] $ci_config \
-              $extra_build_params
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch"
 
             if [ x"$mail_recipients" != x"default" ]; then
               echo "$mail_recipients" > artifacts/jenkins/mail-recipients.txt
@@ -539,4 +539,4 @@
           ci_project_config: 'tcwg_bmk_{hw}-gnu_eabi-{toolchain_ver}-{target}-{bmk}-{cflags}'
     publishers:
         - bisect-publishers
-# checksum: c47f3d890e8a28f46d7d75913dff5718
+# checksum: 4cc5feefde798388fe964c03e518913a
diff --git a/tcwg_bmk_ci_llvm.yaml b/tcwg_bmk_ci_llvm.yaml
index e195dddb92..89a5b68c0c 100644
--- a/tcwg_bmk_ci_llvm.yaml
+++ b/tcwg_bmk_ci_llvm.yaml
@@ -323,15 +323,15 @@
               -- \
               ./jenkins-scripts/{build_script} \
               %% artifacts/jenkins/manifest.sh \
-              --BUILD_URL "$BUILD_URL" \
-              --scripts_branch "$scripts_branch" \
-              --bmk_branch "$bmk_branch" \
               ==rr[ci_project] $ci_project \
               ==rr[ci_config] $ci_config \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" \
               $branch_opt \
               ==rr[mode] "jenkins-full" \
               ==rr[update_baseline] "$update_baseline" \
-              $extra_build_params &
+              --BUILD_URL "$BUILD_URL" &
             res=0 && wait $! || res=$?
 
             # If we didn't run the docker command
@@ -440,11 +440,11 @@
               --build_script "./jenkins-scripts/{build_script}" \
               --JIRA_PASSWORD "$TCWG_JIRA_PASSWORD" \
               -- \
-              --scripts_branch "$scripts_branch" \
-              --bmk_branch "$bmk_branch" \
               ==rr[ci_project] $ci_project \
               ==rr[ci_config] $ci_config \
-              $extra_build_params
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch"
 
             if [ x"$mail_recipients" != x"default" ]; then
               echo "$mail_recipients" > artifacts/jenkins/mail-recipients.txt
@@ -557,4 +557,4 @@
           ci_project_config: 'tcwg_bmk_{hw}-llvm-{toolchain_ver}-{target}-{bmk}-{cflags}'
     publishers:
         - bisect-publishers
-# checksum: a0e3d3e792f84b9494dc46eafa9bca0a
+# checksum: 7509ae32d15810b6b411098c17306010
diff --git a/tcwg_bmk_dev_gnu.yaml b/tcwg_bmk_dev_gnu.yaml
index 043fd7d1e3..4a4c9539e6 100644
--- a/tcwg_bmk_dev_gnu.yaml
+++ b/tcwg_bmk_dev_gnu.yaml
@@ -220,15 +220,15 @@
               -- \
               ./jenkins-scripts/{build_script} \
               %% artifacts/jenkins/manifest.sh \
-              --BUILD_URL "$BUILD_URL" \
-              --scripts_branch "$scripts_branch" \
-              --bmk_branch "$bmk_branch" \
               ==rr[ci_project] $ci_project \
               ==rr[ci_config] $ci_config \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" \
               $branch_opt \
               ==rr[mode] "jenkins-full" \
               ==rr[update_baseline] "$update_baseline" \
-              $extra_build_params &
+              --BUILD_URL "$BUILD_URL" &
             res=0 && wait $! || res=$?
 
             # If we didn't run the docker command
@@ -332,11 +332,11 @@
               --replay_log "$(pwd)/jenkins-scripts/replay_log" \
               --build_script "./jenkins-scripts/{build_script}" \
               -- \
-              --scripts_branch "$scripts_branch" \
-              --bmk_branch "$bmk_branch" \
               ==rr[ci_project] $ci_project \
               ==rr[ci_config] $ci_config \
-              $extra_build_params
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch"
 
             if [ x"$mail_recipients" != x"default" ]; then
               echo "$mail_recipients" > artifacts/jenkins/mail-recipients.txt
@@ -450,4 +450,4 @@
           ci_project_config: 'tcwg_bmk_{hw}'
     publishers:
         - bisect-publishers
-# checksum: a397810737dfeb048f6700edb5e8093d
+# checksum: 9f8116be5a3877abf8d365d254a77e24
diff --git a/tcwg_bmk_dev_llvm.yaml b/tcwg_bmk_dev_llvm.yaml
index b91fcb7941..28f734ed0c 100644
--- a/tcwg_bmk_dev_llvm.yaml
+++ b/tcwg_bmk_dev_llvm.yaml
@@ -224,15 +224,15 @@
               -- \
               ./jenkins-scripts/{build_script} \
               %% artifacts/jenkins/manifest.sh \
-              --BUILD_URL "$BUILD_URL" \
-              --scripts_branch "$scripts_branch" \
-              --bmk_branch "$bmk_branch" \
               ==rr[ci_project] $ci_project \
               ==rr[ci_config] $ci_config \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" \
               $branch_opt \
               ==rr[mode] "jenkins-full" \
               ==rr[update_baseline] "$update_baseline" \
-              $extra_build_params &
+              --BUILD_URL "$BUILD_URL" &
             res=0 && wait $! || res=$?
 
             # If we didn't run the docker command
@@ -336,11 +336,11 @@
               --replay_log "$(pwd)/jenkins-scripts/replay_log" \
               --build_script "./jenkins-scripts/{build_script}" \
               -- \
-              --scripts_branch "$scripts_branch" \
-              --bmk_branch "$bmk_branch" \
               ==rr[ci_project] $ci_project \
               ==rr[ci_config] $ci_config \
-              $extra_build_params
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch"
 
             if [ x"$mail_recipients" != x"default" ]; then
               echo "$mail_recipients" > artifacts/jenkins/mail-recipients.txt
@@ -455,4 +455,4 @@
           ci_project_config: 'tcwg_bmk_{hw}'
     publishers:
         - bisect-publishers
-# checksum: 50dd09d2bcae1c756fa298ae58e3d69e
+# checksum: 9de3bc6e389dad31850229d19a0f82f2
diff --git a/tcwg_cross.yaml b/tcwg_cross.yaml
index f534db0cc9..7f3d394001 100644
--- a/tcwg_cross.yaml
+++ b/tcwg_cross.yaml
@@ -264,14 +264,14 @@
               -- \
               ./jenkins-scripts/{build_script} \
               %% artifacts/jenkins/manifest.sh \
-              --BUILD_URL "$BUILD_URL" \
-              --scripts_branch "$scripts_branch" \
               ==rr[ci_project] $ci_project \
               ==rr[ci_config] $ci_config \
+              $extra_build_params \
+              --scripts_branch "$scripts_branch" \
               $branch_opt \
               ==rr[mode] "jenkins-full" \
               ==rr[update_baseline] "$update_baseline" \
-              $extra_build_params &
+              --BUILD_URL "$BUILD_URL" &
             res=0 && wait $! || res=$?
 
             # If we didn't run the docker command
@@ -378,10 +378,10 @@
               --build_script "./jenkins-scripts/{build_script}" \
               --JIRA_PASSWORD "$TCWG_JIRA_PASSWORD" \
               -- \
-              --scripts_branch "$scripts_branch" \
               ==rr[ci_project] $ci_project \
               ==rr[ci_config] $ci_config \
-              $extra_build_params
+              $extra_build_params \
+              --scripts_branch "$scripts_branch"
 
             if [ x"$mail_recipients" != x"default" ]; then
               echo "$mail_recipients" > artifacts/jenkins/mail-recipients.txt
@@ -498,4 +498,4 @@
           ci_project_config: '{toolchain_name}-{toolchain_ver}-{target}-{type_of_test}'
     publishers:
       - bisect-publishers
-# checksum: 055468ab340b1ac2c0d826ad54ff5d1b
+# checksum: 25d78be1d50e43c6226ffcec3a0cdc19
diff --git a/tcwg_gcc.yaml b/tcwg_gcc.yaml
index 5e11debde2..f71adbd64f 100644
--- a/tcwg_gcc.yaml
+++ b/tcwg_gcc.yaml
@@ -257,14 +257,14 @@
               -- \
               ./jenkins-scripts/{build_script} \
               %% artifacts/jenkins/manifest.sh \
-              --BUILD_URL "$BUILD_URL" \
-              --scripts_branch "$scripts_branch" \
               ==rr[ci_project] $ci_project \
               ==rr[ci_config] $ci_config \
+              $extra_build_params \
+              --scripts_branch "$scripts_branch" \
               $branch_opt \
               ==rr[mode] "jenkins-full" \
               ==rr[update_baseline] "$update_baseline" \
-              $extra_build_params &
+              --BUILD_URL "$BUILD_URL" &
             res=0 && wait $! || res=$?
 
             # If we didn't run the docker command
@@ -374,10 +374,10 @@
               --build_script "./jenkins-scripts/{build_script}" \
               --JIRA_PASSWORD "$TCWG_JIRA_PASSWORD" \
               -- \
-              --scripts_branch "$scripts_branch" \
               ==rr[ci_project] $ci_project \
               ==rr[ci_config] $ci_config \
-              $extra_build_params
+              $extra_build_params \
+              --scripts_branch "$scripts_branch"
 
             if [ x"$mail_recipients" != x"default" ]; then
               echo "$mail_recipients" > artifacts/jenkins/mail-recipients.txt
@@ -487,4 +487,4 @@
           docker_arch: '{docker_arch}'
     publishers:
       - bisect-publishers
-# checksum: 207b1af7e4f4376d03b2c3c28b457246
+# checksum: 3ba92843c792f17ce1ae68ced28227ae
diff --git a/tcwg_kernel-gnu.yaml b/tcwg_kernel-gnu.yaml
index f5c97b5d0b..723ffbed17 100644
--- a/tcwg_kernel-gnu.yaml
+++ b/tcwg_kernel-gnu.yaml
@@ -273,14 +273,14 @@
               -- \
               ./jenkins-scripts/{build_script} \
               %% artifacts/jenkins/manifest.sh \
-              --BUILD_URL "$BUILD_URL" \
-              --scripts_branch "$scripts_branch" \
               ==rr[ci_project] $ci_project \
               ==rr[ci_config] $ci_config \
+              $extra_build_params \
+              --scripts_branch "$scripts_branch" \
               $branch_opt \
               ==rr[mode] "jenkins-full" \
               ==rr[update_baseline] "$update_baseline" \
-              $extra_build_params &
+              --BUILD_URL "$BUILD_URL" &
             res=0 && wait $! || res=$?
 
             # If we didn't run the docker command
@@ -388,10 +388,10 @@
               --build_script "./jenkins-scripts/{build_script}" \
               --JIRA_PASSWORD "$TCWG_JIRA_PASSWORD" \
               -- \
-              --scripts_branch "$scripts_branch" \
               ==rr[ci_project] $ci_project \
               ==rr[ci_config] $ci_config \
-              $extra_build_params
+              $extra_build_params \
+              --scripts_branch "$scripts_branch"
 
             if [ x"$mail_recipients" != x"default" ]; then
               echo "$mail_recipients" > artifacts/jenkins/mail-recipients.txt
@@ -501,4 +501,4 @@
           ci_project_config: '{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}'
     publishers:
       - bisect-publishers
-# checksum: 590437c978ef9aedb7d4b2fccff38785
+# checksum: 1a4fd9a57bce8470ca76937e1a48c89c
diff --git a/tcwg_kernel-llvm.yaml b/tcwg_kernel-llvm.yaml
index 513c4fd970..58bc16cb5e 100644
--- a/tcwg_kernel-llvm.yaml
+++ b/tcwg_kernel-llvm.yaml
@@ -261,14 +261,14 @@
               -- \
               ./jenkins-scripts/{build_script} \
               %% artifacts/jenkins/manifest.sh \
-              --BUILD_URL "$BUILD_URL" \
-              --scripts_branch "$scripts_branch" \
               ==rr[ci_project] $ci_project \
               ==rr[ci_config] $ci_config \
+              $extra_build_params \
+              --scripts_branch "$scripts_branch" \
               $branch_opt \
               ==rr[mode] "jenkins-full" \
               ==rr[update_baseline] "$update_baseline" \
-              $extra_build_params &
+              --BUILD_URL "$BUILD_URL" &
             res=0 && wait $! || res=$?
 
             # If we didn't run the docker command
@@ -376,10 +376,10 @@
               --build_script "./jenkins-scripts/{build_script}" \
               --JIRA_PASSWORD "$TCWG_JIRA_PASSWORD" \
               -- \
-              --scripts_branch "$scripts_branch" \
               ==rr[ci_project] $ci_project \
               ==rr[ci_config] $ci_config \
-              $extra_build_params
+              $extra_build_params \
+              --scripts_branch "$scripts_branch"
 
             if [ x"$mail_recipients" != x"default" ]; then
               echo "$mail_recipients" > artifacts/jenkins/mail-recipients.txt
@@ -486,4 +486,4 @@
           ci_project_config: '{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}'
     publishers:
       - bisect-publishers
-# checksum: a38f4f435911e67a4e9b2742f205cedf
+# checksum: 853a347f9b228795dcfd51eaa2c02093