commit 18115954dc66f5d1a0f097b24c70cc9ad533119e
parent 54d81c6a394fa47197ca99b10bc7f4a89576ae2d
Author: Christian Grothoff <christian@grothoff.org>
Date: Sun, 12 Jan 2025 18:05:49 +0100
setup fixes
Diffstat:
3 files changed, 6 insertions(+), 35 deletions(-)
diff --git a/buildbot/build-sites.sh b/buildbot/build-sites.sh
@@ -1,5 +0,0 @@
-#!/bin/bash
-set -eu
-cd $HOME/stamps
-./invalidate.sh
-make -k
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
@@ -3,7 +3,7 @@
##
# This file is part of TALER
-# (C) 2016-2023 Taler Systems SA
+# (C) 2016-2025 Taler Systems SA
#
# TALER is free software; you can redistribute it and/or
# modify it under the terms of the GNU Affero General Public
@@ -87,20 +87,6 @@ class MessageFormatterWithStdout(reporters.MessageFormatter):
stdout.append(line[1:])
ctx.update(dict(stdout="\n".join(stdout)))
-# tipReserveEmails = reporters.MailNotifier(
-# fromaddr="buildbot@taler.net", # to be sent to a dedicate alias
-# sendToInterestedUsers=False,
-# mode=("all"),
-# builders=["check-tips-builder"], # This builder has been removed - Javisep.
-# extraRecipients=["tips@taler.net"],
-# dumpMailsToLog=True, # debug, to remove
-# messageFormatter=MessageFormatterWithStdout(
-# wantSteps=True,
-# wantLogs=True,
-# template="{{ stdout }}",
-# subject="tips availability on demo")
-# )
-
SERVICES = []
@@ -139,7 +125,6 @@ def create_factory_with_deployment():
update_deployment(f)
return f
-
# Convenience function that checks out a Git repository.
# First argument is the URL of the Git to clone, second
# the desired branch. Default is 'master'.
@@ -154,7 +139,6 @@ def git_step(repo, target_branch="master"):
branch=target_branch
)
-
# Convenience function that runs 'make check' in a
# directory of the code inside of a netjail.
def jailed_check(package, srcdirs):
@@ -167,7 +151,6 @@ def jailed_check(package, srcdirs):
workdir="../../sources/" + package
)
-
# Convenience function that checks out the deployment.
def update_deployment(factory):
factory.addStep(steps.ShellSequence(
@@ -182,7 +165,6 @@ def update_deployment(factory):
workdir="../.."
))
-
# Convenience function that builds and runs a container.
def container_add_step(HALT_ON_FAILURE,
WARN_ON_FAILURE,
@@ -263,11 +245,10 @@ def container_add_step(HALT_ON_FAILURE,
################ 1: BUILDMASTER JOB ###################################
-
##
# This worker restarts the buildmaster itself on
# changes to this file.
-# Location: /home/buildbot-master @ taler.net
+# Location: /home/buildbot-master
WORKERS.append(Worker("buildmaster-worker", "buildmaster-pass"))
BUILDMASTER_FACTORY = create_factory_with_deployment()
@@ -301,9 +282,7 @@ SCHEDULERS.append(schedulers.SingleBranchScheduler(
))
-
-
-################ 3: WEBSITE JOB ###################################
+################ 2: WEBSITE JOB ###################################
##
# This worker builds Websites: www and stage.
@@ -317,7 +296,7 @@ SITES_FACTORY.addStep(
description="Building all the Taler homepages",
descriptionDone="Sites built.",
command=["./build-sites.sh"],
- workdir="../../deployment/buildbot",
+ workdir="../../deployment/worker-sites",
haltOnFailure=True
)
)
@@ -356,7 +335,7 @@ SCHEDULERS.append(schedulers.SingleBranchScheduler(
))
-################ 9: 'check links' JOB ###################################
+################ 3: 'check links' JOB ###################################
##
# linkchecker worker checks for dead links in the Website
diff --git a/worker-sites/Makefile b/worker-sites/Makefile
@@ -1,9 +1,6 @@
BASE="${HOME}/deployment/worker-sitesbuild"
-all: www.taler.net-stamp
-all: twister.taler.net-stamp
-all: stage.taler.net-stamp
-all: buywith.taler.net-stamp
+all: www.taler.net-stamp twister.taler.net-stamp stage.taler.net-stamp buywith.taler.net-stamp
stage.taler.net-stamp:
${BASE}/update_stage.sh
