MIRRORS/yocto-autobuilder2
1
0
Fork 0
mirror of git://git.yoctoproject.org/yocto-autobuilder2.git synced 2025-07-19 12:49:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

builders: Add controller url in build tag

Browse Source 
Make sure tags created on a-full/a-quick builds are unique, even across
different controller instances.

Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Mathieu Dubois-Briand 2025-02-06 16:28:29 +01:00 committed by Richard Purdie
parent cb639d12eb
commit 02661be391
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
builders.py
View File

@ -19,6 +19,7 @@ from dateutil.tz import tzutc
import os import os
import json import json
import random import random
import urllib.parse
builders = [] builders = []
@ -249,6 +250,16 @@ def prioritizeBuilders(master, builders):
#log.msg("Using %s" % str(rv)) #log.msg("Using %s" % str(rv))
return rv return rv
@util.renderer
def createBuildTag(props):
buildername = props.getProperty('buildername')
buildnumber = props.getProperty('buildnumber')
build = props.getBuild()
url = urllib.parse.urlparse(build.master.config.buildbotURL)
host = url.netloc.replace(':', '_')
url.path
return f"{host}{url.path}{buildername}-{buildnumber}"
def create_parent_builder_factory(buildername, waitname): def create_parent_builder_factory(buildername, waitname):
factory = util.BuildFactory() factory = util.BuildFactory()
# NOTE: Assumes that yocto-autobuilder repo has been cloned to home # NOTE: Assumes that yocto-autobuilder repo has been cloned to home
@ -273,7 +284,7 @@ def create_parent_builder_factory(buildername, waitname):
util.Interpolate("%(prop:builddir)s/layerinfo.json"), util.Interpolate("%(prop:builddir)s/layerinfo.json"),
util.Interpolate("{}/%(prop:buildername)s-%(prop:buildnumber)s".format(config.sharedrepodir)), util.Interpolate("{}/%(prop:buildername)s-%(prop:buildnumber)s".format(config.sharedrepodir)),
"-p", get_publish_dest, "-p", get_publish_dest,
"-t", util.Interpolate("%(prop:buildername)s-%(prop:buildnumber)s"), "-t", createBuildTag,
], ],
haltOnFailure=True, haltOnFailure=True,
name="Prepare shared repositories")) name="Prepare shared repositories"))

8
docker/yocto-autobuilder2_patches/0001-builders-Do-not-create-tags-during-builds.patch
View File

@ -1,4 +1,4 @@
From ee671836ad9f0b65fa8b8b11c7f366377521ab20 Mon Sep 17 00:00:00 2001 From 12db34cf42ca695bd34594853013e54464a809f5 Mon Sep 17 00:00:00 2001
From: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> From: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Date: Fri, 3 Jan 2025 09:39:06 +0100 Date: Fri, 3 Jan 2025 09:39:06 +0100
Subject: [PATCH 1/2] builders: Do not create tags during builds Subject: [PATCH 1/2] builders: Do not create tags during builds
@ -9,14 +9,14 @@ Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
1 file changed, 1 deletion(-) 1 file changed, 1 deletion(-)
diff --git a/builders.py b/builders.py diff --git a/builders.py b/builders.py
index 14ea1df1192e..ba47241de2cc 100644 index b4c08fa1f29c..4e10bdceedb2 100644
--- a/builders.py --- a/builders.py
+++ b/builders.py +++ b/builders.py
@@ -273,7 +273,6 @@ def create_parent_builder_factory(buildername, waitname): @@ -284,7 +284,6 @@ def create_parent_builder_factory(buildername, waitname):
util.Interpolate("%(prop:builddir)s/layerinfo.json"), util.Interpolate("%(prop:builddir)s/layerinfo.json"),
util.Interpolate("{}/%(prop:buildername)s-%(prop:buildnumber)s".format(config.sharedrepodir)), util.Interpolate("{}/%(prop:buildername)s-%(prop:buildnumber)s".format(config.sharedrepodir)),
"-p", get_publish_dest, "-p", get_publish_dest,
- "-t", util.Interpolate("%(prop:buildername)s-%(prop:buildnumber)s"), - "-t", createBuildTag,
], ],
haltOnFailure=True, haltOnFailure=True,
name="Prepare shared repositories")) name="Prepare shared repositories"))