From: Alexis Lothoré <alexis.loth...@bootlin.com>
It has been observed that when a new release branch is created, it is quite
easy to forget to update the BUILD_HISTORY_DIRECTPUSH variable, which leads
to failures in autobuilder like test results not being pushed.
Replace the BUILD_HISTORY_DIRECTPUSH usage with a hardcoded condition which
validates any branch in poky representing a "main" branch, i.e all branches
not ending in "-next"
Signed-off-by: Alexis Lothoré <alexis.loth...@bootlin.com>
Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org>
---
scripts/utils.py | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/scripts/utils.py b/scripts/utils.py
index 444b3ab55092..36b3e81bfc94 100644
--- a/scripts/utils.py
+++ b/scripts/utils.py
@@ -19,6 +19,15 @@ import fnmatch
import glob
import fcntl
+
+def is_a_main_branch(reponame, branchname):
+ """
+ Checks if target repo/branch combo represent a main branch. This
+ includes master and release branches in poky, while excluding "next"
+ branches
+ """
+ return reponame == "poky" and not branchname.endswith("-next")
+
#
# Check if config contains all the listed params
#
@@ -212,7 +221,7 @@ def getbuildhistoryconfig(ourconfig, builddir, target,
reponame, branchname, ste
reponame = reponame.rsplit("/", 1)[1]
if reponame.endswith(".git"):
reponame = reponame[:-4]
- if (reponame + ":" + branchname) in
getconfig("BUILD_HISTORY_DIRECTPUSH", ourconfig):
+ if is_a_main_branch(reponame, branchname):
base = reponame + ":" + branchname
if (reponame + ":" + branchname) in
getconfig("BUILD_HISTORY_FORKPUSH", ourconfig):
base = getconfig("BUILD_HISTORY_FORKPUSH", ourconfig)[reponame
+ ":" + branchname]
@@ -392,7 +401,7 @@ def getcomparisonbranch(ourconfig, reponame, branchname):
comparerepo, comparebranch = base.split(":")
print("Comparing to %s\n" % (comparebranch))
return branchname, comparebranch
- if (reponame + ":" + branchname) in getconfig("BUILD_HISTORY_DIRECTPUSH",
ourconfig):
+ if is_a_main_branch(reponame, branchname):
return branchname, None
return None, None
--
2.42.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#61846): https://lists.yoctoproject.org/g/yocto/message/61846
Mute This Topic: https://lists.yoctoproject.org/mt/103064176/21656
Group Owner: yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
