tcwg: Remove fetching from jenkins

Details :
1) Projects still defines the <component>_git as it was with
   default, jenkins-scm, baseline, <URL>#<branch>, etc..

2) This values are not used anymore to do the checkout from jenkins.

3) It is still passed as tcwg_xxx-build.sh scripts as parameters.

4) The components url are used in build scripts from abe or whatever as
   it was before.

Remark : The "<URL>#<branch>" from the (1) is now computed from the
variables ${component}_url and ${component}_branch. These variables are
now defined in run-build.env

Change-Id: I8fc14e859145105e0173eef78c46d196c886a766
diff --git a/tcwg/round-robin.yaml.inc b/tcwg/round-robin.yaml.inc
index be6131a..0937642 100644
--- a/tcwg/round-robin.yaml.inc
+++ b/tcwg/round-robin.yaml.inc
@@ -227,97 +227,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-#if COMPONENTS_aosp_superproject
-      - component-scm:
-          component: aosp_superproject
-          url: '{aosp_superproject_url}'
-          branch: '{aosp_superproject_branch}'
-          reference: superproject.git
-#endif
-#if COMPONENTS_binutils
-      - component-scm:
-          component: binutils
-          url: '{binutils_url}'
-          branch: '{binutils_branch}'
-          reference: binutils-gdb.git
-#endif
-#if COMPONENTS_fujitsu_testsuite
-      - component-scm:
-          component: fujitsu_testsuite
-          url: '{fujitsu_testsuite_url}'
-          branch: '{fujitsu_testsuite_branch}'
-          reference: compiler-test-suite.git
-#endif
-#if COMPONENTS_gcc
-      - component-scm:
-          component: gcc
-          url: '{gcc_url}'
-          branch: '{gcc_branch}'
-          reference: gcc.git
-#endif
-#if COMPONENTS_gdb
-      - component-scm:
-          component: gdb
-          url: '{gdb_url}'
-          branch: '{gdb_branch}'
-          reference: binutils-gdb.git
-#endif
-#if COMPONENTS_glibc
-      - component-scm:
-          component: glibc
-          url: '{glibc_url}'
-          branch: '{glibc_branch}'
-          reference: glibc.git
-#endif
-#if COMPONENTS_linux
-      - component-scm:
-          component: linux
-          url: '{linux_url}'
-          branch: '{linux_branch}'
-          reference: linux.git
-#endif
-#if COMPONENTS_llvm
-      - component-scm:
-          component: llvm
-          url: '{llvm_url}'
-          branch: '{llvm_branch}'
-          reference: llvm-project.git
-#endif
-#if COMPONENTS_llvm_testsuite
-      - component-scm:
-          component: llvm_testsuite
-          url: '{llvm_testsuite_url}'
-          branch: '{llvm_testsuite_branch}'
-          reference: llvm-test-suite.git
-#endif
-#if COMPONENTS_mingw
-      - component-scm:
-          component: mingw
-          url: '{mingw_url}'
-          branch: '{mingw_branch}'
-          reference: mingw-w64.git
-#endif
-#if COMPONENTS_newlib
-      - component-scm:
-          component: newlib
-          url: '{newlib_url}'
-          branch: '{newlib_branch}'
-          reference: newlib.git
-#endif
-#if COMPONENTS_toolchain_superproject
-      - component-scm:
-          component: toolchain_superproject
-          url: '{toolchain_superproject_url}'
-          branch: '{toolchain_superproject_branch}'
-          reference: superproject.git
-#endif
-#if COMPONENTS_qemu
-      - component-scm:
-          component: qemu
-          url: '{qemu_url}'
-          branch: '{qemu_branch}'
-          reference: qemu.git
-#endif
 
 - wrapper:
     name: build-wrappers
@@ -636,6 +545,38 @@
 
             cat >> artifacts/jenkins/run-build.env <<EOF
             build_name="$build_name"
+#if COMPONENTS_binutils
+            binutils_url="{binutils_url}"
+            binutils_branch="{binutils_branch}"
+#endif
+#if COMPONENTS_gcc
+            gcc_url="{gcc_url}"
+            gcc_branch="{gcc_branch}"
+#endif
+#if COMPONENTS_linux
+            linux_url="{linux_url}"
+            linux_branch="{linux_branch}"
+#endif
+#if COMPONENTS_glibc
+            glibc_url="{glibc_url}"
+            glibc_branch="{glibc_branch}"
+#endif
+#if COMPONENTS_gdb
+            gdb_url="{gdb_url}"
+            gdb_branch="{gdb_branch}"
+#endif
+#if COMPONENTS_mingw
+            mingw_url="{mingw_url}"
+            mingw_branch="{mingw_branch}"
+#endif
+#if COMPONENTS_newlib
+            newlib_url="{newlib_url}"
+            newlib_branch="{newlib_branch}"
+#endif
+#if COMPONENTS_qemu
+            qemu_url="{qemu_url}"
+            qemu_branch="{qemu_branch}"
+#endif
             EOF
           unstable-return: 125
 
@@ -784,10 +725,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -901,6 +841,38 @@
           steps:
             - run-build-init:
                 precommit: false
+#if COMPONENTS_binutils
+                binutils_url: {binutils_url}
+                binutils_branch: {binutils_branch}
+#endif
+#if COMPONENTS_gcc
+                gcc_url: {gcc_url}
+                gcc_branch: {gcc_branch}
+#endif
+#if COMPONENTS_linux
+                linux_url: {linux_url}
+                linux_branch: {linux_branch}
+#endif
+#if COMPONENTS_glibc
+                glibc_url: {glibc_url}
+                glibc_branch: {glibc_branch}
+#endif
+#if COMPONENTS_gdb
+                gdb_url: {gdb_url}
+                gdb_branch: {gdb_branch}
+#endif
+#if COMPONENTS_mingw
+                mingw_url: {mingw_url}
+                mingw_branch: {mingw_branch}
+#endif
+#if COMPONENTS_newlib
+                newlib_url: {newlib_url}
+                newlib_branch: {newlib_branch}
+#endif
+#if COMPONENTS_qemu
+                qemu_url: {qemu_url}
+                qemu_branch: {qemu_branch}
+#endif
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -1281,6 +1253,38 @@
           steps:
             - run-build-init:
                 precommit: true
+#if COMPONENTS_binutils
+                binutils_url: {binutils_url}
+                binutils_branch: {binutils_branch}
+#endif
+#if COMPONENTS_gcc
+                gcc_url: {gcc_url}
+                gcc_branch: {gcc_branch}
+#endif
+#if COMPONENTS_linux
+                linux_url: {linux_url}
+                linux_branch: {linux_branch}
+#endif
+#if COMPONENTS_glibc
+                glibc_url: {glibc_url}
+                glibc_branch: {glibc_branch}
+#endif
+#if COMPONENTS_gdb
+                gdb_url: {gdb_url}
+                gdb_branch: {gdb_branch}
+#endif
+#if COMPONENTS_mingw
+                mingw_url: {mingw_url}
+                mingw_branch: {mingw_branch}
+#endif
+#if COMPONENTS_newlib
+                newlib_url: {newlib_url}
+                newlib_branch: {newlib_branch}
+#endif
+#if COMPONENTS_qemu
+                qemu_url: {qemu_url}
+                qemu_branch: {qemu_branch}
+#endif
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
diff --git a/tcwg_aosp-build.yaml b/tcwg_aosp-build.yaml
index 75de6d1..92d81c5 100644
--- a/tcwg_aosp-build.yaml
+++ b/tcwg_aosp-build.yaml
@@ -190,21 +190,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: aosp_superproject
-          url: '{aosp_superproject_url}'
-          branch: '{aosp_superproject_branch}'
-          reference: superproject.git
-      - component-scm:
-          component: llvm
-          url: '{llvm_url}'
-          branch: '{llvm_branch}'
-          reference: llvm-project.git
-      - component-scm:
-          component: toolchain_superproject
-          url: '{toolchain_superproject_url}'
-          branch: '{toolchain_superproject_branch}'
-          reference: superproject.git
 
 - wrapper:
     name: build-wrappers
@@ -540,10 +525,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -963,4 +947,4 @@
           build_script: 'tcwg_aosp-build.sh'
     publishers:
       - bisect-publishers
-# checksum: 33ff04ef2caaaeab26a709b9ab7a6500
+# checksum: 0269860643407b4796aea0718085cdbf
diff --git a/tcwg_aosp-code_size.yaml b/tcwg_aosp-code_size.yaml
index 9478fcf..fbcfcef 100644
--- a/tcwg_aosp-code_size.yaml
+++ b/tcwg_aosp-code_size.yaml
@@ -193,21 +193,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: aosp_superproject
-          url: '{aosp_superproject_url}'
-          branch: '{aosp_superproject_branch}'
-          reference: superproject.git
-      - component-scm:
-          component: llvm
-          url: '{llvm_url}'
-          branch: '{llvm_branch}'
-          reference: llvm-project.git
-      - component-scm:
-          component: toolchain_superproject
-          url: '{toolchain_superproject_url}'
-          branch: '{toolchain_superproject_branch}'
-          reference: superproject.git
 
 - wrapper:
     name: build-wrappers
@@ -543,10 +528,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -966,4 +950,4 @@
           build_script: 'tcwg_aosp-build.sh'
     publishers:
       - bisect-publishers
-# checksum: 68ce41f4eb88f6a7f0fb7fb7d2508131
+# checksum: 9b9be579b87cc082da5a7fb39ed4bf68
diff --git a/tcwg_binutils.yaml b/tcwg_binutils.yaml
index 46c6249..ca1524a 100644
--- a/tcwg_binutils.yaml
+++ b/tcwg_binutils.yaml
@@ -204,11 +204,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: binutils
-          url: '{binutils_url}'
-          branch: '{binutils_branch}'
-          reference: binutils-gdb.git
 
 - wrapper:
     name: build-wrappers
@@ -513,6 +508,8 @@
 
             cat >> artifacts/jenkins/run-build.env <<EOF
             build_name="$build_name"
+            binutils_url="{binutils_url}"
+            binutils_branch="{binutils_branch}"
             EOF
           unstable-return: 125
 
@@ -629,10 +626,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -745,6 +741,8 @@
           steps:
             - run-build-init:
                 precommit: false
+                binutils_url: {binutils_url}
+                binutils_branch: {binutils_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -1115,6 +1113,8 @@
           steps:
             - run-build-init:
                 precommit: true
+                binutils_url: {binutils_url}
+                binutils_branch: {binutils_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -1326,9 +1326,7 @@
     display-name: 'TCWG Build {ci_project}/{ci_config}'
     workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
     scm:
-      - build-scms:
-          binutils_url: '{binutils_url}'
-          binutils_branch: '{binutils_branch}'
+      - build-scms
     triggers:
       - timed: '{cron}'
     wrappers:
@@ -1410,4 +1408,4 @@
           docker_security: '{docker_security}'
     publishers:
       - bisect-publishers
-# checksum: dac7ddafa93a699a0585622b97f9cbde
+# checksum: 1d30dca30d5702201fc3d615a686d133
diff --git a/tcwg_bmk-code_size-coremark--gnu_eabi.yaml b/tcwg_bmk-code_size-coremark--gnu_eabi.yaml
index 01ba691..bbf5009 100644
--- a/tcwg_bmk-code_size-coremark--gnu_eabi.yaml
+++ b/tcwg_bmk-code_size-coremark--gnu_eabi.yaml
@@ -216,21 +216,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: binutils
-          url: '{binutils_url}'
-          branch: '{binutils_branch}'
-          reference: binutils-gdb.git
-      - component-scm:
-          component: gcc
-          url: '{gcc_url}'
-          branch: '{gcc_branch}'
-          reference: gcc.git
-      - component-scm:
-          component: newlib
-          url: '{newlib_url}'
-          branch: '{newlib_branch}'
-          reference: newlib.git
 
 - wrapper:
     name: build-wrappers
@@ -451,6 +436,12 @@
 
             cat >> artifacts/jenkins/run-build.env <<EOF
             build_name="$build_name"
+            binutils_url="{binutils_url}"
+            binutils_branch="{binutils_branch}"
+            gcc_url="{gcc_url}"
+            gcc_branch="{gcc_branch}"
+            newlib_url="{newlib_url}"
+            newlib_branch="{newlib_branch}"
             EOF
           unstable-return: 125
 
@@ -567,10 +558,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -683,6 +673,12 @@
           steps:
             - run-build-init:
                 precommit: false
+                binutils_url: {binutils_url}
+                binutils_branch: {binutils_branch}
+                gcc_url: {gcc_url}
+                gcc_branch: {gcc_branch}
+                newlib_url: {newlib_url}
+                newlib_branch: {newlib_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -985,4 +981,4 @@
     publishers:
         - bisect-publishers
 
-# checksum: f1c07b35137d40e81790111a0cddc23f
+# checksum: a184ef10b2219cb0c2b56cacca7d9874
diff --git a/tcwg_bmk-code_size-cpu2017fast--gnu.yaml b/tcwg_bmk-code_size-cpu2017fast--gnu.yaml
index a1fa274..15f311c 100644
--- a/tcwg_bmk-code_size-cpu2017fast--gnu.yaml
+++ b/tcwg_bmk-code_size-cpu2017fast--gnu.yaml
@@ -221,26 +221,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: binutils
-          url: '{binutils_url}'
-          branch: '{binutils_branch}'
-          reference: binutils-gdb.git
-      - component-scm:
-          component: gcc
-          url: '{gcc_url}'
-          branch: '{gcc_branch}'
-          reference: gcc.git
-      - component-scm:
-          component: glibc
-          url: '{glibc_url}'
-          branch: '{glibc_branch}'
-          reference: glibc.git
-      - component-scm:
-          component: linux
-          url: '{linux_url}'
-          branch: '{linux_branch}'
-          reference: linux.git
 
 - wrapper:
     name: build-wrappers
@@ -461,6 +441,14 @@
 
             cat >> artifacts/jenkins/run-build.env <<EOF
             build_name="$build_name"
+            binutils_url="{binutils_url}"
+            binutils_branch="{binutils_branch}"
+            gcc_url="{gcc_url}"
+            gcc_branch="{gcc_branch}"
+            linux_url="{linux_url}"
+            linux_branch="{linux_branch}"
+            glibc_url="{glibc_url}"
+            glibc_branch="{glibc_branch}"
             EOF
           unstable-return: 125
 
@@ -577,10 +565,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -693,6 +680,14 @@
           steps:
             - run-build-init:
                 precommit: false
+                binutils_url: {binutils_url}
+                binutils_branch: {binutils_branch}
+                gcc_url: {gcc_url}
+                gcc_branch: {gcc_branch}
+                linux_url: {linux_url}
+                linux_branch: {linux_branch}
+                glibc_url: {glibc_url}
+                glibc_branch: {glibc_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -997,4 +992,4 @@
     publishers:
         - bisect-publishers
 
-# checksum: b263d327a5c40b3b2468812d017c479b
+# checksum: 092b262989f965f36f9aa86ac6e169a4
diff --git a/tcwg_bmk-code_size-cpu2017fast--llvm.yaml b/tcwg_bmk-code_size-cpu2017fast--llvm.yaml
index 6cc8b1b..4ca69a4 100644
--- a/tcwg_bmk-code_size-cpu2017fast--llvm.yaml
+++ b/tcwg_bmk-code_size-cpu2017fast--llvm.yaml
@@ -207,11 +207,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: llvm
-          url: '{llvm_url}'
-          branch: '{llvm_branch}'
-          reference: llvm-project.git
 
 - wrapper:
     name: build-wrappers
@@ -550,10 +545,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -969,4 +963,4 @@
     publishers:
         - bisect-publishers
 
-# checksum: 5c632dacae6fa4a66f57f99b388820c4
+# checksum: 6e886dcd19b5d53d06d71698bea4d10e
diff --git a/tcwg_bmk-code_size-cpu2017rate--gnu.yaml b/tcwg_bmk-code_size-cpu2017rate--gnu.yaml
index a51b289..6ff521b 100644
--- a/tcwg_bmk-code_size-cpu2017rate--gnu.yaml
+++ b/tcwg_bmk-code_size-cpu2017rate--gnu.yaml
@@ -221,26 +221,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: binutils
-          url: '{binutils_url}'
-          branch: '{binutils_branch}'
-          reference: binutils-gdb.git
-      - component-scm:
-          component: gcc
-          url: '{gcc_url}'
-          branch: '{gcc_branch}'
-          reference: gcc.git
-      - component-scm:
-          component: glibc
-          url: '{glibc_url}'
-          branch: '{glibc_branch}'
-          reference: glibc.git
-      - component-scm:
-          component: linux
-          url: '{linux_url}'
-          branch: '{linux_branch}'
-          reference: linux.git
 
 - wrapper:
     name: build-wrappers
@@ -461,6 +441,14 @@
 
             cat >> artifacts/jenkins/run-build.env <<EOF
             build_name="$build_name"
+            binutils_url="{binutils_url}"
+            binutils_branch="{binutils_branch}"
+            gcc_url="{gcc_url}"
+            gcc_branch="{gcc_branch}"
+            linux_url="{linux_url}"
+            linux_branch="{linux_branch}"
+            glibc_url="{glibc_url}"
+            glibc_branch="{glibc_branch}"
             EOF
           unstable-return: 125
 
@@ -577,10 +565,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -693,6 +680,14 @@
           steps:
             - run-build-init:
                 precommit: false
+                binutils_url: {binutils_url}
+                binutils_branch: {binutils_branch}
+                gcc_url: {gcc_url}
+                gcc_branch: {gcc_branch}
+                linux_url: {linux_url}
+                linux_branch: {linux_branch}
+                glibc_url: {glibc_url}
+                glibc_branch: {glibc_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -997,4 +992,4 @@
     publishers:
         - bisect-publishers
 
-# checksum: 23239e5f3a6a7b07a56faa9508def8a2
+# checksum: 60a1c818ecec083455c96d5ee145537f
diff --git a/tcwg_bmk-code_size-cpu2017rate--llvm.yaml b/tcwg_bmk-code_size-cpu2017rate--llvm.yaml
index 9662759..f48c1cf 100644
--- a/tcwg_bmk-code_size-cpu2017rate--llvm.yaml
+++ b/tcwg_bmk-code_size-cpu2017rate--llvm.yaml
@@ -207,11 +207,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: llvm
-          url: '{llvm_url}'
-          branch: '{llvm_branch}'
-          reference: llvm-project.git
 
 - wrapper:
     name: build-wrappers
@@ -550,10 +545,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -969,4 +963,4 @@
     publishers:
         - bisect-publishers
 
-# checksum: 0a76dc8ed1b30c96dcca35ff1e3b1f1f
+# checksum: 10bdd10448e692eee406233f921f1322
diff --git a/tcwg_bmk-code_size-spec2k6--gnu.yaml b/tcwg_bmk-code_size-spec2k6--gnu.yaml
index 10325de..db2a19f 100644
--- a/tcwg_bmk-code_size-spec2k6--gnu.yaml
+++ b/tcwg_bmk-code_size-spec2k6--gnu.yaml
@@ -222,26 +222,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: binutils
-          url: '{binutils_url}'
-          branch: '{binutils_branch}'
-          reference: binutils-gdb.git
-      - component-scm:
-          component: gcc
-          url: '{gcc_url}'
-          branch: '{gcc_branch}'
-          reference: gcc.git
-      - component-scm:
-          component: glibc
-          url: '{glibc_url}'
-          branch: '{glibc_branch}'
-          reference: glibc.git
-      - component-scm:
-          component: linux
-          url: '{linux_url}'
-          branch: '{linux_branch}'
-          reference: linux.git
 
 - wrapper:
     name: build-wrappers
@@ -462,6 +442,14 @@
 
             cat >> artifacts/jenkins/run-build.env <<EOF
             build_name="$build_name"
+            binutils_url="{binutils_url}"
+            binutils_branch="{binutils_branch}"
+            gcc_url="{gcc_url}"
+            gcc_branch="{gcc_branch}"
+            linux_url="{linux_url}"
+            linux_branch="{linux_branch}"
+            glibc_url="{glibc_url}"
+            glibc_branch="{glibc_branch}"
             EOF
           unstable-return: 125
 
@@ -578,10 +566,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -694,6 +681,14 @@
           steps:
             - run-build-init:
                 precommit: false
+                binutils_url: {binutils_url}
+                binutils_branch: {binutils_branch}
+                gcc_url: {gcc_url}
+                gcc_branch: {gcc_branch}
+                linux_url: {linux_url}
+                linux_branch: {linux_branch}
+                glibc_url: {glibc_url}
+                glibc_branch: {glibc_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -998,4 +993,4 @@
     publishers:
         - bisect-publishers
 
-# checksum: 4a0781bccb04513e117567085976dfc5
+# checksum: 48007dfa2c4080d9e003eba3937915bf
diff --git a/tcwg_bmk-code_size-spec2k6--llvm.yaml b/tcwg_bmk-code_size-spec2k6--llvm.yaml
index 73d6b6a..3fac59d 100644
--- a/tcwg_bmk-code_size-spec2k6--llvm.yaml
+++ b/tcwg_bmk-code_size-spec2k6--llvm.yaml
@@ -209,11 +209,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: llvm
-          url: '{llvm_url}'
-          branch: '{llvm_branch}'
-          reference: llvm-project.git
 
 - wrapper:
     name: build-wrappers
@@ -552,10 +547,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -971,4 +965,4 @@
     publishers:
         - bisect-publishers
 
-# checksum: 4da6ff0be8038cbaf58d7f183a001a71
+# checksum: 6b4f507e7cb9e6a1c032006f364af406
diff --git a/tcwg_bmk-code_speed-coremark--gnu_eabi.yaml b/tcwg_bmk-code_speed-coremark--gnu_eabi.yaml
index 13b9bc9..25ec951 100644
--- a/tcwg_bmk-code_speed-coremark--gnu_eabi.yaml
+++ b/tcwg_bmk-code_speed-coremark--gnu_eabi.yaml
@@ -218,21 +218,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: binutils
-          url: '{binutils_url}'
-          branch: '{binutils_branch}'
-          reference: binutils-gdb.git
-      - component-scm:
-          component: gcc
-          url: '{gcc_url}'
-          branch: '{gcc_branch}'
-          reference: gcc.git
-      - component-scm:
-          component: newlib
-          url: '{newlib_url}'
-          branch: '{newlib_branch}'
-          reference: newlib.git
 
 - wrapper:
     name: build-wrappers
@@ -453,6 +438,12 @@
 
             cat >> artifacts/jenkins/run-build.env <<EOF
             build_name="$build_name"
+            binutils_url="{binutils_url}"
+            binutils_branch="{binutils_branch}"
+            gcc_url="{gcc_url}"
+            gcc_branch="{gcc_branch}"
+            newlib_url="{newlib_url}"
+            newlib_branch="{newlib_branch}"
             EOF
           unstable-return: 125
 
@@ -569,10 +560,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -685,6 +675,12 @@
           steps:
             - run-build-init:
                 precommit: false
+                binutils_url: {binutils_url}
+                binutils_branch: {binutils_branch}
+                gcc_url: {gcc_url}
+                gcc_branch: {gcc_branch}
+                newlib_url: {newlib_url}
+                newlib_branch: {newlib_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -987,4 +983,4 @@
     publishers:
         - bisect-publishers
 
-# checksum: 64690beab4a908779a2b2076c7a263aa
+# checksum: d7dcb0fc1193a5029b26808042457d5f
diff --git a/tcwg_bmk-code_speed-cpu2017rate--gnu.yaml b/tcwg_bmk-code_speed-cpu2017rate--gnu.yaml
index 871c029..d883506 100644
--- a/tcwg_bmk-code_speed-cpu2017rate--gnu.yaml
+++ b/tcwg_bmk-code_speed-cpu2017rate--gnu.yaml
@@ -224,26 +224,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: binutils
-          url: '{binutils_url}'
-          branch: '{binutils_branch}'
-          reference: binutils-gdb.git
-      - component-scm:
-          component: gcc
-          url: '{gcc_url}'
-          branch: '{gcc_branch}'
-          reference: gcc.git
-      - component-scm:
-          component: glibc
-          url: '{glibc_url}'
-          branch: '{glibc_branch}'
-          reference: glibc.git
-      - component-scm:
-          component: linux
-          url: '{linux_url}'
-          branch: '{linux_branch}'
-          reference: linux.git
 
 - wrapper:
     name: build-wrappers
@@ -464,6 +444,14 @@
 
             cat >> artifacts/jenkins/run-build.env <<EOF
             build_name="$build_name"
+            binutils_url="{binutils_url}"
+            binutils_branch="{binutils_branch}"
+            gcc_url="{gcc_url}"
+            gcc_branch="{gcc_branch}"
+            linux_url="{linux_url}"
+            linux_branch="{linux_branch}"
+            glibc_url="{glibc_url}"
+            glibc_branch="{glibc_branch}"
             EOF
           unstable-return: 125
 
@@ -580,10 +568,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -696,6 +683,14 @@
           steps:
             - run-build-init:
                 precommit: false
+                binutils_url: {binutils_url}
+                binutils_branch: {binutils_branch}
+                gcc_url: {gcc_url}
+                gcc_branch: {gcc_branch}
+                linux_url: {linux_url}
+                linux_branch: {linux_branch}
+                glibc_url: {glibc_url}
+                glibc_branch: {glibc_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -1000,4 +995,4 @@
     publishers:
         - bisect-publishers
 
-# checksum: b099436075d931ca4336ffe506232975
+# checksum: a2a49ec7f85836462d68da3e3d0e1bc5
diff --git a/tcwg_bmk-code_speed-cpu2017rate--llvm.yaml b/tcwg_bmk-code_speed-cpu2017rate--llvm.yaml
index cfb0cb2..b379b3a 100644
--- a/tcwg_bmk-code_speed-cpu2017rate--llvm.yaml
+++ b/tcwg_bmk-code_speed-cpu2017rate--llvm.yaml
@@ -213,11 +213,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: llvm
-          url: '{llvm_url}'
-          branch: '{llvm_branch}'
-          reference: llvm-project.git
 
 - wrapper:
     name: build-wrappers
@@ -556,10 +551,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -975,4 +969,4 @@
     publishers:
         - bisect-publishers
 
-# checksum: 7c815bf22135b0bf479259132ac27b04
+# checksum: 4ce54dad61d00080ab8d6a5b42dc047b
diff --git a/tcwg_bmk-code_speed-cpu2017speed--gnu.yaml b/tcwg_bmk-code_speed-cpu2017speed--gnu.yaml
index 94e9643..36fd7df 100644
--- a/tcwg_bmk-code_speed-cpu2017speed--gnu.yaml
+++ b/tcwg_bmk-code_speed-cpu2017speed--gnu.yaml
@@ -223,26 +223,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: binutils
-          url: '{binutils_url}'
-          branch: '{binutils_branch}'
-          reference: binutils-gdb.git
-      - component-scm:
-          component: gcc
-          url: '{gcc_url}'
-          branch: '{gcc_branch}'
-          reference: gcc.git
-      - component-scm:
-          component: glibc
-          url: '{glibc_url}'
-          branch: '{glibc_branch}'
-          reference: glibc.git
-      - component-scm:
-          component: linux
-          url: '{linux_url}'
-          branch: '{linux_branch}'
-          reference: linux.git
 
 - wrapper:
     name: build-wrappers
@@ -463,6 +443,14 @@
 
             cat >> artifacts/jenkins/run-build.env <<EOF
             build_name="$build_name"
+            binutils_url="{binutils_url}"
+            binutils_branch="{binutils_branch}"
+            gcc_url="{gcc_url}"
+            gcc_branch="{gcc_branch}"
+            linux_url="{linux_url}"
+            linux_branch="{linux_branch}"
+            glibc_url="{glibc_url}"
+            glibc_branch="{glibc_branch}"
             EOF
           unstable-return: 125
 
@@ -579,10 +567,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -695,6 +682,14 @@
           steps:
             - run-build-init:
                 precommit: false
+                binutils_url: {binutils_url}
+                binutils_branch: {binutils_branch}
+                gcc_url: {gcc_url}
+                gcc_branch: {gcc_branch}
+                linux_url: {linux_url}
+                linux_branch: {linux_branch}
+                glibc_url: {glibc_url}
+                glibc_branch: {glibc_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -1002,4 +997,4 @@
     publishers:
         - bisect-publishers
 
-# checksum: 82abae20deb978c74840da78bc1c91ab
+# checksum: 322be44e7688b00c5ddc1d865fabf081
diff --git a/tcwg_bmk-code_speed-cpu2017speed--llvm.yaml b/tcwg_bmk-code_speed-cpu2017speed--llvm.yaml
index d025b46..1ca822c 100644
--- a/tcwg_bmk-code_speed-cpu2017speed--llvm.yaml
+++ b/tcwg_bmk-code_speed-cpu2017speed--llvm.yaml
@@ -211,11 +211,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: llvm
-          url: '{llvm_url}'
-          branch: '{llvm_branch}'
-          reference: llvm-project.git
 
 - wrapper:
     name: build-wrappers
@@ -554,10 +549,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -976,4 +970,4 @@
     publishers:
         - bisect-publishers
 
-# checksum: 8e114a6cd04f3786d8a3db25a3e6aea7
+# checksum: 4c578701a15c2e580c7d0c1829d715b3
diff --git a/tcwg_bmk-code_speed-spec2k6--gnu.yaml b/tcwg_bmk-code_speed-spec2k6--gnu.yaml
index 081a98b..2856488 100644
--- a/tcwg_bmk-code_speed-spec2k6--gnu.yaml
+++ b/tcwg_bmk-code_speed-spec2k6--gnu.yaml
@@ -224,26 +224,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: binutils
-          url: '{binutils_url}'
-          branch: '{binutils_branch}'
-          reference: binutils-gdb.git
-      - component-scm:
-          component: gcc
-          url: '{gcc_url}'
-          branch: '{gcc_branch}'
-          reference: gcc.git
-      - component-scm:
-          component: glibc
-          url: '{glibc_url}'
-          branch: '{glibc_branch}'
-          reference: glibc.git
-      - component-scm:
-          component: linux
-          url: '{linux_url}'
-          branch: '{linux_branch}'
-          reference: linux.git
 
 - wrapper:
     name: build-wrappers
@@ -464,6 +444,14 @@
 
             cat >> artifacts/jenkins/run-build.env <<EOF
             build_name="$build_name"
+            binutils_url="{binutils_url}"
+            binutils_branch="{binutils_branch}"
+            gcc_url="{gcc_url}"
+            gcc_branch="{gcc_branch}"
+            linux_url="{linux_url}"
+            linux_branch="{linux_branch}"
+            glibc_url="{glibc_url}"
+            glibc_branch="{glibc_branch}"
             EOF
           unstable-return: 125
 
@@ -580,10 +568,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -696,6 +683,14 @@
           steps:
             - run-build-init:
                 precommit: false
+                binutils_url: {binutils_url}
+                binutils_branch: {binutils_branch}
+                gcc_url: {gcc_url}
+                gcc_branch: {gcc_branch}
+                linux_url: {linux_url}
+                linux_branch: {linux_branch}
+                glibc_url: {glibc_url}
+                glibc_branch: {glibc_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -1006,4 +1001,4 @@
     publishers:
         - bisect-publishers
 
-# checksum: 9e7a212add9304279fcc5ea8f6a46d5c
+# checksum: 21812e067f05a1d0830e789c9a8a88e3
diff --git a/tcwg_bmk-code_speed-spec2k6--llvm.yaml b/tcwg_bmk-code_speed-spec2k6--llvm.yaml
index 09a76fb..5ca141f 100644
--- a/tcwg_bmk-code_speed-spec2k6--llvm.yaml
+++ b/tcwg_bmk-code_speed-spec2k6--llvm.yaml
@@ -213,11 +213,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: llvm
-          url: '{llvm_url}'
-          branch: '{llvm_branch}'
-          reference: llvm-project.git
 
 - wrapper:
     name: build-wrappers
@@ -556,10 +551,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -981,4 +975,4 @@
     publishers:
         - bisect-publishers
 
-# checksum: eac63b817a793631dba88276e0fd0012
+# checksum: 05f8bdcde4ef3d89e899bf3ccc865b60
diff --git a/tcwg_bmk-code_sve-cpu2017fast--gnu.yaml b/tcwg_bmk-code_sve-cpu2017fast--gnu.yaml
index b5b6e54..f7892e4 100644
--- a/tcwg_bmk-code_sve-cpu2017fast--gnu.yaml
+++ b/tcwg_bmk-code_sve-cpu2017fast--gnu.yaml
@@ -219,26 +219,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: binutils
-          url: '{binutils_url}'
-          branch: '{binutils_branch}'
-          reference: binutils-gdb.git
-      - component-scm:
-          component: gcc
-          url: '{gcc_url}'
-          branch: '{gcc_branch}'
-          reference: gcc.git
-      - component-scm:
-          component: glibc
-          url: '{glibc_url}'
-          branch: '{glibc_branch}'
-          reference: glibc.git
-      - component-scm:
-          component: linux
-          url: '{linux_url}'
-          branch: '{linux_branch}'
-          reference: linux.git
 
 - wrapper:
     name: build-wrappers
@@ -459,6 +439,14 @@
 
             cat >> artifacts/jenkins/run-build.env <<EOF
             build_name="$build_name"
+            binutils_url="{binutils_url}"
+            binutils_branch="{binutils_branch}"
+            gcc_url="{gcc_url}"
+            gcc_branch="{gcc_branch}"
+            linux_url="{linux_url}"
+            linux_branch="{linux_branch}"
+            glibc_url="{glibc_url}"
+            glibc_branch="{glibc_branch}"
             EOF
           unstable-return: 125
 
@@ -575,10 +563,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -691,6 +678,14 @@
           steps:
             - run-build-init:
                 precommit: false
+                binutils_url: {binutils_url}
+                binutils_branch: {binutils_branch}
+                gcc_url: {gcc_url}
+                gcc_branch: {gcc_branch}
+                linux_url: {linux_url}
+                linux_branch: {linux_branch}
+                glibc_url: {glibc_url}
+                glibc_branch: {glibc_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -995,4 +990,4 @@
     publishers:
         - bisect-publishers
 
-# checksum: 12303cfe6d7245d56b69afc7ee6d7b59
+# checksum: 71664e03dca1adccf0d41f8fcf15392e
diff --git a/tcwg_bmk-code_vect-cpu2017fast--gnu.yaml b/tcwg_bmk-code_vect-cpu2017fast--gnu.yaml
index 0fb61a6..87b3b95 100644
--- a/tcwg_bmk-code_vect-cpu2017fast--gnu.yaml
+++ b/tcwg_bmk-code_vect-cpu2017fast--gnu.yaml
@@ -219,26 +219,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: binutils
-          url: '{binutils_url}'
-          branch: '{binutils_branch}'
-          reference: binutils-gdb.git
-      - component-scm:
-          component: gcc
-          url: '{gcc_url}'
-          branch: '{gcc_branch}'
-          reference: gcc.git
-      - component-scm:
-          component: glibc
-          url: '{glibc_url}'
-          branch: '{glibc_branch}'
-          reference: glibc.git
-      - component-scm:
-          component: linux
-          url: '{linux_url}'
-          branch: '{linux_branch}'
-          reference: linux.git
 
 - wrapper:
     name: build-wrappers
@@ -459,6 +439,14 @@
 
             cat >> artifacts/jenkins/run-build.env <<EOF
             build_name="$build_name"
+            binutils_url="{binutils_url}"
+            binutils_branch="{binutils_branch}"
+            gcc_url="{gcc_url}"
+            gcc_branch="{gcc_branch}"
+            linux_url="{linux_url}"
+            linux_branch="{linux_branch}"
+            glibc_url="{glibc_url}"
+            glibc_branch="{glibc_branch}"
             EOF
           unstable-return: 125
 
@@ -575,10 +563,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -691,6 +678,14 @@
           steps:
             - run-build-init:
                 precommit: false
+                binutils_url: {binutils_url}
+                binutils_branch: {binutils_branch}
+                gcc_url: {gcc_url}
+                gcc_branch: {gcc_branch}
+                linux_url: {linux_url}
+                linux_branch: {linux_branch}
+                glibc_url: {glibc_url}
+                glibc_branch: {glibc_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -995,4 +990,4 @@
     publishers:
         - bisect-publishers
 
-# checksum: 9bd30b469111d1406be26938428f7ec1
+# checksum: 1753444382b32b8f934afa1c267d03f1
diff --git a/tcwg_bmk-code_vect-cpu2017fast--llvm.yaml b/tcwg_bmk-code_vect-cpu2017fast--llvm.yaml
index afe49e0..ffa11a6 100644
--- a/tcwg_bmk-code_vect-cpu2017fast--llvm.yaml
+++ b/tcwg_bmk-code_vect-cpu2017fast--llvm.yaml
@@ -205,11 +205,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: llvm
-          url: '{llvm_url}'
-          branch: '{llvm_branch}'
-          reference: llvm-project.git
 
 - wrapper:
     name: build-wrappers
@@ -548,10 +543,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -967,4 +961,4 @@
     publishers:
         - bisect-publishers
 
-# checksum: 9058f34a3e6c71e9684a64b4f4655d79
+# checksum: 940f5d811d05136fe209147d82f04c05
diff --git a/tcwg_bmk-code_vect-cpu2017rate--gnu.yaml b/tcwg_bmk-code_vect-cpu2017rate--gnu.yaml
index b17b5df..0ba07e5 100644
--- a/tcwg_bmk-code_vect-cpu2017rate--gnu.yaml
+++ b/tcwg_bmk-code_vect-cpu2017rate--gnu.yaml
@@ -219,26 +219,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: binutils
-          url: '{binutils_url}'
-          branch: '{binutils_branch}'
-          reference: binutils-gdb.git
-      - component-scm:
-          component: gcc
-          url: '{gcc_url}'
-          branch: '{gcc_branch}'
-          reference: gcc.git
-      - component-scm:
-          component: glibc
-          url: '{glibc_url}'
-          branch: '{glibc_branch}'
-          reference: glibc.git
-      - component-scm:
-          component: linux
-          url: '{linux_url}'
-          branch: '{linux_branch}'
-          reference: linux.git
 
 - wrapper:
     name: build-wrappers
@@ -459,6 +439,14 @@
 
             cat >> artifacts/jenkins/run-build.env <<EOF
             build_name="$build_name"
+            binutils_url="{binutils_url}"
+            binutils_branch="{binutils_branch}"
+            gcc_url="{gcc_url}"
+            gcc_branch="{gcc_branch}"
+            linux_url="{linux_url}"
+            linux_branch="{linux_branch}"
+            glibc_url="{glibc_url}"
+            glibc_branch="{glibc_branch}"
             EOF
           unstable-return: 125
 
@@ -575,10 +563,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -691,6 +678,14 @@
           steps:
             - run-build-init:
                 precommit: false
+                binutils_url: {binutils_url}
+                binutils_branch: {binutils_branch}
+                gcc_url: {gcc_url}
+                gcc_branch: {gcc_branch}
+                linux_url: {linux_url}
+                linux_branch: {linux_branch}
+                glibc_url: {glibc_url}
+                glibc_branch: {glibc_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -995,4 +990,4 @@
     publishers:
         - bisect-publishers
 
-# checksum: a8a0695f3d1c0ff692ca1af759ecfd61
+# checksum: 36285ef62b3e90ec7e59aeb2903cdb2c
diff --git a/tcwg_bmk-code_vect-cpu2017rate--llvm.yaml b/tcwg_bmk-code_vect-cpu2017rate--llvm.yaml
index 7fef72a..2a4130a 100644
--- a/tcwg_bmk-code_vect-cpu2017rate--llvm.yaml
+++ b/tcwg_bmk-code_vect-cpu2017rate--llvm.yaml
@@ -205,11 +205,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: llvm
-          url: '{llvm_url}'
-          branch: '{llvm_branch}'
-          reference: llvm-project.git
 
 - wrapper:
     name: build-wrappers
@@ -548,10 +543,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -967,4 +961,4 @@
     publishers:
         - bisect-publishers
 
-# checksum: 6829a843d033399977c95be30edf221f
+# checksum: d6299403ffe1b18de135e2dbc0de5172
diff --git a/tcwg_bmk-code_vect-spec2k6--gnu.yaml b/tcwg_bmk-code_vect-spec2k6--gnu.yaml
index 7b6b1b6..e60b468 100644
--- a/tcwg_bmk-code_vect-spec2k6--gnu.yaml
+++ b/tcwg_bmk-code_vect-spec2k6--gnu.yaml
@@ -220,26 +220,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: binutils
-          url: '{binutils_url}'
-          branch: '{binutils_branch}'
-          reference: binutils-gdb.git
-      - component-scm:
-          component: gcc
-          url: '{gcc_url}'
-          branch: '{gcc_branch}'
-          reference: gcc.git
-      - component-scm:
-          component: glibc
-          url: '{glibc_url}'
-          branch: '{glibc_branch}'
-          reference: glibc.git
-      - component-scm:
-          component: linux
-          url: '{linux_url}'
-          branch: '{linux_branch}'
-          reference: linux.git
 
 - wrapper:
     name: build-wrappers
@@ -460,6 +440,14 @@
 
             cat >> artifacts/jenkins/run-build.env <<EOF
             build_name="$build_name"
+            binutils_url="{binutils_url}"
+            binutils_branch="{binutils_branch}"
+            gcc_url="{gcc_url}"
+            gcc_branch="{gcc_branch}"
+            linux_url="{linux_url}"
+            linux_branch="{linux_branch}"
+            glibc_url="{glibc_url}"
+            glibc_branch="{glibc_branch}"
             EOF
           unstable-return: 125
 
@@ -576,10 +564,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -692,6 +679,14 @@
           steps:
             - run-build-init:
                 precommit: false
+                binutils_url: {binutils_url}
+                binutils_branch: {binutils_branch}
+                gcc_url: {gcc_url}
+                gcc_branch: {gcc_branch}
+                linux_url: {linux_url}
+                linux_branch: {linux_branch}
+                glibc_url: {glibc_url}
+                glibc_branch: {glibc_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -996,4 +991,4 @@
     publishers:
         - bisect-publishers
 
-# checksum: b060a2b7a25f7dd3ccb889db6aac8f28
+# checksum: 7b1e0696016cb22d0e186ebbb38db191
diff --git a/tcwg_bmk-code_vect-spec2k6--llvm.yaml b/tcwg_bmk-code_vect-spec2k6--llvm.yaml
index 43b7a32..bc8cd8c 100644
--- a/tcwg_bmk-code_vect-spec2k6--llvm.yaml
+++ b/tcwg_bmk-code_vect-spec2k6--llvm.yaml
@@ -207,11 +207,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: llvm
-          url: '{llvm_url}'
-          branch: '{llvm_branch}'
-          reference: llvm-project.git
 
 - wrapper:
     name: build-wrappers
@@ -550,10 +545,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -969,4 +963,4 @@
     publishers:
         - bisect-publishers
 
-# checksum: ab705c9fbdbe97762d3315697f8b675f
+# checksum: e204b43e5019fed54bfabba8fef34145
diff --git a/tcwg_bmk-fujitsu_speed-cpu2017speed--gnu.yaml b/tcwg_bmk-fujitsu_speed-cpu2017speed--gnu.yaml
index 0929058..f72a808 100644
--- a/tcwg_bmk-fujitsu_speed-cpu2017speed--gnu.yaml
+++ b/tcwg_bmk-fujitsu_speed-cpu2017speed--gnu.yaml
@@ -219,26 +219,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: binutils
-          url: '{binutils_url}'
-          branch: '{binutils_branch}'
-          reference: binutils-gdb.git
-      - component-scm:
-          component: gcc
-          url: '{gcc_url}'
-          branch: '{gcc_branch}'
-          reference: gcc.git
-      - component-scm:
-          component: glibc
-          url: '{glibc_url}'
-          branch: '{glibc_branch}'
-          reference: glibc.git
-      - component-scm:
-          component: linux
-          url: '{linux_url}'
-          branch: '{linux_branch}'
-          reference: linux.git
 
 - wrapper:
     name: build-wrappers
@@ -459,6 +439,14 @@
 
             cat >> artifacts/jenkins/run-build.env <<EOF
             build_name="$build_name"
+            binutils_url="{binutils_url}"
+            binutils_branch="{binutils_branch}"
+            gcc_url="{gcc_url}"
+            gcc_branch="{gcc_branch}"
+            linux_url="{linux_url}"
+            linux_branch="{linux_branch}"
+            glibc_url="{glibc_url}"
+            glibc_branch="{glibc_branch}"
             EOF
           unstable-return: 125
 
@@ -575,10 +563,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -691,6 +678,14 @@
           steps:
             - run-build-init:
                 precommit: false
+                binutils_url: {binutils_url}
+                binutils_branch: {binutils_branch}
+                gcc_url: {gcc_url}
+                gcc_branch: {gcc_branch}
+                linux_url: {linux_url}
+                linux_branch: {linux_branch}
+                glibc_url: {glibc_url}
+                glibc_branch: {glibc_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -995,4 +990,4 @@
     publishers:
         - bisect-publishers
 
-# checksum: 4163b05882760fc8f09e3a6502f48454
+# checksum: 4c41ed0283d83b5e5b3500da98f0e944
diff --git a/tcwg_bmk-fujitsu_speed-cpu2017speed--llvm.yaml b/tcwg_bmk-fujitsu_speed-cpu2017speed--llvm.yaml
index c383110..6533750 100644
--- a/tcwg_bmk-fujitsu_speed-cpu2017speed--llvm.yaml
+++ b/tcwg_bmk-fujitsu_speed-cpu2017speed--llvm.yaml
@@ -206,11 +206,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: llvm
-          url: '{llvm_url}'
-          branch: '{llvm_branch}'
-          reference: llvm-project.git
 
 - wrapper:
     name: build-wrappers
@@ -549,10 +544,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -968,4 +962,4 @@
     publishers:
         - bisect-publishers
 
-# checksum: 97b18bb82e52acfd2074d0eca2e39255
+# checksum: 044cd9651a959dbd1bfff6e5d6338d19
diff --git a/tcwg_bmk-qc_speed-cpu2017rate--gnu.yaml b/tcwg_bmk-qc_speed-cpu2017rate--gnu.yaml
index 83b6cdf..d81f427 100644
--- a/tcwg_bmk-qc_speed-cpu2017rate--gnu.yaml
+++ b/tcwg_bmk-qc_speed-cpu2017rate--gnu.yaml
@@ -219,26 +219,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: binutils
-          url: '{binutils_url}'
-          branch: '{binutils_branch}'
-          reference: binutils-gdb.git
-      - component-scm:
-          component: gcc
-          url: '{gcc_url}'
-          branch: '{gcc_branch}'
-          reference: gcc.git
-      - component-scm:
-          component: glibc
-          url: '{glibc_url}'
-          branch: '{glibc_branch}'
-          reference: glibc.git
-      - component-scm:
-          component: linux
-          url: '{linux_url}'
-          branch: '{linux_branch}'
-          reference: linux.git
 
 - wrapper:
     name: build-wrappers
@@ -459,6 +439,14 @@
 
             cat >> artifacts/jenkins/run-build.env <<EOF
             build_name="$build_name"
+            binutils_url="{binutils_url}"
+            binutils_branch="{binutils_branch}"
+            gcc_url="{gcc_url}"
+            gcc_branch="{gcc_branch}"
+            linux_url="{linux_url}"
+            linux_branch="{linux_branch}"
+            glibc_url="{glibc_url}"
+            glibc_branch="{glibc_branch}"
             EOF
           unstable-return: 125
 
@@ -577,10 +565,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -693,6 +680,14 @@
           steps:
             - run-build-init:
                 precommit: false
+                binutils_url: {binutils_url}
+                binutils_branch: {binutils_branch}
+                gcc_url: {gcc_url}
+                gcc_branch: {gcc_branch}
+                linux_url: {linux_url}
+                linux_branch: {linux_branch}
+                glibc_url: {glibc_url}
+                glibc_branch: {glibc_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -1002,4 +997,4 @@
     publishers:
         - bisect-publishers
 
-# checksum: e1bb23db562a1e5db58fde2bf85ef33a
+# checksum: 13a738c7b5eb2a277772f359f700231c
diff --git a/tcwg_bmk-qc_speed-cpu2017rate--llvm.yaml b/tcwg_bmk-qc_speed-cpu2017rate--llvm.yaml
index 7812a6c..05b08d6 100644
--- a/tcwg_bmk-qc_speed-cpu2017rate--llvm.yaml
+++ b/tcwg_bmk-qc_speed-cpu2017rate--llvm.yaml
@@ -205,11 +205,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: llvm
-          url: '{llvm_url}'
-          branch: '{llvm_branch}'
-          reference: llvm-project.git
 
 - wrapper:
     name: build-wrappers
@@ -548,10 +543,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -967,4 +961,4 @@
     publishers:
         - bisect-publishers
 
-# checksum: 006c29fa6e51c8f05a1e5e0b98e68b78
+# checksum: 1184bac954e9ae1cfdaa112e0aba1a62
diff --git a/tcwg_bootstrap.yaml b/tcwg_bootstrap.yaml
index 74285dd..2f8c2c4 100644
--- a/tcwg_bootstrap.yaml
+++ b/tcwg_bootstrap.yaml
@@ -226,11 +226,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: gcc
-          url: '{gcc_url}'
-          branch: '{gcc_branch}'
-          reference: gcc.git
 
 - wrapper:
     name: build-wrappers
@@ -462,6 +457,8 @@
 
             cat >> artifacts/jenkins/run-build.env <<EOF
             build_name="$build_name"
+            gcc_url="{gcc_url}"
+            gcc_branch="{gcc_branch}"
             EOF
           unstable-return: 125
 
@@ -578,10 +575,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -694,6 +690,8 @@
           steps:
             - run-build-init:
                 precommit: false
+                gcc_url: {gcc_url}
+                gcc_branch: {gcc_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -1058,6 +1056,8 @@
           steps:
             - run-build-init:
                 precommit: true
+                gcc_url: {gcc_url}
+                gcc_branch: {gcc_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -1269,9 +1269,7 @@
     display-name: 'TCWG Build {ci_project}/{ci_config}'
     workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
     scm:
-      - build-scms:
-          gcc_url: '{gcc_url}'
-          gcc_branch: '{gcc_branch}'
+      - build-scms
     triggers:
       - pollscm:
           cron: '{cron}'
@@ -1354,4 +1352,4 @@
           docker_security: '{docker_security}'
     publishers:
       - bisect-publishers
-# checksum: 8fded8144b26de32b569fd8f4c73b9b2
+# checksum: 0827aa99678a028bd76a32561d1e6955
diff --git a/tcwg_flang_build.yaml b/tcwg_flang_build.yaml
index dc05415..ff5cf0e 100644
--- a/tcwg_flang_build.yaml
+++ b/tcwg_flang_build.yaml
@@ -166,11 +166,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: llvm
-          url: '{llvm_url}'
-          branch: '{llvm_branch}'
-          reference: llvm-project.git
 
 - wrapper:
     name: build-wrappers
@@ -504,10 +499,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -915,4 +909,4 @@
           build_script: 'tcwg_llvm-build.sh'
     publishers:
       - bisect-publishers
-# checksum: d75e3eac18beb68c46ee504e2e80126d
+# checksum: 4935eecc0552a0b3b7d00b8e71d56df9
diff --git a/tcwg_flang_test.yaml b/tcwg_flang_test.yaml
index 64c39d5..28a5d74 100644
--- a/tcwg_flang_test.yaml
+++ b/tcwg_flang_test.yaml
@@ -180,21 +180,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: fujitsu_testsuite
-          url: '{fujitsu_testsuite_url}'
-          branch: '{fujitsu_testsuite_branch}'
-          reference: compiler-test-suite.git
-      - component-scm:
-          component: llvm
-          url: '{llvm_url}'
-          branch: '{llvm_branch}'
-          reference: llvm-project.git
-      - component-scm:
-          component: llvm_testsuite
-          url: '{llvm_testsuite_url}'
-          branch: '{llvm_testsuite_branch}'
-          reference: llvm-test-suite.git
 
 - wrapper:
     name: build-wrappers
@@ -528,10 +513,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -943,4 +927,4 @@
           build_script: 'tcwg_llvm-build.sh'
     publishers:
       - bisect-publishers
-# checksum: 6c8634df5689a3239d551fdb6f10d90c
+# checksum: 5df98df6e8e0a10e6a72956fe8d8e8d8
diff --git a/tcwg_gcc.yaml b/tcwg_gcc.yaml
index 59e55b3..a5bda93 100644
--- a/tcwg_gcc.yaml
+++ b/tcwg_gcc.yaml
@@ -204,11 +204,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: gcc
-          url: '{gcc_url}'
-          branch: '{gcc_branch}'
-          reference: gcc.git
 
 - wrapper:
     name: build-wrappers
@@ -513,6 +508,8 @@
 
             cat >> artifacts/jenkins/run-build.env <<EOF
             build_name="$build_name"
+            gcc_url="{gcc_url}"
+            gcc_branch="{gcc_branch}"
             EOF
           unstable-return: 125
 
@@ -629,10 +626,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -745,6 +741,8 @@
           steps:
             - run-build-init:
                 precommit: false
+                gcc_url: {gcc_url}
+                gcc_branch: {gcc_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -1115,6 +1113,8 @@
           steps:
             - run-build-init:
                 precommit: true
+                gcc_url: {gcc_url}
+                gcc_branch: {gcc_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -1340,9 +1340,7 @@
     display-name: 'TCWG Build {ci_project}/{ci_config}'
     workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
     scm:
-      - build-scms:
-          gcc_url: '{gcc_url}'
-          gcc_branch: '{gcc_branch}'
+      - build-scms
     triggers:
       - timed: '{cron}'
     wrappers:
@@ -1424,4 +1422,4 @@
           docker_security: '{docker_security}'
     publishers:
       - bisect-publishers
-# checksum: e733eaa2cbf614fec2931f590892af89
+# checksum: 100f730676f212f2ffcc94da56e95505
diff --git a/tcwg_gdb.yaml b/tcwg_gdb.yaml
index a03b53e..52b25a6 100644
--- a/tcwg_gdb.yaml
+++ b/tcwg_gdb.yaml
@@ -205,11 +205,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: gdb
-          url: '{gdb_url}'
-          branch: '{gdb_branch}'
-          reference: binutils-gdb.git
 
 - wrapper:
     name: build-wrappers
@@ -514,6 +509,8 @@
 
             cat >> artifacts/jenkins/run-build.env <<EOF
             build_name="$build_name"
+            gdb_url="{gdb_url}"
+            gdb_branch="{gdb_branch}"
             EOF
           unstable-return: 125
 
@@ -630,10 +627,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -746,6 +742,8 @@
           steps:
             - run-build-init:
                 precommit: false
+                gdb_url: {gdb_url}
+                gdb_branch: {gdb_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -1116,6 +1114,8 @@
           steps:
             - run-build-init:
                 precommit: true
+                gdb_url: {gdb_url}
+                gdb_branch: {gdb_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -1327,9 +1327,7 @@
     display-name: 'TCWG Build {ci_project}/{ci_config}'
     workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
     scm:
-      - build-scms:
-          gdb_url: '{gdb_url}'
-          gdb_branch: '{gdb_branch}'
+      - build-scms
     triggers:
       - timed: '{cron}'
     wrappers:
@@ -1411,4 +1409,4 @@
           docker_security: '{docker_security}'
     publishers:
       - bisect-publishers
-# checksum: 95ff97d19de50a718005bc5a82149191
+# checksum: efdc4f2df4e0ba186daf5390b35e5875
diff --git a/tcwg_glibc.yaml b/tcwg_glibc.yaml
index dc177e6..6267451 100644
--- a/tcwg_glibc.yaml
+++ b/tcwg_glibc.yaml
@@ -208,11 +208,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: glibc
-          url: '{glibc_url}'
-          branch: '{glibc_branch}'
-          reference: glibc.git
 
 - wrapper:
     name: build-wrappers
@@ -517,6 +512,8 @@
 
             cat >> artifacts/jenkins/run-build.env <<EOF
             build_name="$build_name"
+            glibc_url="{glibc_url}"
+            glibc_branch="{glibc_branch}"
             EOF
           unstable-return: 125
 
@@ -634,10 +631,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -750,6 +746,8 @@
           steps:
             - run-build-init:
                 precommit: false
+                glibc_url: {glibc_url}
+                glibc_branch: {glibc_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -1121,6 +1119,8 @@
           steps:
             - run-build-init:
                 precommit: true
+                glibc_url: {glibc_url}
+                glibc_branch: {glibc_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -1334,9 +1334,7 @@
     display-name: 'TCWG Build {ci_project}/{ci_config}'
     workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
     scm:
-      - build-scms:
-          glibc_url: '{glibc_url}'
-          glibc_branch: '{glibc_branch}'
+      - build-scms
     triggers:
       - timed: '{cron}'
     wrappers:
@@ -1418,4 +1416,4 @@
           docker_security: '{docker_security}'
     publishers:
       - bisect-publishers
-# checksum: 39a50c2ccd8159154df95cfc3198bb19
+# checksum: 454f9de575e1f25c5e3ef5d09cc2cc6b
diff --git a/tcwg_gnu.yaml.in b/tcwg_gnu.yaml.in
index 70e34b5..25474a6 100644
--- a/tcwg_gnu.yaml.in
+++ b/tcwg_gnu.yaml.in
@@ -219,39 +219,7 @@
     display-name: 'TCWG Build {ci_project}/{ci_config}'
     workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
     scm:
-      - build-scms:
-#if COMPONENTS_binutils
-          binutils_url: '{binutils_url}'
-          binutils_branch: '{binutils_branch}'
-#endif
-#if COMPONENTS_gcc
-          gcc_url: '{gcc_url}'
-          gcc_branch: '{gcc_branch}'
-#endif
-#if COMPONENTS_linux
-          linux_url: '{linux_url}'
-          linux_branch: '{linux_branch}'
-#endif
-#if COMPONENTS_glibc
-          glibc_url: '{glibc_url}'
-          glibc_branch: '{glibc_branch}'
-#endif
-#if COMPONENTS_gdb
-          gdb_url: '{gdb_url}'
-          gdb_branch: '{gdb_branch}'
-#endif
-#if COMPONENTS_mingw
-          mingw_url: '{mingw_url}'
-          mingw_branch: '{mingw_branch}'
-#endif
-#if COMPONENTS_newlib
-          newlib_url: '{newlib_url}'
-          newlib_branch: '{newlib_branch}'
-#endif
-#if COMPONENTS_qemu
-          qemu_url: '{qemu_url}'
-          qemu_branch: '{qemu_branch}'
-#endif
+      - build-scms
     triggers:
 #if PRECOMMIT_TRIGGER_yes
       - timed: '{cron}'
diff --git a/tcwg_gnu_cross.yaml b/tcwg_gnu_cross.yaml
index 375476e..8e1db21 100644
--- a/tcwg_gnu_cross.yaml
+++ b/tcwg_gnu_cross.yaml
@@ -226,36 +226,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: binutils
-          url: '{binutils_url}'
-          branch: '{binutils_branch}'
-          reference: binutils-gdb.git
-      - component-scm:
-          component: gcc
-          url: '{gcc_url}'
-          branch: '{gcc_branch}'
-          reference: gcc.git
-      - component-scm:
-          component: gdb
-          url: '{gdb_url}'
-          branch: '{gdb_branch}'
-          reference: binutils-gdb.git
-      - component-scm:
-          component: glibc
-          url: '{glibc_url}'
-          branch: '{glibc_branch}'
-          reference: glibc.git
-      - component-scm:
-          component: linux
-          url: '{linux_url}'
-          branch: '{linux_branch}'
-          reference: linux.git
-      - component-scm:
-          component: qemu
-          url: '{qemu_url}'
-          branch: '{qemu_branch}'
-          reference: qemu.git
 
 - wrapper:
     name: build-wrappers
@@ -487,6 +457,18 @@
 
             cat >> artifacts/jenkins/run-build.env <<EOF
             build_name="$build_name"
+            binutils_url="{binutils_url}"
+            binutils_branch="{binutils_branch}"
+            gcc_url="{gcc_url}"
+            gcc_branch="{gcc_branch}"
+            linux_url="{linux_url}"
+            linux_branch="{linux_branch}"
+            glibc_url="{glibc_url}"
+            glibc_branch="{glibc_branch}"
+            gdb_url="{gdb_url}"
+            gdb_branch="{gdb_branch}"
+            qemu_url="{qemu_url}"
+            qemu_branch="{qemu_branch}"
             EOF
           unstable-return: 125
 
@@ -601,10 +583,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -717,6 +698,18 @@
           steps:
             - run-build-init:
                 precommit: false
+                binutils_url: {binutils_url}
+                binutils_branch: {binutils_branch}
+                gcc_url: {gcc_url}
+                gcc_branch: {gcc_branch}
+                linux_url: {linux_url}
+                linux_branch: {linux_branch}
+                glibc_url: {glibc_url}
+                glibc_branch: {glibc_branch}
+                gdb_url: {gdb_url}
+                gdb_branch: {gdb_branch}
+                qemu_url: {qemu_url}
+                qemu_branch: {qemu_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -1080,6 +1073,18 @@
           steps:
             - run-build-init:
                 precommit: true
+                binutils_url: {binutils_url}
+                binutils_branch: {binutils_branch}
+                gcc_url: {gcc_url}
+                gcc_branch: {gcc_branch}
+                linux_url: {linux_url}
+                linux_branch: {linux_branch}
+                glibc_url: {glibc_url}
+                glibc_branch: {glibc_branch}
+                gdb_url: {gdb_url}
+                gdb_branch: {gdb_branch}
+                qemu_url: {qemu_url}
+                qemu_branch: {qemu_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -1302,19 +1307,7 @@
     display-name: 'TCWG Build {ci_project}/{ci_config}'
     workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
     scm:
-      - build-scms:
-          binutils_url: '{binutils_url}'
-          binutils_branch: '{binutils_branch}'
-          gcc_url: '{gcc_url}'
-          gcc_branch: '{gcc_branch}'
-          linux_url: '{linux_url}'
-          linux_branch: '{linux_branch}'
-          glibc_url: '{glibc_url}'
-          glibc_branch: '{glibc_branch}'
-          gdb_url: '{gdb_url}'
-          gdb_branch: '{gdb_branch}'
-          qemu_url: '{qemu_url}'
-          qemu_branch: '{qemu_branch}'
+      - build-scms
     triggers:
       - pollscm:
           cron: '{cron}'
@@ -1394,4 +1387,4 @@
           docker_security: '{docker_security}'
     publishers:
       - bisect-publishers
-# checksum: a91685819264fa584a8e32f7bb631f04
+# checksum: a7d4b37cdba9d75bc44fa3d2c0fa6d9b
diff --git a/tcwg_gnu_embed.yaml b/tcwg_gnu_embed.yaml
index 96b901c..3df2416 100644
--- a/tcwg_gnu_embed.yaml
+++ b/tcwg_gnu_embed.yaml
@@ -229,31 +229,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: binutils
-          url: '{binutils_url}'
-          branch: '{binutils_branch}'
-          reference: binutils-gdb.git
-      - component-scm:
-          component: gcc
-          url: '{gcc_url}'
-          branch: '{gcc_branch}'
-          reference: gcc.git
-      - component-scm:
-          component: gdb
-          url: '{gdb_url}'
-          branch: '{gdb_branch}'
-          reference: binutils-gdb.git
-      - component-scm:
-          component: newlib
-          url: '{newlib_url}'
-          branch: '{newlib_branch}'
-          reference: newlib.git
-      - component-scm:
-          component: qemu
-          url: '{qemu_url}'
-          branch: '{qemu_branch}'
-          reference: qemu.git
 
 - wrapper:
     name: build-wrappers
@@ -485,6 +460,16 @@
 
             cat >> artifacts/jenkins/run-build.env <<EOF
             build_name="$build_name"
+            binutils_url="{binutils_url}"
+            binutils_branch="{binutils_branch}"
+            gcc_url="{gcc_url}"
+            gcc_branch="{gcc_branch}"
+            gdb_url="{gdb_url}"
+            gdb_branch="{gdb_branch}"
+            newlib_url="{newlib_url}"
+            newlib_branch="{newlib_branch}"
+            qemu_url="{qemu_url}"
+            qemu_branch="{qemu_branch}"
             EOF
           unstable-return: 125
 
@@ -599,10 +584,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -715,6 +699,16 @@
           steps:
             - run-build-init:
                 precommit: false
+                binutils_url: {binutils_url}
+                binutils_branch: {binutils_branch}
+                gcc_url: {gcc_url}
+                gcc_branch: {gcc_branch}
+                gdb_url: {gdb_url}
+                gdb_branch: {gdb_branch}
+                newlib_url: {newlib_url}
+                newlib_branch: {newlib_branch}
+                qemu_url: {qemu_url}
+                qemu_branch: {qemu_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -1078,6 +1072,16 @@
           steps:
             - run-build-init:
                 precommit: true
+                binutils_url: {binutils_url}
+                binutils_branch: {binutils_branch}
+                gcc_url: {gcc_url}
+                gcc_branch: {gcc_branch}
+                gdb_url: {gdb_url}
+                gdb_branch: {gdb_branch}
+                newlib_url: {newlib_url}
+                newlib_branch: {newlib_branch}
+                qemu_url: {qemu_url}
+                qemu_branch: {qemu_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -1300,17 +1304,7 @@
     display-name: 'TCWG Build {ci_project}/{ci_config}'
     workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
     scm:
-      - build-scms:
-          binutils_url: '{binutils_url}'
-          binutils_branch: '{binutils_branch}'
-          gcc_url: '{gcc_url}'
-          gcc_branch: '{gcc_branch}'
-          gdb_url: '{gdb_url}'
-          gdb_branch: '{gdb_branch}'
-          newlib_url: '{newlib_url}'
-          newlib_branch: '{newlib_branch}'
-          qemu_url: '{qemu_url}'
-          qemu_branch: '{qemu_branch}'
+      - build-scms
     triggers:
       - pollscm:
           cron: '{cron}'
@@ -1390,4 +1384,4 @@
           docker_security: '{docker_security}'
     publishers:
       - bisect-publishers
-# checksum: fffa4eb264bdc141c6373b6ce5485c73
+# checksum: 82566cc8dfca4735aa4591235c11b60e
diff --git a/tcwg_gnu_mingw.yaml b/tcwg_gnu_mingw.yaml
index 1f70711..b30b175 100644
--- a/tcwg_gnu_mingw.yaml
+++ b/tcwg_gnu_mingw.yaml
@@ -210,21 +210,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: binutils
-          url: '{binutils_url}'
-          branch: '{binutils_branch}'
-          reference: binutils-gdb.git
-      - component-scm:
-          component: gcc
-          url: '{gcc_url}'
-          branch: '{gcc_branch}'
-          reference: gcc.git
-      - component-scm:
-          component: mingw
-          url: '{mingw_url}'
-          branch: '{mingw_branch}'
-          reference: mingw-w64.git
 
 - wrapper:
     name: build-wrappers
@@ -456,6 +441,12 @@
 
             cat >> artifacts/jenkins/run-build.env <<EOF
             build_name="$build_name"
+            binutils_url="{binutils_url}"
+            binutils_branch="{binutils_branch}"
+            gcc_url="{gcc_url}"
+            gcc_branch="{gcc_branch}"
+            mingw_url="{mingw_url}"
+            mingw_branch="{mingw_branch}"
             EOF
           unstable-return: 125
 
@@ -570,10 +561,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -686,6 +676,12 @@
           steps:
             - run-build-init:
                 precommit: false
+                binutils_url: {binutils_url}
+                binutils_branch: {binutils_branch}
+                gcc_url: {gcc_url}
+                gcc_branch: {gcc_branch}
+                mingw_url: {mingw_url}
+                mingw_branch: {mingw_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -1049,6 +1045,12 @@
           steps:
             - run-build-init:
                 precommit: true
+                binutils_url: {binutils_url}
+                binutils_branch: {binutils_branch}
+                gcc_url: {gcc_url}
+                gcc_branch: {gcc_branch}
+                mingw_url: {mingw_url}
+                mingw_branch: {mingw_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -1257,13 +1259,7 @@
     display-name: 'TCWG Build {ci_project}/{ci_config}'
     workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
     scm:
-      - build-scms:
-          binutils_url: '{binutils_url}'
-          binutils_branch: '{binutils_branch}'
-          gcc_url: '{gcc_url}'
-          gcc_branch: '{gcc_branch}'
-          mingw_url: '{mingw_url}'
-          mingw_branch: '{mingw_branch}'
+      - build-scms
     triggers:
       - pollscm:
           cron: '{cron}'
@@ -1343,4 +1339,4 @@
           docker_security: '{docker_security}'
     publishers:
       - bisect-publishers
-# checksum: 2f3dcf1e7e789797482da3838fbd0183
+# checksum: 46b71ac6ddd4f4f6a425b9b22d7d1ad2
diff --git a/tcwg_gnu_native.yaml b/tcwg_gnu_native.yaml
index 2ce508c..52c6228 100644
--- a/tcwg_gnu_native.yaml
+++ b/tcwg_gnu_native.yaml
@@ -231,31 +231,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: binutils
-          url: '{binutils_url}'
-          branch: '{binutils_branch}'
-          reference: binutils-gdb.git
-      - component-scm:
-          component: gcc
-          url: '{gcc_url}'
-          branch: '{gcc_branch}'
-          reference: gcc.git
-      - component-scm:
-          component: gdb
-          url: '{gdb_url}'
-          branch: '{gdb_branch}'
-          reference: binutils-gdb.git
-      - component-scm:
-          component: glibc
-          url: '{glibc_url}'
-          branch: '{glibc_branch}'
-          reference: glibc.git
-      - component-scm:
-          component: linux
-          url: '{linux_url}'
-          branch: '{linux_branch}'
-          reference: linux.git
 
 - wrapper:
     name: build-wrappers
@@ -487,6 +462,16 @@
 
             cat >> artifacts/jenkins/run-build.env <<EOF
             build_name="$build_name"
+            binutils_url="{binutils_url}"
+            binutils_branch="{binutils_branch}"
+            gcc_url="{gcc_url}"
+            gcc_branch="{gcc_branch}"
+            linux_url="{linux_url}"
+            linux_branch="{linux_branch}"
+            glibc_url="{glibc_url}"
+            glibc_branch="{glibc_branch}"
+            gdb_url="{gdb_url}"
+            gdb_branch="{gdb_branch}"
             EOF
           unstable-return: 125
 
@@ -604,10 +589,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -720,6 +704,16 @@
           steps:
             - run-build-init:
                 precommit: false
+                binutils_url: {binutils_url}
+                binutils_branch: {binutils_branch}
+                gcc_url: {gcc_url}
+                gcc_branch: {gcc_branch}
+                linux_url: {linux_url}
+                linux_branch: {linux_branch}
+                glibc_url: {glibc_url}
+                glibc_branch: {glibc_branch}
+                gdb_url: {gdb_url}
+                gdb_branch: {gdb_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -1085,6 +1079,16 @@
           steps:
             - run-build-init:
                 precommit: true
+                binutils_url: {binutils_url}
+                binutils_branch: {binutils_branch}
+                gcc_url: {gcc_url}
+                gcc_branch: {gcc_branch}
+                linux_url: {linux_url}
+                linux_branch: {linux_branch}
+                glibc_url: {glibc_url}
+                glibc_branch: {glibc_branch}
+                gdb_url: {gdb_url}
+                gdb_branch: {gdb_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -1312,17 +1316,7 @@
     display-name: 'TCWG Build {ci_project}/{ci_config}'
     workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
     scm:
-      - build-scms:
-          binutils_url: '{binutils_url}'
-          binutils_branch: '{binutils_branch}'
-          gcc_url: '{gcc_url}'
-          gcc_branch: '{gcc_branch}'
-          linux_url: '{linux_url}'
-          linux_branch: '{linux_branch}'
-          glibc_url: '{glibc_url}'
-          glibc_branch: '{glibc_branch}'
-          gdb_url: '{gdb_url}'
-          gdb_branch: '{gdb_branch}'
+      - build-scms
     triggers:
       - pollscm:
           cron: '{cron}'
@@ -1405,4 +1399,4 @@
           docker_security: '{docker_security}'
     publishers:
       - bisect-publishers
-# checksum: d2c7e16a771de68007c5934196c95828
+# checksum: fc04a3a4d4ffc259e6b373a3c35a6750
diff --git a/tcwg_kernel--gnu.yaml b/tcwg_kernel--gnu.yaml
index 521823d..077707e 100644
--- a/tcwg_kernel--gnu.yaml
+++ b/tcwg_kernel--gnu.yaml
@@ -196,26 +196,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: binutils
-          url: '{binutils_url}'
-          branch: '{binutils_branch}'
-          reference: binutils-gdb.git
-      - component-scm:
-          component: gcc
-          url: '{gcc_url}'
-          branch: '{gcc_branch}'
-          reference: gcc.git
-      - component-scm:
-          component: linux
-          url: '{linux_url}'
-          branch: '{linux_branch}'
-          reference: linux.git
-      - component-scm:
-          component: qemu
-          url: '{qemu_url}'
-          branch: '{qemu_branch}'
-          reference: qemu.git
 
 - wrapper:
     name: build-wrappers
@@ -435,6 +415,14 @@
 
             cat >> artifacts/jenkins/run-build.env <<EOF
             build_name="$build_name"
+            binutils_url="{binutils_url}"
+            binutils_branch="{binutils_branch}"
+            gcc_url="{gcc_url}"
+            gcc_branch="{gcc_branch}"
+            linux_url="{linux_url}"
+            linux_branch="{linux_branch}"
+            qemu_url="{qemu_url}"
+            qemu_branch="{qemu_branch}"
             EOF
           unstable-return: 125
 
@@ -549,10 +537,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -665,6 +652,14 @@
           steps:
             - run-build-init:
                 precommit: false
+                binutils_url: {binutils_url}
+                binutils_branch: {binutils_branch}
+                gcc_url: {gcc_url}
+                gcc_branch: {gcc_branch}
+                linux_url: {linux_url}
+                linux_branch: {linux_branch}
+                qemu_url: {qemu_url}
+                qemu_branch: {qemu_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -966,4 +961,4 @@
           build_script: 'tcwg_kernel-build.sh'
     publishers:
       - bisect-publishers
-# checksum: 8d0e47129de2edb1a1f47e896f6c054e
+# checksum: ed68b1a824c555579f44c1e41b488ca0
diff --git a/tcwg_kernel--llvm.yaml b/tcwg_kernel--llvm.yaml
index 19f4292..6bac509 100644
--- a/tcwg_kernel--llvm.yaml
+++ b/tcwg_kernel--llvm.yaml
@@ -196,26 +196,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: binutils
-          url: '{binutils_url}'
-          branch: '{binutils_branch}'
-          reference: binutils-gdb.git
-      - component-scm:
-          component: linux
-          url: '{linux_url}'
-          branch: '{linux_branch}'
-          reference: linux.git
-      - component-scm:
-          component: llvm
-          url: '{llvm_url}'
-          branch: '{llvm_branch}'
-          reference: llvm-project.git
-      - component-scm:
-          component: qemu
-          url: '{qemu_url}'
-          branch: '{qemu_branch}'
-          reference: qemu.git
 
 - wrapper:
     name: build-wrappers
@@ -435,6 +415,12 @@
 
             cat >> artifacts/jenkins/run-build.env <<EOF
             build_name="$build_name"
+            binutils_url="{binutils_url}"
+            binutils_branch="{binutils_branch}"
+            linux_url="{linux_url}"
+            linux_branch="{linux_branch}"
+            qemu_url="{qemu_url}"
+            qemu_branch="{qemu_branch}"
             EOF
           unstable-return: 125
 
@@ -549,10 +535,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -665,6 +650,12 @@
           steps:
             - run-build-init:
                 precommit: false
+                binutils_url: {binutils_url}
+                binutils_branch: {binutils_branch}
+                linux_url: {linux_url}
+                linux_branch: {linux_branch}
+                qemu_url: {qemu_url}
+                qemu_branch: {qemu_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -966,4 +957,4 @@
           build_script: 'tcwg_kernel-build.sh'
     publishers:
       - bisect-publishers
-# checksum: f797faaae50faa5a98747066d5e659fd
+# checksum: bcab0d4d7eaf86f2b89c3b68a8a4522f
diff --git a/tcwg_simplebootstrap.yaml b/tcwg_simplebootstrap.yaml
index e3c4bfa..022d778 100644
--- a/tcwg_simplebootstrap.yaml
+++ b/tcwg_simplebootstrap.yaml
@@ -209,11 +209,6 @@
     name: build-scms
     scm:
       - jenkins-scripts
-      - component-scm:
-          component: gcc
-          url: '{gcc_url}'
-          branch: '{gcc_branch}'
-          reference: gcc.git
 
 - wrapper:
     name: build-wrappers
@@ -518,6 +513,8 @@
 
             cat >> artifacts/jenkins/run-build.env <<EOF
             build_name="$build_name"
+            gcc_url="{gcc_url}"
+            gcc_branch="{gcc_branch}"
             EOF
           unstable-return: 125
 
@@ -634,10 +631,9 @@
                   g="baseline"
                 fi
               fi
+
               if [ x"$g" = x"jenkins-scm" ]; then
-                eval "gb=\$GIT_BRANCH_$i"
-                gb=$(echo $gb | sed 's+origin/++')
-                eval "g=\$GIT_URL_$i#$gb"
+                eval "g=\$$$${{c}}_url#\$$$${{c}}_branch"
               fi
               i=$(($i+1))
 
@@ -750,6 +746,8 @@
           steps:
             - run-build-init:
                 precommit: false
+                gcc_url: {gcc_url}
+                gcc_branch: {gcc_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -1120,6 +1118,8 @@
           steps:
             - run-build-init:
                 precommit: true
+                gcc_url: {gcc_url}
+                gcc_branch: {gcc_branch}
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -1331,9 +1331,7 @@
     display-name: 'TCWG Build {ci_project}/{ci_config}'
     workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
     scm:
-      - build-scms:
-          gcc_url: '{gcc_url}'
-          gcc_branch: '{gcc_branch}'
+      - build-scms
     triggers:
       - timed: '{cron}'
     wrappers:
@@ -1415,4 +1413,4 @@
           docker_security: '{docker_security}'
     publishers:
       - bisect-publishers
-# checksum: 26c457e2cd83cc6fee56ac1d257b6e11
+# checksum: 744bbfe73ca82d0ae43d84f4a63888a1