savePackage fixup

Always pass in SAVED_PACKAGE_BRANCHES where it makes sense
MariaDB · Dec 3, 2024 · 9fe23e5 · 9fe23e5
1 parent e495f57
commit 9fe23e5
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 28 deletions.
diff --git a/common_factories.py b/common_factories.py
@@ -10,7 +10,7 @@
 from buildbot.steps.mtrlogobserver import MTR
 
 # Local
-from constants import MTR_ENV, test_type_to_mtr_arg
+from constants import MTR_ENV, SAVED_PACKAGE_BRANCHES, test_type_to_mtr_arg
 from utils import (
     createVar,
     dockerfile,
@@ -140,7 +140,7 @@ def addPostTests(factory):
         steps.SetPropertyFromCommand(
             command="basename mariadb-*-linux-*.tar.gz",
             property="mariadb_binary",
-            doStepIf=savePackage,
+            doStepIf=lambda step: savePackage(step, SAVED_PACKAGE_BRANCHES),
         )
     )
     factory.addStep(
@@ -156,7 +156,7 @@ def addPostTests(factory):
         && sync /packages/%(prop:tarbuildnum)s
         """
             ),
-            doStepIf=savePackage,
+            doStepIf=lambda step: savePackage(step, SAVED_PACKAGE_BRANCHES),
         )
     )
     factory.addStep(
@@ -166,7 +166,8 @@ def addPostTests(factory):
             waitForFinish=False,
             updateSourceStamp=False,
             set_properties=properties,
-            doStepIf=lambda step: savePackage(step) and hasEco(step),
+            doStepIf=lambda step: savePackage(step, SAVED_PACKAGE_BRANCHES)
+            and hasEco(step),
         )
     )
     factory.addStep(
@@ -737,7 +738,8 @@ def getRpmAutobakeFactory(mtrDbPool):
                 sync /packages/%(prop:tarbuildnum)s
 """
             ),
-            doStepIf=lambda step: hasFiles(step) and savePackage(step),
+            doStepIf=lambda step: hasFiles(step)
+            and savePackage(step, SAVED_PACKAGE_BRANCHES),
             descriptionDone=util.Interpolate(
                 """
 Repository available with: curl %(kw:url)s/%(prop:tarbuildnum)s/%(prop:buildername)s/MariaDB.repo -o /etc/yum.repos.d/MariaDB.repo""",
@@ -775,7 +777,7 @@ def getRpmAutobakeFactory(mtrDbPool):
                 "parentbuildername": Property("buildername"),
             },
             doStepIf=lambda step: hasInstall(step)
-            and savePackage(step)
+            and savePackage(step, SAVED_PACKAGE_BRANCHES)
             and hasFiles(step),
         )
     )
@@ -792,7 +794,7 @@ def getRpmAutobakeFactory(mtrDbPool):
                 "parentbuildername": Property("buildername"),
             },
             doStepIf=lambda step: hasUpgrade(step)
-            and savePackage(step)
+            and savePackage(step, SAVED_PACKAGE_BRANCHES)
             and hasFiles(step),
         )
     )

diff --git a/master-bintars/master.cfg b/master-bintars/master.cfg
@@ -265,7 +265,7 @@ def getBintarFactory(
                 + " && sync /packages/"
                 + "%(prop:tarbuildnum)s"
             ),
-            doStepIf=savePackage,
+            doStepIf=lambda step: savePackage(step, SAVED_PACKAGE_BRANCHES),
         )
     )
 

diff --git a/master-docker-nonstandard-2/master.cfg b/master-docker-nonstandard-2/master.cfg
@@ -500,7 +500,6 @@ f_big_test.addStep(
         command="basename mariadb-*-linux-*.tar.gz", property="mariadb_binary"
     )
 )
-# f_big_test.addStep(steps.ShellCommand(name='save_packages', timeout=7200, haltOnFailure=True, command=util.Interpolate('mkdir -p ' + '/packages/' + '%(prop:tarbuildnum)s' + '/' + '%(prop:buildername)s'+ ' && sha256sum %(prop:mariadb_binary)s >> sha256sums.txt  && cp ' + '%(prop:mariadb_binary)s sha256sums.txt' + ' /packages/' + '%(prop:tarbuildnum)s' + '/' + '%(prop:buildername)s' + '/' +  ' && sync /packages/' + '%(prop:tarbuildnum)s'), doStepIf=savePackage))
 f_big_test.addStep(
     steps.ShellCommand(
         name="cleanup", command="rm -r * .* 2> /dev/null || true", alwaysRun=True
@@ -755,7 +754,7 @@ f_without_server.addStep(
             + " && sync /packages/"
             + "%(prop:tarbuildnum)s"
         ),
-        doStepIf=savePackage,
+        doStepIf=lambda step: savePackage(step, SAVED_PACKAGE_BRANCHES),
     )
 )
 f_without_server.addStep(
@@ -1042,7 +1041,7 @@ f_bintar.addStep(
     steps.SetPropertyFromCommand(
         command="basename mariadb-*-linux-*.tar.gz",
         property="mariadb_binary",
-        doStepIf=savePackage,
+        doStepIf=lambda step: savePackage(step, SAVED_PACKAGE_BRANCHES),
     )
 )
 f_bintar.addStep(
@@ -1066,7 +1065,7 @@ f_bintar.addStep(
             + " && sync /packages/"
             + "%(prop:tarbuildnum)s"
         ),
-        doStepIf=savePackage,
+        doStepIf=lambda step: savePackage(step, SAVED_PACKAGE_BRANCHES),
     )
 )
 f_bintar.addStep(
@@ -1083,7 +1082,7 @@ f_bintar.addStep(
             "master_branch": Property("master_branch"),
             "parentbuildername": Property("buildername"),
         },
-        doStepIf=lambda step: savePackage(step) and hasEco(step),
+        doStepIf=lambda step: savePackage(step, SAVED_PACKAGE_BRANCHES) and hasEco(step),
     )
 )
 f_bintar.addStep(

diff --git a/master-docker-nonstandard/master.cfg b/master-docker-nonstandard/master.cfg
@@ -14,7 +14,7 @@ from common_factories import (
     getRpmAutobakeFactory,
     getSourceTarball,
 )
-from constants import MTR_ENV
+from constants import MTR_ENV, SAVED_PACKAGE_BRANCHES
 from locks import getLocks
 from master_common import base_master_config
 from utils import (
@@ -1098,7 +1098,7 @@ f_without_server.addStep(
             + " && sync /packages/"
             + "%(prop:tarbuildnum)s"
         ),
-        doStepIf=savePackage,
+        doStepIf=lambda step: savePackage(step, SAVED_PACKAGE_BRANCHES),
     )
 )
 f_without_server.addStep(
@@ -1386,7 +1386,7 @@ f_bintar.addStep(
     steps.SetPropertyFromCommand(
         command="basename mariadb-*-linux-*.tar.gz",
         property="mariadb_binary",
-        doStepIf=savePackage,
+        doStepIf=lambda step: savePackage(step, SAVED_PACKAGE_BRANCHES),
     )
 )
 f_bintar.addStep(
@@ -1410,7 +1410,7 @@ f_bintar.addStep(
             + " && sync /packages/"
             + "%(prop:tarbuildnum)s"
         ),
-        doStepIf=savePackage,
+        doStepIf=lambda step: savePackage(step, SAVED_PACKAGE_BRANCHES),
     )
 )
 f_bintar.addStep(
@@ -1427,7 +1427,7 @@ f_bintar.addStep(
             "master_branch": Property("master_branch"),
             "parentbuildername": Property("buildername"),
         },
-        doStepIf=lambda step: savePackage(step) and hasEco(step),
+        doStepIf=lambda step: savePackage(step, SAVED_PACKAGE_BRANCHES) and hasEco(step),
     )
 )
 f_bintar.addStep(

diff --git a/master-galera/master.cfg b/master-galera/master.cfg
@@ -67,7 +67,7 @@ c["buildbotNetUsageData"] = None
 # Configure the Schedulers, which decide how to react to incoming changes.
 
 BRANCHES_MAIN = ["mariadb-3.x", "mariadb-4.x", "bb-*"]
-savedPackageBranches = ["mariadb-3.x", "mariadb-4.x", "bb-*"]
+SAVED_PACKAGE_BRANCHES = ["mariadb-3.x", "mariadb-4.x", "bb-*"]
 
 # git branch filter using fnmatch
 import fnmatch
@@ -262,7 +262,7 @@ def dpkgDeb():
 """
             ),
         ],
-        doStepIf=savePackage,
+        doStepIf=lambda step: savePackage(step, SAVED_PACKAGE_BRANCHES),
     )
 
 
@@ -281,7 +281,7 @@ def rpmSave():
 """
             ),
         ],
-        doStepIf=savePackage,
+        doStepIf=lambda step: savePackage(step, SAVED_PACKAGE_BRANCHES),
     )
 
 
@@ -363,7 +363,7 @@ EOF
 """,
             url=os.getenv("ARTIFACTS_URL", default="https://ci.mariadb.org"),
         ),
-        doStepIf=savePackage,
+        doStepIf=lambda step: savePackage(step, SAVED_PACKAGE_BRANCHES),
     )
 )
 f_deb_build.addStep(
@@ -420,7 +420,7 @@ EOF
 """,
             url=os.getenv("ARTIFACTS_URL", default="https://ci.mariadb.org"),
         ),
-        doStepIf=savePackage,
+        doStepIf=lambda step: savePackage(step, SAVED_PACKAGE_BRANCHES),
     )
 )
 f_rpm_build.addStep(

diff --git a/master-nonlatent/master.cfg b/master-nonlatent/master.cfg
@@ -535,7 +535,7 @@ f_windows_msi.addStep(
             '/'
 
         ),
-        doStepIf=savePackage,
+        doStepIf=lambda step: savePackage(step, SAVED_PACKAGE_BRANCHES),
     )
 )
 f_windows_msi.addStep(
@@ -557,7 +557,7 @@ f_windows_msi.addStep(
             '%(prop:buildername)s'
             '/'
         ),
-        doStepIf=savePackage,
+        doStepIf=lambda step: savePackage(step, SAVED_PACKAGE_BRANCHES),
     )
 )
 f_windows_msi.addStep(

diff --git a/utils.py b/utils.py
@@ -213,7 +213,8 @@ def createDebRepo() -> steps.ShellCommand:
 """
             ),
         ],
-        doStepIf=lambda step: hasFiles(step) and savePackage(step),
+        doStepIf=lambda step: hasFiles(step)
+        and savePackage(step, SAVED_PACKAGE_BRANCHES),
     )
 
 
@@ -252,7 +253,8 @@ def uploadDebArtifacts() -> steps.ShellCommand:
     """
             ),
         ],
-        doStepIf=lambda step: hasFiles(step) and savePackage(step),
+        doStepIf=lambda step: hasFiles(step)
+        and savePackage(step, SAVED_PACKAGE_BRANCHES),
         descriptionDone=util.Interpolate(
             """
             Use """
@@ -497,7 +499,7 @@ def hasCompat(step: BuildStep) -> bool:
 
 def hasDockerLibrary(step: BuildStep) -> bool:
     # Can only build with a saved package
-    if not savePackage(step):
+    if not savePackage(step, SAVED_PACKAGE_BRANCHES):
         return False
 
     branch = step.getProperty("master_branch")