From da31d6f667a71185c6434d5d320bc6be0325d053 Mon Sep 17 00:00:00 2001 From: Alexander Thomas Date: Fri, 15 Jul 2022 07:29:54 +0000 Subject: [PATCH] [infra] Remove builder detection from co19 roll scripts Change-Id: Idf018c2cd33be10ef62310230f90f891937d84ae Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/251547 Reviewed-by: Erik Ernst --- tests/co19/update.sh | 22 +--------------------- tests/co19_2/update.sh | 22 +--------------------- 2 files changed, 2 insertions(+), 42 deletions(-) diff --git a/tests/co19/update.sh b/tests/co19/update.sh index 610182f1ad0..47ecedc86c6 100755 --- a/tests/co19/update.sh +++ b/tests/co19/update.sh @@ -1,6 +1,5 @@ #!/usr/bin/env bash # Uploads a new version of the co19 CIPD package. -# This script requires access to the dart-build-access group, which EngProd has. set -e set -x @@ -24,26 +23,13 @@ git checkout cl-co19-roll-co19-to-$NEW # Update DEPS: gclient setdep --var=co19_rev=$NEW -BUILDERS=$(jq -r '.builder_configurations - | map(select(.steps - | any(.arguments - | select(.!=null) - | any(test("co19($|(/.*))"))))) - | map(.builders) - | flatten - | sort - | .[] += "-try" - | join(",")' \ - tools/bots/test_matrix.json) - # Make a nice commit. Don't include the '#' character to avoid referencing Dart # SDK issues. git commit DEPS -m \ "$(printf "[co19] Roll co19 to $NEW\n\n" \ && cd $CO19 \ && git log --date='format:%Y-%m-%d' --pretty='format:%ad %ae %s' $OLD..$NEW \ - | sed 's/\#/dart-lang\/co19\#/g' \ - && printf "\nCq-Include-Trybots: dart/try:$BUILDERS\n")" + | sed 's/\#/dart-lang\/co19\#/g' rm -rf tests/co19/src.git @@ -51,9 +37,3 @@ GIT_EDITOR=true git cl upload ISSUE=$(git config --get branch.cl-co19-roll-co19-to-$NEW.gerritissue) git cl web - -set +x -cat << EOF - -Wait for the builders to finish. If any failed, pre-approve them. -EOF diff --git a/tests/co19_2/update.sh b/tests/co19_2/update.sh index ca6b486f68c..d7f154038c4 100755 --- a/tests/co19_2/update.sh +++ b/tests/co19_2/update.sh @@ -1,6 +1,5 @@ #!/usr/bin/env bash # Uploads a new version of the co19_2 CIPD package. -# This script requires access to the dart-build-access group, which EngProd has. set -e set -x @@ -24,26 +23,13 @@ git checkout cl-co19-roll-co19-to-$NEW # Update DEPS: gclient setdep --var=co19_2_rev=$NEW -BUILDERS=$(jq -r '.builder_configurations - | map(select(.steps - | any(.arguments - | select(.!=null) - | any(test("co19_2($|(/.*))"))))) - | map(.builders) - | flatten - | sort - | .[] += "-try" - | join(",")' \ - tools/bots/test_matrix.json) - # Make a nice commit. Don't include the '#' character to avoid referencing Dart # SDK issues. git commit DEPS -m \ "$(printf "[co19] Roll co19_2 to $NEW\n\n" \ && cd $CO19 \ && git log --date='format:%Y-%m-%d' --pretty='format:%ad %ae %s' $OLD..$NEW \ - | sed 's/\#/dart-lang\/co19\#/g' \ - && printf "\nCq-Include-Trybots: dart/try:$BUILDERS\n")" + | sed 's/\#/dart-lang\/co19\#/g' rm -rf tests/co19_2/src.git @@ -51,9 +37,3 @@ GIT_EDITOR=true git cl upload ISSUE=$(git config --get branch.cl-co19-roll-co19-to-$NEW.gerritissue) git cl web - -set +x -cat << EOF - -Wait for the builders to finish. If any failed, pre-approve them. -EOF