tcwg/round-robin.yaml.inc: Remove dummy ci_project/ci_config parameters

Change-Id: Ibae859eac9504057b2df67e3c2a1c95610af5288

1 files changed, 15 insertions, 26 deletions

diff --git a/tcwg_aosp-build.yaml b/tcwg_aosp-build.yaml
index 6df5d1fe9d..9a1ac6d352 100644
--- a/tcwg_aosp-build.yaml
+++ b/tcwg_aosp-build.yaml
@@ -74,14 +74,6 @@
     name: default-parameters
     parameters:
       - string:
-          name: ci_project
-          default: '{ci_project}'
-          description: "CI project ID; used as namespace for git branches"
-      - string:
-          name: ci_config
-          default: '{ci_config}'
-          description: "CI configuration ID; used as name of git branches and selects build flags"
-      - string:
           name: extra_build_params
           default: ""
           description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
@@ -140,8 +132,6 @@
             - precommit
           description: "Whether to notify developers about the result of this build"
       - default-parameters:
-          ci_project: '{ci_project}'
-          ci_config: '{ci_config}'
           distro: '{distro}'
 
 - property:
@@ -238,8 +228,6 @@
 
           for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
             if [ -f $i ]; then
-              echo "ci_project=$ci_project" >> $i
-              echo "ci_config=$ci_config" >> $i
               echo "distro=$distro" >> $i
               echo "scripts_branch=$scripts_branch" >> $i
               echo "bmk_branch=$bmk_branch" >> $i
@@ -393,8 +381,8 @@
      - trigger-builds:
         - project: tcwg-update-lnt-results
           predefined-parameters: |
-            ci_project=$ci_project
-            ci_config=$ci_config
+            ci_project={ci_project}
+            ci_config={ci_config}
 
 
 - builder:
@@ -482,8 +470,8 @@
             build_container_exec \
               ./jenkins-scripts/{build_script} \
               %%rr[top_artifacts] artifacts \
-              ==rr[ci_project] $ci_project \
-              ==rr[ci_config] $ci_config \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
               $extra_build_params \
               --bmk_branch "$bmk_branch" \
               --scripts_branch "$scripts_branch" \
@@ -658,6 +646,8 @@
           condition-kind: current-status
           steps:
             - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
                 build_script: '{build_script}'
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
@@ -714,7 +704,8 @@
           condition-kind: current-status
           steps:
             - run-push-lnt-results:
-                dummy: dummy
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
       - build-name-setter:
           name: 'artifacts/jenkins/build-name'
           file: true
@@ -776,8 +767,6 @@
           name: jenkins-scripts/replay_log
           description: "Replay part of bisect using provided bisect log"
       - default-parameters:
-          ci_project: '{ci_project}'
-          ci_config: '{ci_config}'
           distro: '{distro}'
 
 - wrapper:
@@ -815,8 +804,8 @@
               --replay_log "$(pwd)/jenkins-scripts/replay_log" \
               --build_script "./jenkins-scripts/{build_script}" \
               -- \
-              ==rr[ci_project] $ci_project \
-              ==rr[ci_config] $ci_config \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
               $extra_build_params \
               --bmk_branch "$bmk_branch" \
               --scripts_branch "$scripts_branch" &
@@ -874,8 +863,6 @@
           ci_config: '{ci_config}'
     parameters:
       - build-parameters:
-          ci_project: '{ci_project}'
-          ci_config: '{ci_config}'
           default_git: 'default'
           distro: 'default'
     disabled: false
@@ -906,6 +893,8 @@
           timeout: '{build_timeout}'
     builders:
       - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
           build_script: 'tcwg_aosp-build.sh'
           components: 'aosp_superproject llvm toolchain_superproject'
           rr_project: '{ci_project}--{ci_config}'
@@ -924,8 +913,6 @@
           ci_config: '{ci_config}'
     parameters:
       - bisect-parameters:
-          ci_project: '{ci_project}'
-          ci_config: '{ci_config}'
           distro: 'default'
     disabled: false
     node: tcwg-x86_64 && tcwg-build && tcwg-fast-disk
@@ -939,8 +926,10 @@
           timeout: '{bisect_timeout}'
     builders:
       - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
           build_script: 'tcwg_aosp-build.sh'
           rr_project: '{ci_project}--{ci_config}'
     publishers:
       - bisect-publishers
-# checksum: 21c9109bca18ad9a11eefad8d755fe57
+# checksum: d40e5db648d51bf6ce20c80490ee0872