taler-deployment

commit af10b9d78fb6924d7641911d3ac8f1fa179459fa
parent f158ea71c74b0012c9ff0f00f297628a16601aca
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date:   Thu, 27 Feb 2025 19:32:39 +0100

readd meson changes to gnunet build system

Diffstat:
M
buildbot/master.cfg
 | 
55
++++++++++++++++++++++++++++++-------------------------

1 file changed, 30 insertions(+), 25 deletions(-)
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
@@ -442,7 +442,9 @@ SCHEDULERS.append(schedulers.AnyBranchScheduler(
                        change_filter=util.ChangeFilter(branch_re='master|dev/.+',
                        repository='https://git.gnunet.org/gnunet.git'),
                        treeStableTimer=None,
-                       builderNames=["gnunet_autotools", "gnunet_meson"]))
+                       builderNames=["gnunet-debian-x86_64",
+                                     "gnunet-debian-x86_64-autotools"
+                                     "gnunet-fedora-aarch64"]))
 
 SCHEDULERS.append(schedulers.SingleBranchScheduler(
                        name="tagged_release",
@@ -586,7 +588,7 @@ gnunet_make_step = steps.ShellSequence(
          'TMPDIR': '/tmp/gnunet/'},
     haltOnFailure=True,
     commands=[
-      util.ShellArg(command=['./bootstrap'], logname='bootstrap', haltOnFailure=True),
+      util.ShellArg(command=['./bootstrap', 'autotools'], logname='bootstrap', haltOnFailure=True),
       util.ShellArg(command=['./configure',
                              "--prefix=/tmp/gnunet-buildbot",
                              "--enable-experimental",
@@ -609,13 +611,13 @@ gnunet_make_step = steps.ShellSequence(
 )
 
 gnunet_meson_step = steps.ShellSequence(
-    name=util.Interpolate("GNUnet build (meson)"),
+    name=util.Interpolate("GNUnet build"),
     env={'GNUNET_PREFIX': '/tmp/gnunet-buildbot/lib',
          'PATH': ["/tmp/gnunet-buildbot/bin", "${PATH}"],
          'TMPDIR': '/tmp/gnunet/'},
     haltOnFailure=True,
     commands=[
-      util.ShellArg(command=['./bootstrap', 'meson'], logname='bootstrap', haltOnFailure=True),
+      util.ShellArg(command=['./bootstrap'], logname='bootstrap', haltOnFailure=True),
       util.ShellArg(command=['meson', 'setup',
                              "-Dprefix=/tmp/gnunet-buildbot",
                              "-Dexperimental=true",
@@ -689,11 +691,11 @@ cov_factory.addStep(steps.ShellSequence(
     name=util.Interpolate("Git rev. %(prop:got_revision)s build"),
     commands=[
         util.ShellArg(command=['./bootstrap'], logname='bootstrap'),
-        util.ShellArg(command=['./configure',
-                               "--prefix=/tmp/gnunet-buildbot",
-                               "--enable-testing",
-                               "--enable-experimental"], logname="configure"),
-        util.ShellArg(command=['cov-build', '--dir', 'cov-int', 'make', '-j16'], logname='cov-build'),
+        util.ShellArg(command=['meson', 'setup',
+                               "-Dprefix=/tmp/gnunet-buildbot",
+                               "-Dexperimental=true"],
+                               logname="configure"),
+        util.ShellArg(command=['cov-build', '--dir', 'cov-int', 'meson', 'compile', '-C', 'build'], logname='cov-build'),
     ]))
 cov_factory.addStep(steps.ShellCommand(command=['tar', 'czf', 'coverity.tar.gz', 'cov-int/'],
                                        haltOnFailure=True,
@@ -727,7 +729,7 @@ dist_factory.addStep(steps.ShellSequence(
     name=util.Interpolate("(Meson) Git rev. %(prop:got_revision)s build"),
     haltOnFailure=True,
     commands=[
-        util.ShellArg(command=['./bootstrap', 'meson'],
+        util.ShellArg(command=['./bootstrap'],
                       logname='bootstrap',
                       haltOnFailure=True),
         util.ShellArg(command=['meson', 'setup', 'build'],
@@ -787,7 +789,7 @@ dist_factory.addStep(steps.ShellSequence(
     name=util.Interpolate("Git rev. %(prop:got_revision)s build"),
     haltOnFailure=True,
     commands=[
-        util.ShellArg(command=['./bootstrap'],
+        util.ShellArg(command=['./bootstrap', 'autotools'],
                       logname='bootstrap',
                       haltOnFailure=True),
         util.ShellArg(command=['./configure',
@@ -844,12 +846,12 @@ dist_factory.addStep(steps.ShellSequence(
 # Upload artifact to https://buildbot.gnunet.org/artifacts
 dist_factory.addStep(steps.FileUpload(workersrc=util.Interpolate('gnunet-%(prop:gnunet_releasever)s.tar.gz'),
                            mode=0o644,
-                           masterdest=util.Interpolate("~/artifacts/gnunet-%(prop:gnunet_releasever)s.tar.gz"),
-                           url=util.Interpolate("https://buildbot.gnunet.org/artifacts/gnunet-%(prop:gnunet_releasever)s.tar.gz")))
+                           masterdest=util.Interpolate("~/artifacts/gnunet-%(prop:gnunet_releasever)s-autotools.tar.gz"),
+                           url=util.Interpolate("https://buildbot.gnunet.org/artifacts/gnunet-%(prop:gnunet_releasever)s-autotools.tar.gz")))
 dist_factory.addStep(steps.FileUpload(workersrc=util.Interpolate('build/meson-dist/gnunet-%(prop:gnunet_meson_releasever)s.tar.xz'),
                            mode=0o644,
-                           masterdest=util.Interpolate("~/artifacts/gnunet-%(prop:gnunet_releasever)s-meson.tar.xz"),
-                           url=util.Interpolate("https://buildbot.gnunet.org/artifacts/gnunet-%(prop:gnunet_meson_releasever)s-meson.tar.xz")))
+                           masterdest=util.Interpolate("~/artifacts/gnunet-%(prop:gnunet_releasever)s.tar.xz"),
+                           url=util.Interpolate("https://buildbot.gnunet.org/artifacts/gnunet-%(prop:gnunet_meson_releasever)s.tar.xz")))
 
 
 
@@ -928,7 +930,7 @@ add_default_pipeline(doc_factory)
 
 
 ###########################
-#        Buildbot         #
+#        Buildbot TODO delete at some point         #
 ###########################
 bb_factory = util.BuildFactory()
 bb_factory.addStep(steps.Git(repourl='ssh://git@git.gnunet.org/buildbot-ci.git', mode='incremental'))
@@ -937,15 +939,17 @@ bb_factory.addStep(steps.ShellCommand(command=["./reload_bb-master.sh"], name="R
 
 
 BUILDERS.append(
-    util.BuilderConfig(name="gnunet_autotools",
+    util.BuilderConfig(name="gnunet-debian-x86_64-autotools",
                        workernames=["firefly-x86_64-amdepyc"],
                        factory=factory))
+
 BUILDERS.append(
-    util.BuilderConfig(name="gnunet_openbsd",
-                       workernames=["mp-amd64-openbsd"],
-                       factory=factory))
+    util.BuilderConfig(name="gnunet-debian-x86_64",
+                       workernames=["firefly-x86_64-amdepyc"],
+                       factory=factoryMeson))
+
 BUILDERS.append(
-    util.BuilderConfig(name="gnunet_meson",
+    util.BuilderConfig(name="gnunet-fedora-aarch64",
                        workernames=["schanzen-aarch64-fedora-meson"],
                        factory=factoryMeson))
 
@@ -1002,7 +1006,8 @@ BUILDERS.append(
                        factory=copr_factory))
 
 
-bsg = reporters.BuildStatusGenerator(mode=["exception", "failing", "problem"])
+bsg = reporters.BuildStatusGenerator(mode=["exception", "failing", "problem"],
+                                     builders=["gnunet-debian-x86_64", "gnunet-fedora-aarch64"])
 
 mn = reporters.MailNotifier(fromaddr="buildbot@firefly.gnunet.org",
                             sendToInterestedUsers=False,
@@ -1332,9 +1337,9 @@ SCHEDULERS.append(schedulers.ForceScheduler(
 SCHEDULERS.append(schedulers.ForceScheduler(
     name="force_gnunet",
     buttonName="Trigger build",
-    builderNames=["gnunet_openbsd",
-                  "gnunet_meson",
-                  "gnunet_autotools",
+    builderNames=["gnunet-fedora-aarch64",
+                  "gnunet-debian-x86_64",
+                  "gnunet-debian-x86_64-autotools",
                   "gnunet_release",
                   "gnunet_coverity",
                   "stage.gnunet.org",