[taler-grid5k] 02/48: nodejs must be installed manually

[gnunet]

This is an automated email from the git hooks/post-receive script.

marco-boss pushed a commit to branch master
in repository grid5k.

commit 95c98c164d7685d631f9e48864ca29d52d142a53
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Fri May 6 13:05:58 2022 +0200

    nodejs must be installed manually
---
 additional/persist.sh              |  2 +-
 experiment/env                     | 12 ++++++++----
 experiment/scripts/database.sh     |  2 +-
 experiment/scripts/monitor.sh      | 14 +++++++++++---
 image/debian11/taler-debian11.yaml |  6 ++++--
 5 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/additional/persist.sh b/additional/persist.sh
index 83448b9..ef4fb51 100755
--- a/additional/persist.sh
+++ b/additional/persist.sh
@@ -51,7 +51,7 @@ function backup() {
   G5K_BACKUP="g5k-$(date +%s).tar.gz"
   
   echo "Creating archive, this can take some time"
-  ssh g5k 'rm -rf grenoble/g5k.tar* && find . -type l -maxdepth 1 -exec tar 
--ignore-failed-read -rf grenoble/g5k.tar -C {} exp-logs exp-data espec-times 
2>&1 \; | grep -vi "no such file"' &
+  ssh g5k 'rm -rf grenoble/g5k.tar* && find . -maxdepth 1 -type l -exec tar 
--ignore-failed-read -rf grenoble/g5k.tar -C {} exp-logs exp-data espec-times 
2>&1 \; | grep -vi "no such file"' &
   
   PID=$!
   while kill -0 $PID > /dev/null 2>&1; do
diff --git a/experiment/env b/experiment/env
index d72f84b..f663d85 100644
--- a/experiment/env
+++ b/experiment/env
@@ -67,6 +67,7 @@ LOKI_DATASOURCE_NAME=Loki
 # These values most certain do not need to be adjusted, unless their
 # config in ../configs/etc/* is changed.
 # Doc: https://www.grid5000.fr/w/HTTP/HTTPs_access
+# Valid values: http/http8080, https/https8443
 PROMETHEUS_G5K_PROXY_PORT=http8080
 LOKI_G5K_PROXY_PORT=http
 
@@ -101,9 +102,16 @@ WALLET_BENCHMARK=bench1
 WALLET_USE_HTTPS=true
 # Run a withdraw only experiment
 WALLET_WITHDRAW_ONLY=false
+# Do batch withdrawals of a reserve rather than single coins
+TALER_WALLET_BATCH_WITHDRAWAL=1
 # Needed for wallets to accept self signed certificates
 NODE_TLS_REJECT_UNAUTHORIZED=0
 
+# Other wallet options mostly for performance experiments
+TALER_WALLET_SYNC_CRYPTO=1
+TALER_WALLET_PRIMITIVE_WORKER=1
+TALER_WALLET_INSECURE_TRUST_EXCHANGE=1
+
 # Initial number of exchange processes to run.
 # default = 10
 # Start another bunch with `taler-perf start exchange <N>`
@@ -117,10 +125,6 @@ NUM_AGGREGATOR_PROCESSES=0
    NUM_TRANSER_PROCESSES=1
 NUM_WIREWATTCH_PROCESSES=1
 
-TALER_WALLET_SYNC_CRYPTO=1
-TALER_WALLET_PRIMITIVE_WORKER=1
-TALER_WALLET_INSECURE_TRUST_EXCHANGE=1
-
 # If prometheus node exporter should be enabled
 # Most certainly this is true, since otherwise no overview
 # of services and running wallets can be generated in grafana.
diff --git a/experiment/scripts/database.sh b/experiment/scripts/database.sh
index de75384..959e616 100755
--- a/experiment/scripts/database.sh
+++ b/experiment/scripts/database.sh
@@ -23,7 +23,7 @@ function setup_disks() {
     # Yeti nvme
     DISK=/dev/disk4
   else
-    return
+    return 0
   fi
   echo 'start=2048, type=83' | sfdisk ${DISK} || true
   yes | mkfs.ext4 -m 0 ${DISK} || true
diff --git a/experiment/scripts/monitor.sh b/experiment/scripts/monitor.sh
index 94a21db..2b9a875 100755
--- a/experiment/scripts/monitor.sh
+++ b/experiment/scripts/monitor.sh
@@ -20,12 +20,18 @@ source ~/scripts/helpers.sh
 
 # Update a data source on the external grafana instance
 # $1: Data-source name (configured in .env)
-# $2: Grid5000 external url for the node where the data source is hosted
+# $2: Port for the datasource (i.e. http/http8080 or https/https8443)
 #     - https://www.grid5000.fr/w/HTTP/HTTPs_access
 function update_datasource() {
+  # Get the id of the datasource to update
   ID=$(jq --arg name "$1" '.[] | select(.name == $name) | .id' ds.json)
 
-  jq --arg url "https://$(hostname | cut -d "." -f 1,2 
-).$2.proxy.grid5000.fr" \
+  # We require e.g. dahu-2.grenoble.<PORT> as domain
+  # Extract dahu-2.grenoble from 'hostname'
+  HOST=$(hostname | cut -d "." -f 1,2 -)
+  
+  # Replace the datasources url with our proxy domain
+  jq --arg url "https://${HOST}.${2}.proxy.grid5000.fr"; \
      --arg name "$1" \
      '.[] | select(.name == $name) | .url = $url' \
      ds.json | \
@@ -42,11 +48,13 @@ function update_datasource() {
 # step is skipped - requires admin level api key to update data sources
 function update_grafana() {
   if [[ -z ${GRAFANA_HOST} || -z ${GRAFANA_API_KEY} ]]; then
-    return
+    return 0
   fi
   AUTH_HEADER="Authorization: Bearer ${GRAFANA_API_KEY}"
   GRAFANA_API="${GRAFANA_HOST}/api"
   
+  # Retrieve the initially configured datasources and safe them to a file
+  # to be used later in update_datasource
   if ! curl -k -f -H "${AUTH_HEADER}" \
     "${GRAFANA_API}/datasources" \
     -o ds.json ;
diff --git a/image/debian11/taler-debian11.yaml 
b/image/debian11/taler-debian11.yaml
index 738fba4..4de1610 100644
--- a/image/debian11/taler-debian11.yaml
+++ b/image/debian11/taler-debian11.yaml
@@ -39,8 +39,8 @@ global:
   g5k_kernel_params: "mitigations=off"
   ## Environment visibility
   # g5k_visibility: "shared"
-  taler_build_packages: "recutils autoconf uncrustify autopoint libtool 
python3-pip libgcrypt20-dev libjansson-dev libcurl4-gnutls-dev libsodium-dev 
libidn2-dev libunistring-dev libgnutls28-dev libsqlite3-dev libqrencode-dev 
valgrind libpq-dev texinfo gdb make npm zip python3-distutils pkg-config"
-  taler_packages: "nginx postgresql-13 postgresql-contrib curl jq bc sudo git 
zile dnsutils prometheus-postgres-exporter prometheus-nginx-exporter net-tools 
netcat parallel nodejs tshark dnsmasq bind9 systemd-coredump bash-completion 
pgbouncer pgstat linux-perf"
+  taler_build_packages: "recutils autoconf uncrustify autopoint libtool 
python3-pip libgcrypt20-dev libjansson-dev libcurl4-gnutls-dev libsodium-dev 
libidn2-dev libunistring-dev libgnutls28-dev libsqlite3-dev libqrencode-dev 
valgrind libpq-dev texinfo gdb make zip python3-distutils pkg-config"
+  taler_packages: "nginx postgresql-13 postgresql-contrib curl jq bc sudo git 
zile dnsutils prometheus-postgres-exporter prometheus-nginx-exporter net-tools 
netcat parallel tshark dnsmasq bind9 systemd-coredump bash-completion pgbouncer 
pgstat linux-perf"
   taler_packages_no_recommends: "prometheus prometheus-node-exporter 
prometheus-pgbouncer-exporter"
   taler_disable_services: "nginx postgresql prometheus 
prometheus-postgres-exporter prometheus-nginx-exporter prometheus-node-exporter 
named gettext-base dnsmasq prometheus-pgbouncer-exporter pgbouncer"
   taler_loki_version: "v2.4.2"
@@ -72,6 +72,8 @@ setup:
       - exec_in: |
          apt update
          apt upgrade -y
+         apt install -y curl
+         curl -sL https://deb.nodesource.com/setup_16.x | bash -
          apt install -y $${taler_packages} $${taler_build_packages}
          apt install -y --no-install-recommends 
$${taler_packages_no_recommends}
 

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