aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Alfonsi <laurent.alfonsi@linaro.org>2024-05-01 01:11:10 +0200
committerLaurent Alfonsi <laurent.alfonsi@linaro.org>2024-05-01 12:21:43 +0200
commitf8997785d719ded81be20c87b52ddc9e3b247782 (patch)
tree6799922334c4a9bb7d48d217325badb2c45ef0c5
parent7a277dce0d2875b45406bc439bf339293feaf796 (diff)
tcwg_chromium--master.yaml: Change option name for components_to_update
Change-Id: I6f7bc7048318169f6140f78624a66a710ef48f89
-rw-r--r--tcwg/round-robin.yaml.inc17
-rw-r--r--tcwg_chromium--master.yaml16
2 files changed, 6 insertions, 27 deletions
diff --git a/tcwg/round-robin.yaml.inc b/tcwg/round-robin.yaml.inc
index 052854ffac..4d48d5751d 100644
--- a/tcwg/round-robin.yaml.inc
+++ b/tcwg/round-robin.yaml.inc
@@ -37,7 +37,7 @@
parameters:
#if DYNAMIC_COMPONENT_LIST_yes
- string:
- name: 'dynamic_components_list'
+ name: 'components_to_update'
default: '*'
description: "Component list to update. '*' means all components"
#endif
@@ -674,7 +674,7 @@
==rr[mode] "build" \
==rr[update_baseline] "$update_baseline" \
#if DYNAMIC_COMPONENT_LIST_yes
- ==rr[dynamic_components_list] "$dynamic_components_list" \
+ ==rr[components_to_update] "$components_to_update" \
#endif
--BUILD_URL "$BUILD_URL" \
__finish_at reset_artifacts
@@ -703,18 +703,7 @@
branch_opt=()
# 1 to skip jenkins-scripts
i=1
-#if DYNAMIC_COMPONENT_LIST_yes
-
- build_container_exec \
- ./jenkins-scripts/update_components_revs.sh \
- @@rr[top_artifacts] artifacts \
- __dynamic_components_list "$dynamic_components_list"
-
- # Might need to add adjustment of the $build_name (not critical)
-
- # Might not need to add branch_opt : The build script doesn't need it.
- build_name="$build_name-$dynamic_components_list"
-#else
+#if !DYNAMIC_COMPONENT_LIST_yes
for c in #{COMPONENTS}; do
eval "g=\$$$${{c}}_git"
if [ x"$g" = x"default" ]; then
diff --git a/tcwg_chromium--master.yaml b/tcwg_chromium--master.yaml
index 283db68021..428dfd5cf4 100644
--- a/tcwg_chromium--master.yaml
+++ b/tcwg_chromium--master.yaml
@@ -82,7 +82,7 @@
name: all-component-parameters
parameters:
- string:
- name: 'dynamic_components_list'
+ name: 'components_to_update'
default: '*'
description: "Component list to update. '*' means all components"
@@ -442,7 +442,7 @@
--scripts_branch "$scripts_branch" \
==rr[mode] "build" \
==rr[update_baseline] "$update_baseline" \
- ==rr[dynamic_components_list] "$dynamic_components_list" \
+ ==rr[components_to_update] "$components_to_update" \
--BUILD_URL "$BUILD_URL" \
__finish_at reset_artifacts
@@ -471,16 +471,6 @@
# 1 to skip jenkins-scripts
i=1
- build_container_exec \
- ./jenkins-scripts/update_components_revs.sh \
- @@rr[top_artifacts] artifacts \
- __dynamic_components_list "$dynamic_components_list"
-
- # Might need to add adjustment of the $build_name (not critical)
-
- # Might not need to add branch_opt : The build script doesn't need it.
- build_name="$build_name-$dynamic_components_list"
-
echo "$build_name" > artifacts/jenkins/build-name
cat >> artifacts/jenkins/run-build.env <<EOF
@@ -876,4 +866,4 @@
build_script: 'tcwg_chromium-build.sh'
publishers:
- bisect-publishers
-# checksum: b40ecea61bc273ad441596bc284a5f53
+# checksum: f9fba3f542ff43077cce9829c7f5beb7