From 8d4315ec4709fe3b0e10b68bae8722b35683746d Mon Sep 17 00:00:00 2001 From: Riccardo Pittau Date: Mon, 17 Aug 2020 17:28:17 +0200 Subject: [PATCH] Do not update upper constraints for intermediate branches They should use the current upper constraints. Change-Id: If6d2d747c1db2b905e89354930647955aece9202 --- .../files/release-tools/make_branch.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/copy-release-tools-scripts/files/release-tools/make_branch.sh b/roles/copy-release-tools-scripts/files/release-tools/make_branch.sh index 6812a8c78a..ae8d61dac0 100755 --- a/roles/copy-release-tools-scripts/files/release-tools/make_branch.sh +++ b/roles/copy-release-tools-scripts/files/release-tools/make_branch.sh @@ -64,8 +64,8 @@ git push gerrit $NEW_BRANCH update_gitreview "$NEW_BRANCH" -# Do not update upper constraints on driverfixes branches -if [[ ! $NEW_BRANCH =~ driverfixes/ ]]; then +# Do not update upper constraints on driverfixes or intermediate branches +if [[ ! $NEW_BRANCH =~ driverfixes/|bugfix/ ]]; then update_upper_constraints "$NEW_BRANCH" fi