commit 2e2811d036abc360345f6cbe2289772020230b66
parent 18115954dc66f5d1a0f097b24c70cc9ad533119e
Author: Christian Grothoff <christian@grothoff.org>
Date: Mon, 13 Jan 2025 23:19:50 +0100
update master for changed repo names
Diffstat:
3 files changed, 21 insertions(+), 27 deletions(-)
diff --git a/buildbot/make-buildbot-linkchecker.sh b/buildbot/make-buildbot-linkchecker.sh
@@ -15,9 +15,9 @@ export PATH=$HOME/.local/bin:$PATH
pip install --user --break-system-packages buildbot-worker
-if ! test -d "$HOME/deployment";
+if ! test -d "$HOME/taler-deployment";
then
- git clone git://git.taler.net/deployment.git
+ git clone git://git.taler.net/taler-deployment.git
fi
if [[ ! -d worker ]]; then
diff --git a/buildbot/make-buildbot-master.sh b/buildbot/make-buildbot-master.sh
@@ -16,7 +16,7 @@ export PATH=$HOME/.local/bin:$PATH
pip install --user --break-system-packages buildbot buildbot-www buildbot-profiler buildbot-prometheus buildbot-console-view buildbot-www-react buildbot-grid-view buildbot-enhanced-ui buildbot-react-waterfall-view buildbot-worker buildbot-waterfall-view
BRANCH=master
-REPOS="deployment"
+REPOS="taler-deployment"
for component in $REPOS;
do
@@ -36,7 +36,7 @@ if [[ ! -d ./master ]];
then
buildbot create-master master
cd master
- ln -s ../deployment/buildbot/master.cfg
+ ln -s ../taler-deployment/buildbot/master.cfg
cd ..
fi
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
@@ -106,8 +106,8 @@ NIGHTLY_TRIGGERS=[]
# Array of builders to be scheduled whenever any of the code Git repos change
CODECHANGE_TRIGGERS = []
-# Array of builders to be scheduled whenever the wallet-core or
-# deployment change
+# Array of builders to be scheduled whenever the taler-typescript-core or
+# taler-deployment change
WALLETCHANGE_TRIGGERS = []
# Array of builder names for which build status reports should be sent
@@ -119,7 +119,7 @@ BUILDER_EMAIL_ADDRESSES = []
############ Convenience functions #################
-# Create a FACTORY with a deployment.git checkout as the first step.
+# Create a FACTORY with a taler-deployment.git checkout as the first step.
def create_factory_with_deployment():
f = util.BuildFactory()
update_deployment(f)
@@ -146,7 +146,7 @@ def jailed_check(package, srcdirs):
name="Tests of " + package,
description="Testing " + package,
descriptionDone="Pass",
- commands=map(lambda srcdir: util.ShellArg(command=["sudo", "/usr/local/bin/netjail.sh", "/home/integrationtest/deployment/buildbot/with-postgres.sh", "bash", "-c", "'cd src/"+srcdir+" make install check'"]), srcdirs),
+ commands=map(lambda srcdir: util.ShellArg(command=["sudo", "/usr/local/bin/netjail.sh", "/home/container-worker/taler-deployment/buildbot/with-postgres.sh", "bash", "-c", "'cd src/"+srcdir+" make install check'"]), srcdirs),
env={'PATH': "${HOME}/local/bin:${PATH}"},
workdir="../../sources/" + package
)
@@ -154,12 +154,12 @@ def jailed_check(package, srcdirs):
# Convenience function that checks out the deployment.
def update_deployment(factory):
factory.addStep(steps.ShellSequence(
- name="update deployment",
+ name="update taler-deployment",
description="removing old deployment and fetching fresh repository",
descriptionDone="Deployment updated",
commands=[
- util.ShellArg(command=["rm", "-rf", "deployment"]),
- util.ShellArg(command=["git", "clone", "git://git.taler.net/deployment"]),
+ util.ShellArg(command=["rm", "-rf", "taler-deployment"]),
+ util.ShellArg(command=["git", "clone", "git://git.taler.net/taler-deployment"]),
],
haltOnFailure=True,
workdir="../.."
@@ -296,7 +296,7 @@ SITES_FACTORY.addStep(
description="Building all the Taler homepages",
descriptionDone="Sites built.",
command=["./build-sites.sh"],
- workdir="../../deployment/worker-sites",
+ workdir="../../taler-deployment/worker-sites",
haltOnFailure=True
)
)
@@ -308,18 +308,12 @@ BUILDERS.append(util.BuilderConfig(
#EMAIL_ALERTS.append("sites-builder")
-# The web page changed if 'www' changed OR if 'web' in the 'twister' repo changed:
-def twister_web_page(change):
+# The web page changed if 'taler-www' changed
+def web_page(change):
_change = change.asDict()
repo = _change.get("project")
- if repo in ["www", "buywith", "deployment"]:
+ if repo in ["taler-www", "taler-deployment"]:
return True
-
- files = _change.get("files")
- for file in files:
- if re.search(r"web", file.get("name", "")) \
- and "twister" == repo:
- return True
return False
@@ -329,7 +323,7 @@ SCHEDULERS.append(schedulers.SingleBranchScheduler(
builderNames=["sites-builder"],
change_filter=util.ChangeFilter(
branch_re="(master|stable)",
- filter_fn=twister_web_page
+ filter_fn=web_page
),
treeStableTimer=None
))
@@ -349,7 +343,7 @@ LINKCHECKER_FACTORY.addStep(
name="linkchecker",
description="Check taler.net website for broken links && Notify",
descriptionDone="Results of wget in buildbot logs.",
- command=["/home/linkchecker-worker/deployment/worker-linkchecker/linkchecker.sh"],
+ command=["/home/linkchecker-worker/taler-deployment/worker-linkchecker/linkchecker.sh"],
workdir="/home/linkchecker-worker",
haltOnFailure=True,
timeout=7200 # 2 hours
@@ -678,7 +672,7 @@ SCHEDULERS.append(schedulers.SingleBranchScheduler(
name="taler-healthcheck-scheduler",
change_filter=util.ChangeFilter(
branch="master",
- project_re="(wallet|deployment)"
+ project_re="(taler-typescript-core|taler-deployment)"
),
treeStableTimer=None,
builderNames=WALLETCHANGE_TRIGGERS
@@ -688,9 +682,9 @@ SCHEDULERS.append(schedulers.SingleBranchScheduler(
name="all-scheduler",
change_filter=util.ChangeFilter(
branch_re="(master|stable)",
- project_re="(backoffice|wallet-core|bank|exchange|"
- "merchant|deployment|twister|sync|"
- "help|taler-merchant-demos)"
+ project_re="(taler-typescript-core|exchange|"
+ "merchant|taler-deployment|twister|sync|"
+ "taler-merchant-demos)"
),
treeStableTimer=None,
builderNames=CODECHANGE_TRIGGERS
