MIRRORS/yocto-autobuilder2
1
0
Fork 0
mirror of git://git.yoctoproject.org/yocto-autobuilder2.git synced 2025-10-22 14:52:21 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

builders: Add poky-ci-archive tag in build properties

Browse Source 
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-10-16 15:20:15 +02:00 committed by Richard Purdie
parent 5b21a7f790
commit 6c6e13442c
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builders.py
View File

@ -311,6 +311,12 @@ def create_parent_builder_factory(buildername, waitname):
],
haltOnFailure=True,
name="Prepare shared repositories"))
factory.addStep(steps.SetProperty(
property="poky-ci-archive_tag", value=createBuildTag))
tagurl = util.Interpolate('https://git.yoctoproject.org/poky-ci-archive/log/?h=%(kw:tag)s',
tag=createBuildTag)
factory.addStep(steps.SetProperty(
property="poky-ci-archive_url", value=tagurl))
factory.addStep(steps.SetProperty(
property="sharedrepolocation",
value=util.Interpolate("{}/%(prop:buildername)s-%(prop:buildnumber)s".format(config.sharedrepodir))
@ -358,7 +364,9 @@ def create_parent_builder_factory(buildername, waitname):
"milestone_number": util.Property("milestone_number"),
"rc_number": util.Property("rc_number"),
"yp_build_revision": util.Property("yp_build_revision"),
"yp_build_branch": util.Property("yp_build_branch")
"yp_build_branch": util.Property("yp_build_branch"),
"poky-ci-archive_tag": util.Property("poky-ci-archive_tag"),
"poky-ci-archive_url": util.Property("poky-ci-archive_url")
}
for repo in config.buildertorepos[buildername]:

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

@ -1,18 +1,18 @@
From baef5f6c4c2cf973385392d1e163f8bec2f6cca2 Mon Sep 17 00:00:00 2001
From b6a31b0c63a7529961ea02c53f43b9edb110f4de Mon Sep 17 00:00:00 2001
From: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Date: Fri, 3 Jan 2025 09:39:06 +0100
Subject: [PATCH 1/2] builders: Do not create tags during builds
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
---
builders.py | 1 -
1 file changed, 1 deletion(-)
builders.py | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/builders.py b/builders.py
index 15985f258bb9..a16a857d9211 100644
index 2fb0bf827b0f..af1cc263fd2e 100644
--- a/builders.py
+++ b/builders.py
@@ -307,7 +307,6 @@ def create_parent_builder_factory(buildername, waitname):
@@ -307,16 +307,9 @@ def create_parent_builder_factory(buildername, waitname):
util.Interpolate("%(prop:builddir)s/layerinfo.json"),
util.Interpolate("{}/%(prop:buildername)s-%(prop:buildnumber)s".format(config.sharedrepodir)),
"-p", get_publish_dest,
@ -20,6 +20,24 @@ index 15985f258bb9..a16a857d9211 100644
],
haltOnFailure=True,
name="Prepare shared repositories"))
- factory.addStep(steps.SetProperty(
- property="poky-ci-archive_tag", value=createBuildTag))
- tagurl = util.Interpolate('https://git.yoctoproject.org/poky-ci-archive/log/?h=%(kw:tag)s',
- tag=createBuildTag)
- factory.addStep(steps.SetProperty(
- property="poky-ci-archive_url", value=tagurl))
factory.addStep(steps.SetProperty(
property="sharedrepolocation",
value=util.Interpolate("{}/%(prop:buildername)s-%(prop:buildnumber)s".format(config.sharedrepodir))
@@ -365,8 +358,6 @@ def create_parent_builder_factory(buildername, waitname):
"rc_number": util.Property("rc_number"),
"yp_build_revision": util.Property("yp_build_revision"),
"yp_build_branch": util.Property("yp_build_branch"),
- "poky-ci-archive_tag": util.Property("poky-ci-archive_tag"),
- "poky-ci-archive_url": util.Property("poky-ci-archive_url")
}
for repo in config.buildertorepos[buildername]:
--
2.47.3