taler-deployment

commit 3328e55a398a901c7257c1f9062bbb32c7e4803f
parent 87355e76ed445f63b1b60ee5594dbd452a50125d
Author: Christian Grothoff <christian@grothoff.org>
Date:   Tue, 23 Aug 2022 21:12:37 +0200

-update demo

Diffstat:
M
bin/taler-deployment
 | 
46
++++++++++++++++++----------------------------
M
bin/taler-deployment-prepare
 | 
23
+----------------------
A
envcfg/envcfg-demo-2021-08-24.py
 | 
14
++++++++++++++
A
envcfg/envcfg-demo-2022-08-23.py
 | 
14
++++++++++++++

4 files changed, 47 insertions(+), 50 deletions(-)
diff --git a/bin/taler-deployment b/bin/taler-deployment
@@ -255,16 +255,6 @@ def build_sync(r, p):
     (p / "taler-buildstamp").touch()
 
 
-def build_bank(r, p):
-    update_checkout(r, p)
-    subprocess.run(["pip3", "install", "poetry"], check=True)
-    subprocess.run(["./bootstrap"], check=True)
-    pfx = Path.home() / "local"
-    pyconfigure()
-    subprocess.run(["make", "install"], check=True)
-    (p / "taler-buildstamp").touch()
-
-
 def build_demos(r, p):
     update_checkout(r, p)
     pfx = Path.home() / "local"
@@ -296,6 +286,12 @@ def get_repos(envname):
     if envname in ("docs-builder",):
         return [
             Repo(
+                "libeufin",
+                "git://git.taler.net/libeufin.git",
+                [],
+                build_libeufin,
+            ),
+            Repo(
                 "libmicrohttpd",
                 "git://git.gnunet.org/libmicrohttpd.git",
                 [],
@@ -352,12 +348,6 @@ def get_repos(envname):
                 ["libmicrohttpd"],
                 build_gnunet),
             Repo(
-                "bank",
-                "git://git.taler.net/bank",
-                [],
-                build_bank
-            ),
-            Repo(
                 "wallet-core",
                 "git://git.taler.net/wallet-core",
                 [],
@@ -387,16 +377,16 @@ def get_repos(envname):
     if envname in ("euro", "chf"):
         return [
             Repo(
-                "libmicrohttpd",
-                "git://git.gnunet.org/libmicrohttpd.git",
+                "libeufin",
+                "git://git.taler.net/libeufin.git",
                 [],
-                build_libmicrohttpd,
+                build_libeufin,
             ),
             Repo(
-                "bank",
-                "git://git.taler.net/bank",
+                "libmicrohttpd",
+                "git://git.gnunet.org/libmicrohttpd.git",
                 [],
-                build_bank,
+                build_libmicrohttpd,
             ),
             Repo(
                 "gnunet",
@@ -426,16 +416,16 @@ def get_repos(envname):
     if envname in ("tanker", "local", "demo", "int", "test", "auditor-reporter-test", "auditor-reporter-demo"):
         return [
             Repo(
-                "wallet-core",
-                "git://git.taler.net/wallet-core",
+                "libeufin",
+                "git://git.taler.net/libeufin.git",
                 [],
-                build_wallet,
+                build_libeufin,
             ),
             Repo(
-                "bank",
-                "git://git.taler.net/bank",
+                "wallet-core",
+                "git://git.taler.net/wallet-core",
                 [],
-                build_bank,
+                build_wallet,
             ),
             Repo(
                 "libmicrohttpd",
diff --git a/bin/taler-deployment-prepare b/bin/taler-deployment-prepare
@@ -163,7 +163,7 @@ taler-exchange-offline enable-account "$payto_uri" upload
 year=$(date +%Y)
 curr=$TALER_CONFIG_CURRENCY
 for y in $(seq $year $((year + 5))); do
-  taler-exchange-offline wire-fee $y x-taler-bank "$curr:0.01" "$curr:0.01" "$curr:0.01" upload
+  taler-exchange-offline wire-fee $y sepa "$curr:0.01" "$curr:0.01" "$curr:0.01" upload
 done
 
 taler-deployment-arm -k taler-exchange
@@ -175,27 +175,6 @@ taler-deployment-arm -k taler-exchange-secmod-eddsa
 sleep 5
 
 ##
-## Step 4:  Set up the bank
-##
-
-# Delete existing data from bank.
-if test $WITH_DB_RESET = yes; then
-  echo "yes" | taler-bank-manage django flush
-fi
-
-case $TALER_ENV_NAME in
-  demo|test|int|local|tanker)
-    taler-bank-manage django provide_accounts
-    taler-bank-manage django changepassword_unsafe Exchange x
-    taler-bank-manage django changepassword_unsafe Survey x
-    ;;
-  *)
-    echo "Not setting unsafe Exchange bank account password for env $TALER_ENV_NAME"
-    ;;
-esac
-
-
-##
 ## Step 5: Adjust some permissions
 ##
 
diff --git a/envcfg/envcfg-demo-2021-08-24.py b/envcfg/envcfg-demo-2021-08-24.py
@@ -0,0 +1,14 @@
+# Name of the environment
+# (test, demo, int, coverage, demo-checker, auditor-reporter, ...)
+env = "demo"
+
+tag_gnunet = "v0.15.1"
+tag_libmicrohttpd = "3db35a4ca6192cd26770ee69f1c48e353535b70d"
+# previous at exchange: "35b232642bc831e8c9759f7ae6180bb2deabed7e"
+tag_exchange = "v0.8.4"
+tag_merchant = "v0.8.3"
+tag_bank = "v0.8.2"
+tag_sync = "v0.8.2"
+tag_taler_merchant_demos = "1d66634cd8f4b5c089be58d62615fc48d3f7163b"
+tag_wallet_core = "daf9dc507ec16c34cecb7f423be8935b6816eede"
+tag_twister = "v0.8.2"
diff --git a/envcfg/envcfg-demo-2022-08-23.py b/envcfg/envcfg-demo-2022-08-23.py
@@ -0,0 +1,14 @@
+# Name of the environment
+# (test, demo, int, coverage, demo-checker, auditor-reporter, ...)
+env = "demo"
+
+tag_gnunet = "a53dce1f8aaf497c1f7a23cf4fa3e982f9baabfb"
+tag_libmicrohttpd = "83f50ffcea81a01ee4b06391a884df277d31c76d"
+tag_exchange = "783d06cad64aece5af97e9f6c25e0384afd070ea"
+tag_merchant = "b14e18eb31c957276c3f74834495d1bfa5c9329a"
+tag_sync = "57eab1b4810ae1ddb3e6a0b96120148e00a4a75b"
+tag_taler_merchant_demos = "b701e627779710116b8c16af943601314df5a5db"
+tag_wallet_core = "f3ff5a72257dda27cab555f8b8d921d45bfc3e4b"
+tag_libeufin = "91eb52ccb2f68333ff715573d18a14ea1cb3d615"
+tag_twister = "SKIP"
+tag_anastasis = "SKIP"