Merge branch 'dev'

MariaDB · Mar 26, 2024 · b97baab · b97baab
2 parents f2c4f88 + 4675ca1
commit b97baab
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 26 deletions.
diff --git a/common_factories.py b/common_factories.py
@@ -182,7 +182,7 @@ def getBuildFactoryPreTest(build_type="RelWithDebInfo", additional_args=""):
     f_quick_build.addStep(
         steps.ShellCommand(
             command=util.Interpolate(
-                "tar -xvzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
+                "tar -xzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
             )
         )
     )
@@ -368,7 +368,7 @@ def getRpmAutobakeFactory(mtrDbPool):
     f_rpm_autobake.addStep(
         steps.ShellCommand(
             command=util.Interpolate(
-                "tar -xvzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
+                "tar -xzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
             )
         )
     )

diff --git a/docker-compose/.env b/docker-compose/.env
@@ -9,3 +9,5 @@ NGINX_ARTIFACTS_VHOST="ci.mariadb.org"
 ENVIRON="PROD"
 BRANCH="main"
 MASTER_NONLATENT_DOCKERLIBRARY_WORKER="bb-rhel8-docker"
+MASTER_NONLATENT_BINTARS_WORKER="monty-bbw1-x64"
+MASTER_NONLATENT_BINTARS_WORKER_PORT="10002"
diff --git a/docker-compose/.env.dev b/docker-compose/.env.dev
@@ -10,3 +10,5 @@ NGINX_ARTIFACTS_VHOST="ci.dev.mariadb.org"
 ENVIRON="DEV"
 BRANCH="dev"
 MASTER_NONLATENT_DOCKERLIBRARY_WORKER="bb-rhel9-docker"
+MASTER_NONLATENT_BINTARS_WORKER="ro-apexis-bbw03-x64"
+MASTER_NONLATENT_BINTARS_WORKER_PORT="10007"
diff --git a/master-bintars/master.cfg b/master-bintars/master.cfg
@@ -71,7 +71,7 @@ c["buildbotURL"] = os.getenv("BUILDMASTER_URL", default="https://buildbot.mariad
 # could connect to your master with this protocol.
 # 'port' must match the value configured into the workers (with their
 # --master option)
-port = int(os.getenv("PORT", default="10002"))
+port = int(os.getenv("MASTER_NONLATENT_BINTARS_WORKER_PORT", default="10002"))
 c["protocols"] = {"pb": {"port": port}}
 
 ####### DB URL
@@ -109,7 +109,7 @@ def mkWorker(name, **kwargs):
 # worker name and password must be configured on the worker.
 c["workers"] = []
 
-c["workers"].append(mkWorker("monty-bbw1-x64", max_builds=1, properties={"jobs": 12}))
+c["workers"].append(mkWorker(os.getenv("MASTER_NONLATENT_BINTARS_WORKER", default="monty-bbw1-x64"), max_builds=1, properties={"jobs": 12}))
 
 
 ####### FACTORY CODE
@@ -358,7 +358,7 @@ for b in builder_definitions:
     c["builders"].append(
         util.BuilderConfig(
             name=builder_name + "-kvm-" + b + "-bintar",
-            workernames=["monty-bbw1-x64"],
+            workernames=[os.getenv("MASTER_NONLATENT_BINTARS_WORKER", default="monty-bbw1-x64")],
             factory=f,
         )
     )

diff --git a/master-docker-nonstandard-2/master.cfg b/master-docker-nonstandard-2/master.cfg
@@ -180,7 +180,7 @@ f_asan_ubsan_build.addStep(downloadSourceTarball())
 f_asan_ubsan_build.addStep(
     steps.ShellCommand(
         command=util.Interpolate(
-            "tar -xvzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
+            "tar -xzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
         )
     )
 )
@@ -301,7 +301,7 @@ f_asan_build.addStep(downloadSourceTarball())
 f_asan_build.addStep(
     steps.ShellCommand(
         command=util.Interpolate(
-            "tar -xvzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
+            "tar -xzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
         )
     )
 )
@@ -435,7 +435,7 @@ f_msan_build.addStep(downloadSourceTarball())
 f_msan_build.addStep(
     steps.ShellCommand(
         command=util.Interpolate(
-            "tar -xvzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
+            "tar -xzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
         )
     )
 )
@@ -550,7 +550,7 @@ f_valgrind_build.addStep(downloadSourceTarball())
 f_valgrind_build.addStep(
     steps.ShellCommand(
         command=util.Interpolate(
-            "tar -xvzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
+            "tar -xzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
         )
     )
 )
@@ -674,7 +674,7 @@ f_big_test.addStep(
 f_big_test.addStep(
     steps.ShellCommand(
         command=util.Interpolate(
-            "tar -xvzf " + "%(prop:mariadb_version)s" + ".tar.gz --strip-components=1"
+            "tar -xzf " + "%(prop:mariadb_version)s" + ".tar.gz --strip-components=1"
         )
     )
 )
@@ -856,10 +856,23 @@ f_full_test.addStep(downloadSourceTarball())
 f_full_test.addStep(
     steps.ShellCommand(
         command=util.Interpolate(
-            "tar -xvzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
+            "tar -xzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
         )
     )
 )
+f_full_test.addStep(
+    steps.ShellCommand(
+        name="create html log file",
+        command=[
+            "bash",
+            "-c",
+            util.Interpolate(
+                getHTMLLogString(),
+                jobs=util.Property("jobs", default="$(getconf _NPROCESSORS_ONLN)"),
+            ),
+        ],
+    )
+)
 # build steps
 f_full_test.addStep(
     steps.Compile(
@@ -916,7 +929,7 @@ f_without_server.addStep(steps.ShellCommand(command="ls -la"))
 f_without_server.addStep(
     steps.ShellCommand(
         command=util.Interpolate(
-            "tar -xvzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
+            "tar -xzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
         )
     )
 )
@@ -1142,7 +1155,7 @@ f_bintar.addStep(downloadSourceTarball())
 f_bintar.addStep(
     steps.ShellCommand(
         command=util.Interpolate(
-            "tar -xvzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
+            "tar -xzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
         )
     )
 )

diff --git a/master-docker-nonstandard/master.cfg b/master-docker-nonstandard/master.cfg
@@ -433,7 +433,7 @@ f_asan_ubsan_build.addStep(downloadSourceTarball())
 f_asan_ubsan_build.addStep(
     steps.ShellCommand(
         command=util.Interpolate(
-            "tar -xvzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
+            "tar -xzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
         )
     )
 )
@@ -554,7 +554,7 @@ f_asan_build.addStep(downloadSourceTarball())
 f_asan_build.addStep(
     steps.ShellCommand(
         command=util.Interpolate(
-            "tar -xvzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
+            "tar -xzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
         )
     )
 )
@@ -688,7 +688,7 @@ f_msan_build.addStep(downloadSourceTarball())
 f_msan_build.addStep(
     steps.ShellCommand(
         command=util.Interpolate(
-            "tar -xvzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
+            "tar -xzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
         )
     )
 )
@@ -803,7 +803,7 @@ f_valgrind_build.addStep(downloadSourceTarball())
 f_valgrind_build.addStep(
     steps.ShellCommand(
         command=util.Interpolate(
-            "tar -xvzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
+            "tar -xzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
         )
     )
 )
@@ -927,7 +927,7 @@ f_big_test.addStep(
 f_big_test.addStep(
     steps.ShellCommand(
         command=util.Interpolate(
-            "tar -xvzf " + "%(prop:mariadb_version)s" + ".tar.gz --strip-components=1"
+            "tar -xzf " + "%(prop:mariadb_version)s" + ".tar.gz --strip-components=1"
         )
     )
 )
@@ -1109,10 +1109,23 @@ f_full_test.addStep(downloadSourceTarball())
 f_full_test.addStep(
     steps.ShellCommand(
         command=util.Interpolate(
-            "tar -xvzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
+            "tar -xzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
         )
     )
 )
+f_full_test.addStep(
+    steps.ShellCommand(
+        name="create html log file",
+        command=[
+            "bash",
+            "-c",
+            util.Interpolate(
+                getHTMLLogString(),
+                jobs=util.Property("jobs", default="$(getconf _NPROCESSORS_ONLN)"),
+            ),
+        ],
+    )
+)
 # build steps
 f_full_test.addStep(
     steps.Compile(
@@ -1169,7 +1182,7 @@ f_without_server.addStep(steps.ShellCommand(command="ls -la"))
 f_without_server.addStep(
     steps.ShellCommand(
         command=util.Interpolate(
-            "tar -xvzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
+            "tar -xzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
         )
     )
 )
@@ -1395,7 +1408,7 @@ f_bintar.addStep(downloadSourceTarball())
 f_bintar.addStep(
     steps.ShellCommand(
         command=util.Interpolate(
-            "tar -xvzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
+            "tar -xzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
         )
     )
 )

diff --git a/master-nonlatent/master.cfg b/master-nonlatent/master.cfg
@@ -221,7 +221,7 @@ f_windows.addStep(
             "dojob",
             '"',
             util.Interpolate(
-                "tar -xvzf %(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
+                "tar -xzf %(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
             ),
             '"',
         ],
@@ -398,7 +398,7 @@ f_windows_msi.addStep(
             "dojob",
             '"',
             util.Interpolate(
-                "tar -xvzf %(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
+                "tar -xzf %(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
             ),
             '"',
         ],
@@ -730,7 +730,7 @@ f_aix.addStep(downloadSourceTarball())
 f_aix.addStep(
     steps.ShellCommand(
         command=util.Interpolate(
-            "tar -xvzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz"
+            "tar -xzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz"
         )
     )
 )
@@ -844,7 +844,7 @@ f_macos.addStep(downloadSourceTarball(output_dir="~/packages/"))
 f_macos.addStep(
     steps.ShellCommand(
         command=util.Interpolate(
-            "tar -xvzf ~/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
+            "tar -xzf ~/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
         )
     )
 )

diff --git a/master.cfg b/master.cfg
@@ -191,7 +191,7 @@ f_deb_autobake.addStep(downloadSourceTarball())
 f_deb_autobake.addStep(
     steps.ShellCommand(
         command=util.Interpolate(
-            "tar -xvzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
+            "tar -xzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
         )
     )
 )