[taler-deployment] branch master updated: -more d_ms vs d_us

[gnunet]

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 7a82f8c  -more d_ms vs d_us
7a82f8c is described below

commit 7a82f8cd9564e57d746d6dd84308d05e24b8c1e6
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Tue Aug 23 10:42:02 2022 +0200

    -more d_ms vs d_us
---
 bin/taler-deployment-config-instances      |  4 ++--
 bin/taler-deployment-config-instances-iban | 10 +++++-----
 buildbot/master.cfg                        |  3 ++-
 typescript/container/taler-local           |  6 +++---
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/bin/taler-deployment-config-instances 
b/bin/taler-deployment-config-instances
index 83cccb7..e1005b4 100755
--- a/bin/taler-deployment-config-instances
+++ b/bin/taler-deployment-config-instances
@@ -91,8 +91,8 @@ def ensure_instance(instance_id, name, payto_uris, auth):
         default_max_wire_fee=f"{TALER_CONFIG_CURRENCY}:1",
         default_wire_fee_amortization=3,
         default_max_deposit_fee=f"{TALER_CONFIG_CURRENCY}:1",
-        default_wire_transfer_delay=dict(d_ms="forever"),
-        default_pay_delay=dict(d_ms="forever"),
+        default_wire_transfer_delay=dict(d_us="forever"),
+        default_pay_delay=dict(d_us="forever"),
         auth=auth,
     )
     create_resp = requests.post(
diff --git a/bin/taler-deployment-config-instances-iban 
b/bin/taler-deployment-config-instances-iban
index 2a5daef..69d32fb 100755
--- a/bin/taler-deployment-config-instances-iban
+++ b/bin/taler-deployment-config-instances-iban
@@ -75,8 +75,8 @@ def ensure_instance(instance_id, name, payto_uris, auth):
         default_max_wire_fee=f"{TALER_CONFIG_CURRENCY}:1",
         default_wire_fee_amortization=3,
         default_max_deposit_fee=f"{TALER_CONFIG_CURRENCY}:1",
-        default_wire_transfer_delay=dict(d_ms="forever"),
-        default_pay_delay=dict(d_ms="forever"),
+        default_wire_transfer_delay=dict(d_us="forever"),
+        default_pay_delay=dict(d_us="forever"),
         auth=auth,
     )
     http_method = requests.post
@@ -95,7 +95,7 @@ def ensure_instance(instance_id, name, payto_uris, auth):
     if resp.status_code < 200 or resp.status_code >= 300:
         print(f"Could not create (or patch) instance '{instance_id}', backend 
responds: {resp.status_code}/{resp.text}")
         exit(1)
-        
+
 def is_merchant_running():
     for proc in psutil.process_iter():
         if proc.name() == "taler-merchant-httpd" and proc.username() == 
getuser():
@@ -124,7 +124,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 to pass the token into the 
environment.")
     # Start the merchant natively.
     merchant = Popen(["taler-merchant-httpd"], env=env_with_token)
@@ -133,7 +133,7 @@ def ensure_default_instance():
         merchant.terminate()
         merchant.wait()
         exit(1)
-    
+
     print("Merchant started successfully, creating the default instance now.")
     ensure_instance(
         "default",
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index edcf1c8..6a3c0cd 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -1005,7 +1005,8 @@ BUILD_FACTORY.addStep(
         name="keys generation and sign",
         description="Generating exchange keys, and auditor-sign them.",
         descriptionDone="Exchange keys generated, and auditor-signed.",
-        command=["./keys.sh"],
+        command=["timeout", "--preserve-status", "1m",
+                 "./keys.sh"],
         workdir="../../deployment/buildbot",
         haltOnFailure=True,
         env={'BRANCH': util.Property("branch")}
diff --git a/typescript/container/taler-local b/typescript/container/taler-local
index a84645c..bd683eb 100755
--- a/typescript/container/taler-local
+++ b/typescript/container/taler-local
@@ -511,7 +511,7 @@ def bootstrap(list_repos, repos, with_envcfg, dry, 
without_repos) -> None:
         preparedRepos = load_repos(reposList)
     if without_repos:
         for exclude_repo in split_repos_list(without_repos):
-            preparedRepos = [el for el in preparedRepos if el.name != 
exclude_repo] 
+            preparedRepos = [el for el in preparedRepos if el.name != 
exclude_repo]
     clone_repos(preparedRepos)
 
 # Globals sharead accross multiple sub-commands:
@@ -1704,8 +1704,8 @@ def prepare(x_forwarded_host, x_forwarded_proto, 
postgres_db_name):
             default_max_wire_fee=f"{currency}:1",
             default_wire_fee_amortization=3,
             default_max_deposit_fee=f"{currency}:1",
-            default_wire_transfer_delay=dict(d_ms="forever"),
-            default_pay_delay=dict(d_ms="forever"),
+            default_wire_transfer_delay=dict(d_us="forever"),
+            default_pay_delay=dict(d_us="forever"),
             auth=dict(method="token", token=auth_token),
         )
         http_method = requests.post

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.