summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-02-23 12:34:01 +0100
committerChristian Grothoff <christian@grothoff.org>2020-02-23 12:34:01 +0100
commitbaf34c9e9145f53cb06d2ee63bec3c43af687f02 (patch)
tree94d957f955d437cc83b1719ce2b41bf651f85710
parent0892c7a663e025ae59f6b5faede79e9e2264b08d (diff)
downloaddeployment-baf34c9e9145f53cb06d2ee63bec3c43af687f02.tar.gz
deployment-baf34c9e9145f53cb06d2ee63bec3c43af687f02.tar.bz2
deployment-baf34c9e9145f53cb06d2ee63bec3c43af687f02.zip
enable jail for locv
-rw-r--r--buildbot/master.cfg29
-rwxr-xr-x[-rw-r--r--]sign-gnu-artefact0
-rw-r--r--systemd-services/README11
3 files changed, 13 insertions, 27 deletions
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index 4d4bf4c..5aa5a59 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -229,16 +229,6 @@ ALL_SCHEDULER = schedulers.SingleBranchScheduler(
builderNames=["test-builder"]
)
-# Scheduler monitoring the help.git repo; a forgotten repo we
-# use to test BB.
-# NOTE: scheduler is NOT active! (commented out below)
-DEBUG_SCHEDULER = schedulers.SingleBranchScheduler(
- name="debug-scheduler",
- change_filter=util.ChangeFilter(branch="master", project="help"),
- treeStableTimer=None,
- builderNames=["debug-builder"]
-)
-
# Consider adding other Python parts, like the various frontends.
# NOTE: scheduler is NOT active! (commented out below)
LINT_SCHEDULER = schedulers.SingleBranchScheduler(
@@ -415,15 +405,6 @@ WALLET_FACTORY.addStep(
workdir="build/"
)
)
-#WALLET_FACTORY.addStep(
-# ShellCommand(
-# name="configuration",
-# description="Running configure script",
-# descriptionDone="Correctly configured",
-# command=["./configure"],
-# workdir="build/"
-# )
-#)
WALLET_FACTORY.addStep(
ShellCommand(
name="test",
@@ -503,7 +484,7 @@ LCOV_FACTORY.addStep(
name="coverage generation",
description="running tests",
descriptionDone="generating HTML report",
- command=["./coverage.sh"],
+ command=["../netjail/netjail.sh", "./coverage.sh"],
workdir="../../deployment/buildbot",
)
)
@@ -651,12 +632,6 @@ DEMO_SERVICES_CHECKER_FACTORY.addStep(
)
)
-# NOTE: this is not in use!
-DEBUG_BUILDER = util.BuilderConfig(
- name="debug-builder",
- workernames=["debug-worker"],
- factory=DEBUG_FACTORY
-)
# Builder to update the buildmaster itself.
BUILDMASTER_BUILDER = util.BuilderConfig(
@@ -804,7 +779,7 @@ c["services"] = [IRC, EMAIL]
####### PROJECT IDENTITY
-c["title"] = "Taler"
+c["title"] = "GNU Taler"
c["titleURL"] = "https://taler.net"
# We use nginx to expose the BB under this URL.
diff --git a/sign-gnu-artefact b/sign-gnu-artefact
index f85db4e..f85db4e 100644..100755
--- a/sign-gnu-artefact
+++ b/sign-gnu-artefact
diff --git a/systemd-services/README b/systemd-services/README
new file mode 100644
index 0000000..1f0d46c
--- /dev/null
+++ b/systemd-services/README
@@ -0,0 +1,11 @@
+When modifying the systemd units in this file, please be aware
+that they are NOT automatically updated on the target system
+by the buildbot. So when changing these rules, you must manually
+log into the respective user, ensure the deployment.git is already
+up-to date, and then re-run the respective 'bootstrap' script.
+
+Note that you must use
+
+# machinectl shell $USER@.host
+
+to log in to use the bootstrap scripts.