[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-deployment] branch master updated (d3fb7ab -> baf34c9)
From: |
gnunet |
Subject: |
[taler-deployment] branch master updated (d3fb7ab -> baf34c9) |
Date: |
Sun, 23 Feb 2020 12:34:04 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a change to branch master
in repository deployment.
from d3fb7ab add sync to set of launched jobs
new 0892c7a remove dead logic
new baf34c9 enable jail for locv
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.md | 13 ++++++++++---
bootstrap-docbuilder | 8 ++++++++
bootstrap-reservetopper | 9 +++++++++
bootstrap-sitesbuilder | 10 ++++++++++
bootstrap-walletbuilder | 9 +++++++++
buildbot/build-docs.sh | 25 +++++++++++++++++++++++--
buildbot/build-walletcore.sh | 5 -----
buildbot/master.cfg | 28 ++--------------------------
sign-gnu-artefact | 0
systemd-services/README | 11 +++++++++++
taler-docbuild/.gitignore | 1 -
taler-docbuild/update_docs.sh | 25 -------------------------
taler-walletbuild/build_wallet-core.sh | 18 ------------------
13 files changed, 82 insertions(+), 80 deletions(-)
delete mode 100755 buildbot/build-walletcore.sh
mode change 100644 => 100755 sign-gnu-artefact
create mode 100644 systemd-services/README
delete mode 100644 taler-docbuild/.gitignore
delete mode 100755 taler-docbuild/update_docs.sh
delete mode 100755 taler-walletbuild/build_wallet-core.sh
diff --git a/README.md b/README.md
index d9500ca..ab8d8fe 100644
--- a/README.md
+++ b/README.md
@@ -4,13 +4,20 @@ Deployment Layout
bin/ -- scripts to manage a taler deployment (test/demo/int)
buildbot/ -- scripts for the buildmaster and jobs launched by it
-config/ -- logic to generate Taler configurations
-docker/ -- dockerized Taler deployment (NOT MAINTAINED!)
-guix/ -- Guix packages for Taler (NOT MAINTAINED!)
+envcfg/ -- Git tags for various deployments, specify which versions should be
used
+history/ -- directory for NOT MAINTAINED scripts
+historic/docker/ -- dockerized Taler deployment
+historic/guix/ -- Guix packages for Taler
+mypy/ -- MARCELLO?
+netjail/ -- scripts to create a namespaces to ensure buildslaves do not
compete for resources
postmortem/ -- postmortem reports about major incidents we have had with
lessons learned
private-keys/ -- deployment private keys so that keys do not change if we
migrate elsewhere
+pylint/ -- MARCELLO?
+selenium/ -- MARCELLO?
+sign-gnu-artefact -- shell script for making releases and preparing upload to
ftp.gnu.org
systemd-services/ -- service definitions for buildbot build-slaves
taler-arm/ -- gnunet-arm configurations for a deployment
+
taler-sitesbuild/ -- scripts for updating our Web sites
taler-walletbuild/ -- scripts for building the Taler wallet
diff --git a/bootstrap-docbuilder b/bootstrap-docbuilder
index 856ae6c..bdbd95f 100755
--- a/bootstrap-docbuilder
+++ b/bootstrap-docbuilder
@@ -27,3 +27,11 @@ done
if [[ ! -d worker ]]; then
buildbot-worker create-worker --umask=0o22 ~/worker localhost:9989
doc-worker doc-pass
fi
+
+mkdir -p ~/.config/systemd/user/
+cp systemd-services/buildbot-worker-doc.service ~/.config/systemd/user/
+
+systemctl --user daemon-reload || echo "Please use 'machinectl shell
docbuilder@.host' to log in to use this script"
+
+systemctl --user enable buildbot-worker-doc.service
+systemctl --user start buildbot-worker-doc.service
diff --git a/bootstrap-reservetopper b/bootstrap-reservetopper
index bc53bb0..15d7a0b 100755
--- a/bootstrap-reservetopper
+++ b/bootstrap-reservetopper
@@ -99,3 +99,12 @@ ln -sf ../deployment/taler-build/invalidate.sh stamps/
if [[ ! -d "worker" ]]; then
buildbot-worker create-worker $HOME/worker localhost:9989
"$ENVNAME-topper-worker" "$ENVNAME-topper-pass"
fi
+
+
+mkdir -p ~/.config/systemd/user/
+cp systemd-services/buildbot-worker-demo-topper.service ~/.config/systemd/user/
+
+systemctl --user daemon-reload || echo "Please use 'machinectl shell
demo-reserve-topper@.host' to log in to use this script"
+
+systemctl --user enable buildbot-worker-demo-topper.service
+systemctl --user start buildbot-worker-demo-topper.service
diff --git a/bootstrap-sitesbuilder b/bootstrap-sitesbuilder
index e87eace..9bc62da 100755
--- a/bootstrap-sitesbuilder
+++ b/bootstrap-sitesbuilder
@@ -32,3 +32,13 @@ ln -sf ../deployment/taler-sitesbuild/invalidate.sh stamps/
if [[ ! -d worker ]]; then
buildbot-worker create-worker --umask=0o22 ~/worker localhost:9989
sites-worker sites-pass
fi
+
+
+
+mkdir -p ~/.config/systemd/user/
+cp systemd-services/buildbot-worker-sites.service ~/.config/systemd/user/
+
+systemctl --user daemon-reload || echo "Please use 'machinectl shell
taler-websites@.host' to log in to use this script"
+
+systemctl --user enable buildbot-worker-sites.service
+systemctl --user start buildbot-worker-sites.service
diff --git a/bootstrap-walletbuilder b/bootstrap-walletbuilder
index edb093d..8a5304c 100755
--- a/bootstrap-walletbuilder
+++ b/bootstrap-walletbuilder
@@ -27,3 +27,12 @@ done
if test ! -d worker ; then
buildbot-worker create-worker --umask=0o22 ~/worker localhost:9989
wallet-worker wallet-pass
fi
+
+
+mkdir -p ~/.config/systemd/user/
+cp systemd-services/buildbot-worker-wallet.service ~/.config/systemd/user/
+
+systemctl --user daemon-reload || echo "Please use 'machinectl shell
walletbuilder@.host' to log in to use this script"
+
+systemctl --user enable buildbot-worker-wallet.service
+systemctl --user start buildbot-worker-wallet.service
diff --git a/buildbot/build-docs.sh b/buildbot/build-docs.sh
index e6b4420..8b7ed69 100755
--- a/buildbot/build-docs.sh
+++ b/buildbot/build-docs.sh
@@ -1,4 +1,25 @@
#!/bin/bash
+
set -eu
-cd ~/deployment/taler-docbuild
-./update_docs.sh
+
+fetch () {
+ git clean -fdx
+ git fetch
+ # reset to updated upstream branch, but only if we're tracking a branch
+ branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null ||
echo head)
+ git reset --hard "$branch"
+}
+
+export PATH=$HOME/.local/bin:$PATH
+
+cd $HOME/docs
+fetch
+make html
+make latexpdf
+
+mkdir -p $HOME/build/docs/html/
+mkdir -p $HOME/build/docs/pdf/
+
+cp -r _build/html/* $HOME/build/docs/html/
+cp -r _build/latex/*.pdf $HOME/build/docs/pdf/
+
diff --git a/buildbot/build-walletcore.sh b/buildbot/build-walletcore.sh
deleted file mode 100755
index 8d8e9f4..0000000
--- a/buildbot/build-walletcore.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-set -eu
-
-cd $HOME/deployment/taler-walletbuild
-./build_wallet-core.sh
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index 8d16da7..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,11 +632,6 @@ DEMO_SERVICES_CHECKER_FACTORY.addStep(
)
)
-DEBUG_BUILDER = util.BuilderConfig(
- name="debug-builder",
- workernames=["debug-worker"],
- factory=DEBUG_FACTORY
-)
# Builder to update the buildmaster itself.
BUILDMASTER_BUILDER = util.BuilderConfig(
@@ -803,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
old mode 100644
new mode 100755
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.
diff --git a/taler-docbuild/.gitignore b/taler-docbuild/.gitignore
deleted file mode 100644
index c337aa9..0000000
--- a/taler-docbuild/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*-stamp
diff --git a/taler-docbuild/update_docs.sh b/taler-docbuild/update_docs.sh
deleted file mode 100755
index 8b7ed69..0000000
--- a/taler-docbuild/update_docs.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-fetch () {
- git clean -fdx
- git fetch
- # reset to updated upstream branch, but only if we're tracking a branch
- branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null ||
echo head)
- git reset --hard "$branch"
-}
-
-export PATH=$HOME/.local/bin:$PATH
-
-cd $HOME/docs
-fetch
-make html
-make latexpdf
-
-mkdir -p $HOME/build/docs/html/
-mkdir -p $HOME/build/docs/pdf/
-
-cp -r _build/html/* $HOME/build/docs/html/
-cp -r _build/latex/*.pdf $HOME/build/docs/pdf/
-
diff --git a/taler-walletbuild/build_wallet-core.sh
b/taler-walletbuild/build_wallet-core.sh
deleted file mode 100755
index 3e91cbc..0000000
--- a/taler-walletbuild/build_wallet-core.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-rm -rf $HOME/local
-mkdir $HOME/local
-
-cd $HOME/wallet-core
-git clean -fxd
-
-git fetch
-branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null ||
echo HEAD)
-git reset --hard "$branch"
-
-./bootstrap
-./configure --prefix=$HOME/local
-make
-make install
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [taler-deployment] branch master updated (d3fb7ab -> baf34c9),
gnunet <=