diff mbox series

[yocto-autobuilder2,08/10] builders: Add poky-ci-archive tag in build properties

Message ID 20251007-contrib-mathieu-bb-setup-links-v1-8-bb1d79289c3f@bootlin.com
State New
Headers show
Series Fix links with bitbake setup and general improvements | expand

Commit Message

Mathieu Dubois-Briand Oct. 7, 2025, 2:37 p.m. UTC 
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
---
 builders.py                                        | 10 +++++++-
 ...builders-Do-not-create-tags-during-builds.patch | 28 ++++++++++++++++++----
 2 files changed, 32 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/builders.py b/builders.py
index 15985f258bb9fa7d38e70f4ca35f87ede4c24a23..2fb0bf827b0f08fb822320ad9fc858592e606cc7 100644
--- a/builders.py
+++ b/builders.py
@@ -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]:
diff --git a/docker/yocto-autobuilder2_patches/0001-builders-Do-not-create-tags-during-builds.patch b/docker/yocto-autobuilder2_patches/0001-builders-Do-not-create-tags-during-builds.patch
index 8e772c8fa7b1b2cdd59af58f5f87b1332d5fb602..b36f2ea7e83edcd70ecbab6ecd13f2bb986e2dc6 100644
--- a/docker/yocto-autobuilder2_patches/0001-builders-Do-not-create-tags-during-builds.patch
+++ b/docker/yocto-autobuilder2_patches/0001-builders-Do-not-create-tags-during-builds.patch
@@ -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