[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-deployment] branch master updated: remove Anastasis from buildbot
|
From: |
gnunet |
|
Subject: |
[taler-deployment] branch master updated: remove Anastasis from buildbot deployment |
|
Date: |
Thu, 14 Apr 2022 23:58:53 +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 b425532 remove Anastasis from buildbot deployment
b425532 is described below
commit b425532268ffacb23eb95ee78a875dafbe603265
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Thu Apr 14 23:58:50 2022 +0200
remove Anastasis from buildbot deployment
---
bin/WIP/taler-local | 122 ++++++-------------------
bin/taler-deployment | 35 -------
bin/taler-deployment-config-generate | 18 ----
bin/taler-deployment-config-generate-sepa | 18 ----
bin/taler-deployment-config-instances | 14 +--
bin/taler-deployment-prepare | 10 --
bin/taler-deployment-start | 1 -
bin/taler-deployment-start-with-eufin | 1 -
buildbot/bootstrap-scripts/bootstrap-codespell | 2 +-
buildbot/master.cfg | 36 +-------
buildbot/run-coverage-helper.sh | 2 +-
buildbot/with-postgres.sh | 1 -
envcfg/envcfg-demo-2021-08-18.py | 3 +-
taler-arm/anastasis.conf | 4 -
14 files changed, 39 insertions(+), 228 deletions(-)
diff --git a/bin/WIP/taler-local b/bin/WIP/taler-local
index 2a9058b..7ec4dc4 100755
--- a/bin/WIP/taler-local
+++ b/bin/WIP/taler-local
@@ -201,22 +201,6 @@ def build_sync(r, p):
(p / "taler-buildstamp").touch()
-def build_anastasis(r, p):
- update_checkout(r, p)
- subprocess.run(["./bootstrap"], check=True)
- pfx = Path.home() / ".local"
- default_configure(
- "CFLAGS=-ggdb -O0",
- "--enable-logging=verbose",
- f"--with-microhttpd={pfx}",
- f"--with-exchange={pfx}",
- f"--with-merchant={pfx}",
- f"--with-gnunet={pfx}",
- "--disable-doc",
- )
- subprocess.run(["make", "install"], check=True)
- (p / "taler-buildstamp").touch()
-
def build_demos(r, p):
update_checkout(r, p)
@@ -266,15 +250,6 @@ repos = {
"libmicrohttpd"],
build_sync,
),
- "anastasis": Repo(
- "anastasis",
- "git://git.taler.net/anastasis",
- ["exchange",
- "merchant",
- "libmicrohttpd",
- "gnunet"],
- build_anastasis,
- ),
"wallet-core": Repo(
"wallet-core",
"git://git.taler.net/wallet-core",
@@ -399,7 +374,7 @@ def build(without_repos, only_repos) -> None:
"--repos", "-r",
metavar="REPOS",
help="REPOS is a unspaced and comma-separated list of the repositories to
clone.",
-
default="libmicrohttpd,gnunet,exchange,merchant,wallet-core,taler-merchant-demos,sync,anastasis,libeufin",
+
default="libmicrohttpd,gnunet,exchange,merchant,wallet-core,taler-merchant-demos,sync,libeufin",
show_default=True,
)
@click.option(
@@ -427,7 +402,7 @@ def bootstrap(list_repos, repos) -> None:
r_dir.mkdir(parents=True, exist_ok=True)
subprocess.run(["git", "-C", str(sources), "clone", r.url],
check=True)
- reposList = split_repos_list(repos)
+ reposList = split_repos_list(repos)
checkout_repos(load_repos(reposList))
# Globals sharead accross multiple sub-commands:
@@ -494,7 +469,7 @@ def prepare(x_forwarded_host, x_forwarded_proto,
postgres_db_name):
if reason:
print("ERROR:", reason)
exit(1)
-
+
def kill(proc):
proc.terminate()
proc.wait()
@@ -509,7 +484,7 @@ def prepare(x_forwarded_host, x_forwarded_proto,
postgres_db_name):
env["LIBEUFIN_NEXUS_PASSWORD"] = password
env["LIBEUFIN_NEXUS_URL"] = nexus_url
return env
-
+
def get_sandbox_cli_env(
username, password
):
@@ -620,7 +595,7 @@ def prepare(x_forwarded_host, x_forwarded_proto,
postgres_db_name):
sandbox_url,
bank_account_label,
password,
- ):
+ ):
customer_env = os.environ.copy()
customer_env["LIBEUFIN_SANDBOX_USERNAME"] = bank_account_label
customer_env["LIBEUFIN_SANDBOX_PASSWORD"] = password
@@ -673,7 +648,7 @@ def prepare(x_forwarded_host, x_forwarded_proto,
postgres_db_name):
],
env = admin_env
).run()
-
+
WIRE_METHOD = "iban"
# euFin URLs
@@ -709,7 +684,7 @@ def prepare(x_forwarded_host, x_forwarded_proto,
postgres_db_name):
username = "sandbox-account-survey",
password = ALL_INSTANCES_BANK_PASSWORD
)).run()
-
+
def get_random_iban():
cc_no_check = 131400 # is "DE00"
bban = "".join(random.choices("0123456789", k=4))
@@ -717,7 +692,7 @@ def prepare(x_forwarded_host, x_forwarded_proto,
postgres_db_name):
return "DE" + (f"0{check_digits}"[-2:]) + bban
# IBANs
-
+
IBAN_MERCHANT_DEFAULT = get_random_iban()
IBAN_MERCHANT_DEMOSHOP = get_random_iban()
@@ -729,7 +704,7 @@ def prepare(x_forwarded_host, x_forwarded_proto,
postgres_db_name):
dict(name="survey"),
dict(name="blog"),
]
-
+
# Credentials / API keys
EXCHANGE_NEXUS_USERNAME = "exchange-nexus-user"
EXCHANGE_NEXUS_PASSWORD = "exchange-nexus-password"
@@ -738,7 +713,7 @@ def prepare(x_forwarded_host, x_forwarded_proto,
postgres_db_name):
ALL_INSTANCES_BANK_PASSWORD = "secret"
EXCHANGE_BANK_ACCOUNT_SANDBOX = "sandbox-account-exchange"
EXCHANGE_BANK_ACCOUNT_PASSWORD = "secret"
-
+
# EBICS
EBICS_HOST_ID = "ebicsDeployedHost"
EXCHANGE_EBICS_USER_ID = "exchangeEbicsUserId"
@@ -806,15 +781,15 @@ def prepare(x_forwarded_host, x_forwarded_proto,
postgres_db_name):
def __init__(self, filename):
self.sections = OrderedDict()
self.filename = filename
-
+
def destroy(self):
del self.sections
self.sections = OrderedDict()
-
+
def cfg_put(self, section_name, key, value):
s = self.sections[section_name] = self.sections.get(section_name,
OrderedDict())
s[key] = value
-
+
def cfg_write(self, outdir):
if outdir:
if not os.path.isdir(outdir):
@@ -822,7 +797,7 @@ def prepare(x_forwarded_host, x_forwarded_proto,
postgres_db_name):
fstream = open(os.path.join(outdir, self.filename), "w")
else:
fstream = open(sys.stdout)
-
+
for section_name, section in self.sections.items():
fstream.write("[" + section_name + "]" + "\n")
for key, value in section.items():
@@ -891,7 +866,7 @@ def prepare(x_forwarded_host, x_forwarded_proto,
postgres_db_name):
obj.cfg_put(sec, "fee_refund", currency + ":" + f_refund)
obj.cfg_put(sec, "fee_deposit", currency + ":" + f_deposit)
obj.cfg_put(sec, "rsa_keysize", rsa_keysize)
-
+
obj = ConfigFile("taler.conf")
obj.cfg_put("paths", "TALER_DATA_HOME", str(TALER_DATA_DIR))
if not taler_runtime_dir.is_dir():
@@ -899,7 +874,7 @@ def prepare(x_forwarded_host, x_forwarded_proto,
postgres_db_name):
obj.cfg_put("paths", "TALER_RUNTIME_DIR", str(taler_runtime_dir))
obj.cfg_put("taler", "CURRENCY", currency)
obj.cfg_put("taler", "CURRENCY_ROUND_UNIT", f"{currency}:0.01")
-
+
obj.cfg_put("bank", "serve", "uwsgi")
obj.cfg_put("bank", "uwsgi_serve", "unix")
obj.cfg_put("bank", "uwsgi_unixpath", str(unix_sockets_dir /
"bank.sock"))
@@ -911,35 +886,35 @@ def prepare(x_forwarded_host, x_forwarded_proto,
postgres_db_name):
obj.cfg_put("bank", "base_url", rev_proxy_url + "/bank/")
obj.cfg_put("bank", "database", f"postgres:///{postgres_db_name}")
obj.cfg_put("bank", "suggested_exchange", rev_proxy_url + "/exchange/")
-
+
obj.cfg_put("donations", "serve", "http")
obj.cfg_put("donations", "http_serve", "unix")
obj.cfg_put("donations", "http_unixpath", str(unix_sockets_dir /
"donations.sock"))
obj.cfg_put("donations", "http_unixpath_mode", "660")
-
+
obj.cfg_put("landing", "serve", "http")
obj.cfg_put("landing", "http_serve", "unix")
obj.cfg_put("landing", "http_unixpath", str(unix_sockets_dir /
"landing.sock"))
obj.cfg_put("landing", "http_unixpath_mode", "660")
-
+
obj.cfg_put("blog", "serve", "http")
obj.cfg_put("blog", "http_serve", "unix")
obj.cfg_put("blog", "http_unixpath", str(unix_sockets_dir /
"blog.sock"))
obj.cfg_put("blog", "http_unixpath_mode", "660")
-
+
obj.cfg_put("survey", "serve", "http")
obj.cfg_put("survey", "http_serve", "unix")
obj.cfg_put("survey", "http_unixpath", str(unix_sockets_dir /
"survey.sock"))
obj.cfg_put("survey", "http_unixpath_mode", "660")
obj.cfg_put("survey", "bank_password", "x")
-
+
obj.cfg_put("merchant", "serve", "unix")
obj.cfg_put("merchant", "unixpath", str(unix_sockets_dir /
"merchant-backend.sock"))
obj.cfg_put("merchant", "wire_transfer_delay", "0 s")
obj.cfg_put("merchant", "default_max_wire_fee", currency + ":" +
"0.01")
obj.cfg_put("merchant", "default_max_deposit_fee", currency + ":" +
"0.05")
obj.cfg_put("merchantdb-postgres", "config",
f"postgres:///{postgres_db_name}")
-
+
obj.cfg_put("frontends", "backend", rev_proxy_url +
"/merchant-backend/")
obj.cfg_put(
"merchant-exchange-{}".format(currency),
@@ -955,7 +930,7 @@ def prepare(x_forwarded_host, x_forwarded_proto,
postgres_db_name):
obj.cfg_put("auditor", "auditor_url", rev_proxy_url + "/auditor")
obj.cfg_put("auditor", "unixpath", str(unix_sockets_dir /
"auditor.sock"))
obj.cfg_put("auditor", "tiny_amount", currency + ":0.01")
-
+
obj.cfg_put(
"taler-exchange-secmod-eddsa",
"unixpath",
@@ -984,7 +959,7 @@ def prepare(x_forwarded_host, x_forwarded_proto,
postgres_db_name):
obj.cfg_put("exchange", "terms_dir",
"$HOME/.local/share/taler-exchange/tos")
obj.cfg_put("exchange", "privacy_etag", "0")
obj.cfg_put("exchange", "privacy_dir",
"$HOME/.local/share/taler-exchange/pp")
-
+
obj.cfg_put("exchangedb-postgres", "db_conn_str",
f"postgres:///{postgres_db_name}")
obj.cfg_put("exchangedb-postgres", "config",
f"postgres:///{postgres_db_name}")
obj.cfg_put("auditordb-postgres", "db_conn_str",
f"postgres:///{postgres_db_name}")
@@ -996,7 +971,7 @@ def prepare(x_forwarded_host, x_forwarded_proto,
postgres_db_name):
"${TALER_DATA_HOME}/merchant/wire/merchant.json",
)
obj.cfg_put("merchant-account-merchant", "wire_file_mode", "770")
-
+
obj.cfg_put("frontends", "backend_apikey", f"{frontend_api_key}")
coin(obj, currency, "ct_10", "0.10")
coin(obj, currency, "1", "1")
@@ -1006,7 +981,7 @@ def prepare(x_forwarded_host, x_forwarded_proto,
postgres_db_name):
coin(obj, currency, "1000", "1000")
obj.cfg_write(outdir)
return obj
-
+
def config_sync(
filename, outdir,
unix_sockets_dir,
@@ -1024,32 +999,6 @@ def prepare(x_forwarded_host, x_forwarded_proto,
postgres_db_name):
obj.cfg_put("sync", "payment_backend_url", rev_proxy_url +
"merchant-backend/instances/Taler/")
obj.cfg_put("syncdb-postgres", "config",
f"postgres:///{postgres_db_name}")
obj.cfg_write(outdir)
-
- def config_anastasis(
- filename, outdir,
- unix_sockets_dir,
- currency, rev_proxy_url,
- api_key, postgres_db_name):
- obj = ConfigFile(filename)
- obj.cfg_put("taler", "currency", currency)
- obj.cfg_put("anastasis", "serve", "unix")
- obj.cfg_put("anastasis", "business_name", f"GNU Taler Demo Anastasis
Provider")
- obj.cfg_put("anastasis", "unixpath", str(unix_sockets_dir /
"anastasis.sock"))
- obj.cfg_put("anastasis", "annual_fee", f"{currency}:0")
- obj.cfg_put("anastasis", "question_cost", f"{currency}:0")
- obj.cfg_put("anastasis", "insurance", f"{currency}:0")
- obj.cfg_put("anastasis", "truth_upload_fee", f"{currency}:0")
- obj.cfg_put("anastasis", "fulfillment_url",
"taler://fulfillment-success/")
- obj.cfg_put("anastasis", "server_salt", "kreb3ia9dmj43gfa")
- obj.cfg_put("stasis-postgres", "config",
f"postgres:///{postgres_db_name}")
- obj.cfg_put("anastasis-merchant-backend",
- "payment_backend_url",
- rev_proxy_url + "merchant-backend/instances/anastasis/"
- )
- obj.cfg_put("anastasis-merchant-backend", "api_key", f"Bearer
secret-token:{api_key}")
- obj.cfg_put("authorization-question", "cost", f"{currency}:0")
- obj.cfg_put("authorization-question", "enabled", "yes")
- obj.cfg_write(outdir)
def unit_file_content(description, cmd, env=None):
executable_name = cmd.split(" ")[0].split("/")[-1]
@@ -1065,7 +1014,7 @@ def prepare(x_forwarded_host, x_forwarded_proto,
postgres_db_name):
content += f"\nEnvironmentFile={env}"
return content
-
+
print_nn("Ensure no service is running...")
if is_serving(REV_PROXY_URL + "/", tries=3):
fail("Reverse proxy is unexpectedly running!")
@@ -1277,17 +1226,6 @@ def prepare(x_forwarded_host, x_forwarded_proto,
postgres_db_name):
postgres_db_name=postgres_db_name
)
print(" OK")
- print_nn("Generating anastasis.conf...")
- config_anastasis(
- "anastasis.conf",
- outdir=CFG_OUTDIR,
- unix_sockets_dir=UNIX_SOCKETS_DIR,
- currency=CURRENCY,
- rev_proxy_url=get_link(),
- api_key=FRONTENDS_API_TOKEN,
- postgres_db_name=postgres_db_name
- )
- print(" OK")
print_nn("Reset and init exchange DB..")
Command([
f"{TALER_PREFIX}/bin/taler-exchange-dbinit",
@@ -1452,7 +1390,7 @@ def prepare(x_forwarded_host, x_forwarded_proto,
postgres_db_name):
"-c", CFG_OUTDIR / "taler.conf",
"enable-account", EXCHANGE_PAYTO, "upload"
]).run()
- print(" OK")
+ print(" OK")
# Give each instance a Sandbox account (note: 'default'
# won't have one, as it should typically only manage other
@@ -1605,7 +1543,7 @@ def prepare(x_forwarded_host, x_forwarded_proto,
postgres_db_name):
).run()
## Step 6: Set up merchant
-
+
print_nn("Reset and init merchant database...")
Command([
f"{TALER_PREFIX}/bin/taler-merchant-dbinit",
@@ -1613,7 +1551,7 @@ def prepare(x_forwarded_host, x_forwarded_proto,
postgres_db_name):
"--reset"
]).run()
print(" OK")
-
+
def ensure_instance(
currency,
instance_id,
diff --git a/bin/taler-deployment b/bin/taler-deployment
index 87899dd..6b098a5 100755
--- a/bin/taler-deployment
+++ b/bin/taler-deployment
@@ -255,23 +255,6 @@ def build_sync(r, p):
(p / "taler-buildstamp").touch()
-def build_anastasis(r, p):
- update_checkout(r, p)
- subprocess.run(["./bootstrap"], check=True)
- pfx = Path.home() / "local"
- default_configure(
- "CFLAGS=-ggdb -O0",
- "--enable-logging=verbose",
- f"--with-microhttpd={pfx}",
- f"--with-exchange={pfx}",
- f"--with-merchant={pfx}",
- f"--with-gnunet={pfx}",
- "--disable-doc",
- )
- subprocess.run(["make", "install"], check=True)
- (p / "taler-buildstamp").touch()
-
-
def build_bank(r, p):
update_checkout(r, p)
subprocess.run(["pip3", "install", "poetry"], check=True)
@@ -348,12 +331,6 @@ def get_repos(envname):
["exchange", "merchant","gnunet","libmicrohttpd"],
build_sync,
),
- Repo(
- "anastasis",
- "git://git.taler.net/anastasis",
- ["exchange", "merchant","libmicrohttpd","gnunet"],
- build_anastasis,
- ),
]
if envname in ("int", "coverage", "integrationtest",):
return [
@@ -404,12 +381,6 @@ def get_repos(envname):
["exchange", "merchant", "gnunet", "libmicrohttpd"],
build_sync,
),
- Repo(
- "anastasis",
- "git://git.taler.net/anastasis",
- ["exchange", "merchant", "gnunet", "libmicrohttpd"],
- build_anastasis,
- ),
]
# Note: these are currently not in use!
@@ -502,12 +473,6 @@ def get_repos(envname):
["exchange", "merchant", "gnunet", "libmicrohttpd"],
build_sync,
),
- Repo(
- "anastasis",
- "git://git.taler.net/anastasis",
- ["gnunet", "libmicrohttpd", "exchange", "merchant"],
- build_sync,
- ),
Repo(
"taler-merchant-demos",
"git://git.taler.net/taler-merchant-demos",
diff --git a/bin/taler-deployment-config-generate
b/bin/taler-deployment-config-generate
index 7a891b3..8be0c5a 100755
--- a/bin/taler-deployment-config-generate
+++ b/bin/taler-deployment-config-generate
@@ -256,24 +256,6 @@ def main(currency, envname, outdir, exchange_pub,
frontends_apitoken):
sc.cfg_put("syncdb-postgres", "config", f"postgres:///taler{envname}")
config_files.append(sc)
- ac = ConfigFile(envname, currency, exchange_pub, "anastasis.conf")
- ac.cfg_put("taler", "currency", currency)
- ac.cfg_put("anastasis", "serve", "unix")
- ac.cfg_put("anastasis", "business_name", f"GNU Taler Demo Anastasis
Provider")
- ac.cfg_put("anastasis", "unixpath", "$HOME/sockets/anastasis.http")
- ac.cfg_put("anastasis", "annual_fee", f"{currency}:0")
- ac.cfg_put("anastasis", "question_cost", f"{currency}:0")
- ac.cfg_put("anastasis", "insurance", f"{currency}:0")
- ac.cfg_put("anastasis", "truth_upload_fee", f"{currency}:0")
- ac.cfg_put("anastasis", "fulfillment_url", "taler://fulfillment-success/")
- ac.cfg_put("anastasis", "server_salt", "kreb3ia9dmj43gfa")
- ac.cfg_put("stasis-postgres", "config", f"postgres:///taler{envname}")
- ac.cfg_put("anastasis-merchant-backend", "payment_backend_url",
urls["merchant_backend"] + "instances/anastasis/")
- ac.cfg_put("anastasis-merchant-backend", "api_key", f"Bearer
{frontends_apitoken}")
- ac.cfg_put("authorization-question", "cost", f"{currency}:0")
- ac.cfg_put("authorization-question", "enabled", "yes")
- config_files.append(ac)
-
assert 0 < len(config_files)
for obj in config_files:
obj.cfg_write(outdir)
diff --git a/bin/taler-deployment-config-generate-sepa
b/bin/taler-deployment-config-generate-sepa
index 5b6ef31..e2ea83a 100755
--- a/bin/taler-deployment-config-generate-sepa
+++ b/bin/taler-deployment-config-generate-sepa
@@ -256,24 +256,6 @@ def main(currency, envname, outdir, exchange_pub,
frontends_apitoken):
sc.cfg_put("syncdb-postgres", "config", f"postgres:///taler{envname}")
config_files.append(sc)
- ac = ConfigFile(envname, currency, exchange_pub, "anastasis.conf")
- ac.cfg_put("taler", "currency", currency)
- ac.cfg_put("anastasis", "serve", "unix")
- ac.cfg_put("anastasis", "business_name", f"GNU Taler Demo Anastasis
Provider")
- ac.cfg_put("anastasis", "unixpath", "$HOME/sockets/anastasis.http")
- ac.cfg_put("anastasis", "annual_fee", f"{currency}:0")
- ac.cfg_put("anastasis", "question_cost", f"{currency}:0")
- ac.cfg_put("anastasis", "insurance", f"{currency}:0")
- ac.cfg_put("anastasis", "truth_upload_fee", f"{currency}:0")
- ac.cfg_put("anastasis", "fulfillment_url", "taler://fulfillment-success/")
- ac.cfg_put("anastasis", "server_salt", "kreb3ia9dmj43gfa")
- ac.cfg_put("stasis-postgres", "config", f"postgres:///taler{envname}")
- ac.cfg_put("anastasis-merchant-backend", "payment_backend_url",
urls["merchant_backend"] + "instances/anastasis/")
- ac.cfg_put("anastasis-merchant-backend", "api_key", f"Bearer
{frontends_apitoken}")
- ac.cfg_put("authorization-question", "cost", f"{currency}:0")
- ac.cfg_put("authorization-question", "enabled", "yes")
- config_files.append(ac)
-
assert 0 < len(config_files)
for obj in config_files:
obj.cfg_write(outdir)
diff --git a/bin/taler-deployment-config-instances
b/bin/taler-deployment-config-instances
index 9895737..83cccb7 100755
--- a/bin/taler-deployment-config-instances
+++ b/bin/taler-deployment-config-instances
@@ -103,7 +103,7 @@ def ensure_instance(instance_id, name, payto_uris, auth):
if create_resp.status_code < 200 or create_resp.status_code >= 300:
print(f"Could not create instance '{instance_id}', backend responds:
{create_resp.status_code}/{create_resp.text}")
exit(1)
-
+
def is_merchant_running():
for proc in psutil.process_iter():
@@ -135,7 +135,7 @@ def ensure_default_instance():
# ARM is _not_ running the merchant at this point.
env_with_token = environ.copy()
env_with_token["TALER_MERCHANT_TOKEN"] = TALER_ENV_FRONTENDS_APITOKEN
-
+
print("Starting the merchant outside ARM, passing the token into the
environment.")
# Start the merchant natively.
merchant = Popen(["taler-merchant-httpd"], env=env_with_token)
@@ -144,7 +144,7 @@ def ensure_default_instance():
merchant.terminate()
merchant.wait()
exit(1)
-
+
print("Merchant started successfully, creating the default instance now.")
ensure_instance(
"default",
@@ -219,13 +219,6 @@ ensure_instance(
auth=dict(method="token", token=TALER_ENV_FRONTENDS_APITOKEN),
)
-ensure_instance(
- "anastasis",
- name="Tor",
-
payto_uris=[f"payto://x-taler-bank/bank.{TALER_ENV_NAME}.taler.net/anastasis"],
- auth=dict(method="token", token=TALER_ENV_FRONTENDS_APITOKEN),
-)
-
# Note: this instance has a fixed secret-token, so as to allow anyone to easily
# run their tutorial.
ensure_instance(
@@ -234,4 +227,3 @@ ensure_instance(
payto_uris=[f"payto://x-taler-bank/bank.{TALER_ENV_NAME}.taler.net/Tutorial"],
auth=dict(method="token", token="secret-token:sandbox")
)
-
diff --git a/bin/taler-deployment-prepare b/bin/taler-deployment-prepare
index e6ff5c0..42311fc 100755
--- a/bin/taler-deployment-prepare
+++ b/bin/taler-deployment-prepare
@@ -280,16 +280,6 @@ taler-deployment-arm -k taler-exchange-secmod-cs
taler-deployment-arm -k taler-exchange-secmod-eddsa
taler-deployment-arm -e
-##
-## Step 7: Set up anastasis
-##
-
-#if test $WITH_DB_RESET = yes; then
-# anastasis-dbinit --reset
-#else
-# anastasis-dbinit
-#fi
-
##
## Step 8: Set up sync
##
diff --git a/bin/taler-deployment-start b/bin/taler-deployment-start
index 766705c..f2a0e76 100755
--- a/bin/taler-deployment-start
+++ b/bin/taler-deployment-start
@@ -33,7 +33,6 @@ taler-deployment-arm -i taler-aggregator
taler-deployment-arm -i taler-exchange-wirewatch
taler-deployment-arm -i taler-sync
taler-deployment-arm -i taler-transfer
-#taler-deployment-arm -i anastasis
if $(taler-config -s twister -o taler_deploy >& /dev/null); then
taler-deployment-arm -i taler-twister
diff --git a/bin/taler-deployment-start-with-eufin
b/bin/taler-deployment-start-with-eufin
index c9cdd76..ce29911 100755
--- a/bin/taler-deployment-start-with-eufin
+++ b/bin/taler-deployment-start-with-eufin
@@ -34,7 +34,6 @@ taler-deployment-arm -i taler-aggregator
taler-deployment-arm -i taler-exchange-wirewatch
taler-deployment-arm -i taler-sync
taler-deployment-arm -i taler-transfer
-taler-deployment-arm -i anastasis
if $(taler-config -s twister -o taler_deploy >& /dev/null); then
taler-deployment-arm -i taler-twister
diff --git a/buildbot/bootstrap-scripts/bootstrap-codespell
b/buildbot/bootstrap-scripts/bootstrap-codespell
index 44d4db3..faeb6b5 100755
--- a/buildbot/bootstrap-scripts/bootstrap-codespell
+++ b/buildbot/bootstrap-scripts/bootstrap-codespell
@@ -25,7 +25,7 @@ for component in $REPOS; do
git -C $HOME/$component checkout $BRANCH
done
-REPOS="exchange merchant wallet-core sync anastasis bank twister"
+REPOS="exchange merchant wallet-core sync bank twister"
for component in $REPOS; do
if ! test -d $HOME/$component; then
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index c93fac9..99992d9 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -272,30 +272,6 @@ DOC_FACTORY.addStep(
workdir="../../sources/merchant/doc/doxygen"
)
)
-DOC_FACTORY.addStep(
- steps.ShellSequence(
- name="prepare anastasis",
- description="prepare anastasis",
- descriptionDone="doxygen on anastasis finished",
- commands=[
- util.ShellArg(command=["./bootstrap"], logname='bootstrap'),
- util.ShellArg(command=["./configure", "--enable-only-doc"],
logname='configure'),
- util.ShellArg(command=["cp",
"../exchange/doc/doxygen/taler-exchange.tag",
"doc/doxygen/taler-exchange.tag"], logname="cp-e"),
- util.ShellArg(command=["cp",
"../merchant/doc/doxygen/taler-merchant.tag",
"doc/doxygen/taler-merchant.tag"], logname="cp-m"),
- ],
- workdir="../../sources/anastasis/"
- )
-)
-DOC_FACTORY.addStep(
- ShellCommand(
- name="doxygen::anastasis",
- description="building anastasis doxygen documentation",
- descriptionDone="doxygen on anastasis finished",
- command=["make", "full" ],
- want_stderr=False,
- workdir="../../sources/anastasis/doc/doxygen"
- )
-)
DOC_FACTORY.addStep(
steps.ShellSequence(
name="doxygen::wallet",
@@ -468,7 +444,7 @@ INTEGRATIONTEST_FACTORY.addStep(
name="fetch taler.net sources",
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"],
+ command=["./update-sources.sh", "git://git.taler.net/", "exchange",
"merchant", "wallet-core", "sync", "bank", "twister"],
workdir="../../deployment/buildbot",
haltOnFailure=True,
)
@@ -552,12 +528,6 @@ INTEGRATIONTEST_FACTORY.addStep(jailed_check ("sync", [
"sync",
"lib"
]))
-INTEGRATIONTEST_FACTORY.addStep(jailed_check ("anastasis", [
- "util",
- "stasis",
- "testing",
- "reducer",
-]))
INTEGRATIONTEST_FACTORY.addStep(
ShellCommand(
name="bank check",
@@ -817,7 +787,7 @@ CODESPELL_FACTORY.addStep(
name="fetch taler.net sources",
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"],
+ command=["./update-sources.sh", "git://git.taler.net/", "exchange",
"merchant", "wallet-core", "sync", "bank", "twister"],
workdir="../../deployment/buildbot",
haltOnFailure=True,
)
@@ -828,7 +798,7 @@ CODESPELL_FACTORY.addStep(
name="codespell",
description="spell checking repositories",
descriptionDone="Spell check complete",
- command=["/home/codespell/.local/bin/codespell", "-I",
"/home/codespell/deployment/codespell/dictionary.txt", "-S",
"*.bib,*.bst,*.cls,*.json,*.png,*.svg,*.wav,*.gz,*/mustach/**,*.fees,*key,*.tag,*.info,*.latexmkrc,*.ecc,*.jpg,*.zkey,*.sqlite,*/contrib/hellos/**,*/vpn/tests/**,*.priv,*.file,*.tgz,*.woff,*.gif,*.odt,*.fee,*.deflate,*.dat,*.jpeg,*.eps,*.odg,*/m4/ax_lib_postgresql.m4,*/m4/libgcrypt.m4,*.rpath,config.status,ABOUT-NLS,*/doc/texinfo.tex,*.PNG,*.??.json,*.docx,*.ods,*.d
[...]
+ command=["/home/codespell/.local/bin/codespell", "-I",
"/home/codespell/deployment/codespell/dictionary.txt", "-S",
"*.bib,*.bst,*.cls,*.json,*.png,*.svg,*.wav,*.gz,*/mustach/**,*.fees,*key,*.tag,*.info,*.latexmkrc,*.ecc,*.jpg,*.zkey,*.sqlite,*/contrib/hellos/**,*/vpn/tests/**,*.priv,*.file,*.tgz,*.woff,*.gif,*.odt,*.fee,*.deflate,*.dat,*.jpeg,*.eps,*.odg,*/m4/ax_lib_postgresql.m4,*/m4/libgcrypt.m4,*.rpath,config.status,ABOUT-NLS,*/doc/texinfo.tex,*.PNG,*.??.json,*.docx,*.ods,*.d
[...]
workdir="/home/codespell/sources/"
)
)
diff --git a/buildbot/run-coverage-helper.sh b/buildbot/run-coverage-helper.sh
index 7448514..e85544a 100755
--- a/buildbot/run-coverage-helper.sh
+++ b/buildbot/run-coverage-helper.sh
@@ -7,7 +7,7 @@ set -eu
ORIG=`pwd`
-for codebase in exchange merchant sync anastasis; do
+for codebase in exchange merchant sync ; do
TOP="$HOME/sources/${codebase}/"
REPORT_DIR="$HOME/sources/${codebase}/coverage_report"
lcov --no-external --initial -d $TOP -z
diff --git a/buildbot/with-postgres.sh b/buildbot/with-postgres.sh
index a4552d9..ba0d83a 100755
--- a/buildbot/with-postgres.sh
+++ b/buildbot/with-postgres.sh
@@ -14,7 +14,6 @@ export PGHOST=localhost
$PG_DIR/pg_ctl -D $TMP_DB_DIR/ -o "-c unix_socket_directories=$HOME" -l
logfile start
$PG_DIR/createdb talercheck
$PG_DIR/createdb synccheck
-$PG_DIR/createdb anastasischeck
# Run the commands
"$@"
diff --git a/envcfg/envcfg-demo-2021-08-18.py b/envcfg/envcfg-demo-2021-08-18.py
index a64113d..d372c20 100644
--- a/envcfg/envcfg-demo-2021-08-18.py
+++ b/envcfg/envcfg-demo-2021-08-18.py
@@ -4,7 +4,7 @@ env = "demo"
tag_gnunet = "v0.15.0"
tag_libmicrohttpd = "3db35a4ca6192cd26770ee69f1c48e353535b70d"
-# previous at exchange: "35b232642bc831e8c9759f7ae6180bb2deabed7e"
+# previous at exchange: "35b232642bc831e8c9759f7ae6180bb2deabed7e"
tag_exchange = "v0.8.3"
tag_merchant = "v0.8.2"
tag_bank = "v0.8.2"
@@ -12,4 +12,3 @@ tag_sync = "v0.8.2"
tag_taler_merchant_demos = "1d66634cd8f4b5c089be58d62615fc48d3f7163b"
tag_wallet_core = "daf9dc507ec16c34cecb7f423be8935b6816eede"
tag_twister = "v0.8.1"
-tag_anastasis = "v0.0.0"
diff --git a/taler-arm/anastasis.conf b/taler-arm/anastasis.conf
deleted file mode 100644
index 43921f6..0000000
--- a/taler-arm/anastasis.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[anastasis]
-TYPE = simple
-BINARY = anastasis-httpd
-OPTIONS = -l $HOME/logs/anastasis-%Y-%m-%d.log
--
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: remove Anastasis from buildbot deployment,
gnunet <=