[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-deployment] branch master updated: fetch correct taler-wallet-cli
From: |
gnunet |
Subject: |
[taler-deployment] branch master updated: fetch correct taler-wallet-cli repo |
Date: |
Wed, 21 Apr 2021 17:34:46 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository deployment.
The following commit(s) were added to refs/heads/master by this push:
new 52be3ea fetch correct taler-wallet-cli repo
52be3ea is described below
commit 52be3ea0b36582aed6d8201d19009eb21073f674
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Apr 21 17:34:44 2021 +0200
fetch correct taler-wallet-cli repo
---
buildbot/master.cfg | 115 ++++++++++++++++++++++------------------------------
1 file changed, 48 insertions(+), 67 deletions(-)
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index e4cee94..3281c56 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -114,18 +114,15 @@ def jailed_check(package,srcdir):
# Convenience function that checks out the deployment.
def update_deployment(factory):
- factory.addStep(ShellCommand(
- name="clean old deployment",
- description="cleaning previous deployment repository",
- descriptionDone="Deployment removed",
- command=["rm", "-rf", "deployment"],
- workdir="../.."
- ))
- factory.addStep(ShellCommand(
+ factory.addStep(steps.ShellSequence(
name="update deployment",
- description="fetching latest deployment repository",
+ description="removing old deployment and fetching fresh repository",
descriptionDone="Deployment updated",
- command=["git", "clone", "git://git.taler.net/deployment"],
+ commands=[
+ util.ShellArg(command=["rm", "-rf", "deployment"]),
+ util.ShellArg(command=["git", "clone",
"git://git.taler.net/deployment"]),
+ ],
+ haltOnFailure=True,
workdir="../.."
))
@@ -295,8 +292,9 @@ LCOV_FACTORY.addStep(
name="fetch",
description="Running yarn install of wallet",
descriptionDone="Correctly installed",
- command=["npm", "install", "-g", "--prefix", "$HOME", "taler-wallet"],
- workdir="build/"
+ command=["npm", "install", "-g", "--prefix", "$HOME",
"@gnu-taler/taler-wallet-cli"],
+ workdir="build/",
+ haltOnFailure=True,
)
)
LCOV_FACTORY.addStep(
@@ -306,6 +304,7 @@ LCOV_FACTORY.addStep(
descriptionDone="Taler built",
command=["./build.sh"],
workdir="../../deployment/buildbot",
+ haltOnFailure=True,
env={'TALER_COVERAGE': "1"}
)
)
@@ -344,7 +343,8 @@ INTEGRATIONTEST_FACTORY.addStep(
description="removing binaries from previous runs",
descriptionDone="Setup clean",
command=["rm", "-rf", "local"],
- workdir="../.."
+ workdir="../..",
+ haltOnFailure=True,
)
)
INTEGRATIONTEST_FACTORY.addStep(
@@ -353,7 +353,8 @@ INTEGRATIONTEST_FACTORY.addStep(
description="fetching latest deployment repositories from
git.gnunet.org",
descriptionDone="GNUnet code base updated",
command=["./update-sources.sh", "git://git.gnunet.org/",
"libmicrohttpd", "gnunet"],
- workdir="../../deployment/buildbot"
+ workdir="../../deployment/buildbot",
+ haltOnFailure=True,
)
)
INTEGRATIONTEST_FACTORY.addStep(
@@ -362,7 +363,8 @@ INTEGRATIONTEST_FACTORY.addStep(
description="fetching latest deployment repositories from
git.taler.net",
descriptionDone="Taler code base updated",
command=["./update-sources.sh", "git://git.taler.net/", "exchange",
"merchant", "wallet-core", "sync", "anastasis", "bank", "twister"],
- workdir="../../deployment/buildbot"
+ workdir="../../deployment/buildbot",
+ haltOnFailure=True,
)
)
INTEGRATIONTEST_FACTORY.addStep(git_step("git://git.taler.net/wallet-core.git"))
@@ -371,35 +373,23 @@ INTEGRATIONTEST_FACTORY.addStep(
name="fetch",
description="Running yarn install of wallet",
descriptionDone="Correctly installed",
- command=["npm", "install", "-g", "--prefix", "$HOME", "taler-wallet"],
- workdir="../../sources/wallet-core"
- )
-)
-INTEGRATIONTEST_FACTORY.addStep(
- ShellCommand(
- name="fetch",
- description="Running local bootstrap of wallet",
- descriptionDone="wallet bootstrap done",
- command=["./bootstrap"],
- workdir="../../sources/wallet-core"
- )
-)
-INTEGRATIONTEST_FACTORY.addStep(
- ShellCommand(
- name="fetch",
- description="Running local configure of wallet",
- descriptionDone="wallet configure done",
- command=["./configure", "--prefix=$HOME/local/"],
- workdir="../../sources/wallet-core"
+ command=["npm", "install", "-g", "--prefix", "$HOME",
"@gnu-taler/taler-wallet-cli"],
+ workdir="../../sources/wallet-core",
+ haltOnFailure=True,
)
)
INTEGRATIONTEST_FACTORY.addStep(
- ShellCommand(
+ steps.ShellSequence(
name="fetch",
- description="Running local make of wallet",
- descriptionDone="wallet make done",
- command=["make"],
- workdir="../../sources/wallet-core"
+ description="Running local install of wallet",
+ descriptionDone="local wallet install done",
+ commands=[
+ util.ShellArg(command=["./bootstrap"]),
+ util.ShellArg(command=["./configure", "--prefix=$HOME/local/"]),
+ util.ShellArg(command=["make"]),
+ ],
+ workdir="../../sources/wallet-core",
+ haltOnFailure=True,
)
)
INTEGRATIONTEST_FACTORY.addStep(
@@ -464,10 +454,6 @@ INTEGRATIONTEST_FACTORY.addStep(
)
)
-# FIXME: INTEGRATIONTEST_FACTORY is incomplete at this time: we still need
-# to do the actual 'make check' steps (in a jail!)
-
-
BUILDERS.append(util.BuilderConfig(
name="checker-builder",
workernames=["checker-worker"],
@@ -583,7 +569,7 @@ WALLET_FACTORY.addStep(
name="fetch",
description="Running yarn install",
descriptionDone="Correctly installed",
- command=["npm", "install", "-g", "--prefix", "$HOME", "taler-wallet"],
+ command=["npm", "install", "-g", "--prefix", "$HOME",
"@gnu-taler/taler-wallet-cli"],
workdir="build/"
)
)
@@ -713,6 +699,15 @@ CODESPELL_FACTORY.addStep(
workdir="../.."
)
)
+CODESPELL_FACTORY.addStep(
+ ShellCommand(
+ name="clean old deployment",
+ description="cleaning previous doxygen runs",
+ descriptionDone="Doxygen cleaned",
+ command=["rm", "-rf", "exchange/doc/doxygen/html/",
"merchant/doc/doxygen/html/" ],
+ workdir="/home/codespell/sources/"
+ )
+)
CODESPELL_FACTORY.addStep(
ShellCommand(
name="fetch gnunet.org sources",
@@ -732,15 +727,6 @@ CODESPELL_FACTORY.addStep(
)
)
CODESPELL_FACTORY.addStep(git_step("git://git.taler.net/wallet-core.git"))
-CODESPELL_FACTORY.addStep(
- ShellCommand(
- name="clean old deployment",
- description="cleaning previous doxygen runs",
- descriptionDone="Doxygen cleaned",
- command=["rm", "-rf", "exchange/doc/doxygen/html/",
"merchant/doc/doxygen/html/" ],
- workdir="/home/codespell/sources/"
- )
-)
CODESPELL_FACTORY.addStep(
ShellCommand(
name="codespell",
@@ -769,20 +755,14 @@ CODESPELL_FACTORY.addStep(
)
)
CODESPELL_FACTORY.addStep(
- ShellCommand(
+ steps.ShellSequence(
name="tag",
description="prepare merchant",
descriptionDone="directory created",
- command=["mkdir", "-p", "merchant/doc/doxygen/"],
- workdir="/home/codespell/sources/"
- )
-)
-CODESPELL_FACTORY.addStep(
- ShellCommand(
- name="tag",
- description="copying tag file to merchant",
- descriptionDone="tag file copied",
- command=["cp", "exchange/doc/doxygen/taler-exchange.tag",
"merchant/doc/doxygen/taler-exchange.tag"],
+ commands=[
+ util.ShellArg(command=["mkdir", "-p", "merchant/doc/doxygen/"]),
+ util.ShellArg(command=["cp",
"exchange/doc/doxygen/taler-exchange.tag",
"merchant/doc/doxygen/taler-exchange.tag"]),
+ ],
workdir="/home/codespell/sources/"
)
)
@@ -795,6 +775,7 @@ CODESPELL_FACTORY.addStep(
workdir="/home/codespell/sources/merchant/doc/doxygen"
)
)
+
BUILDERS.append(util.BuilderConfig(
name="codespell-builder",
workernames=["codespell-worker"],
@@ -853,7 +834,7 @@ TALER_DEMO_HEALTHCHECK_FACTORY.addStep(
name="fetch",
description="Running yarn install",
descriptionDone="Correctly installed",
- command=["npm", "install", "-g", "--prefix", "$HOME", "taler-wallet"],
+ command=["npm", "install", "-g", "--prefix", "$HOME",
"@gnu-taler/taler-wallet-cli"],
workdir="build/"
)
)
@@ -896,7 +877,7 @@ TALER_TEST_HEALTHCHECK_FACTORY.addStep(
name="fetch",
description="Running yarn install",
descriptionDone="Correctly installed",
- command=["npm", "install", "-g", "--prefix", "$HOME", "taler-wallet"],
+ command=["npm", "install", "-g", "--prefix", "$HOME",
"@gnu-taler/taler-wallet-cli"],
workdir="build/"
)
)
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-deployment] branch master updated: fetch correct taler-wallet-cli repo,
gnunet <=