[taler-grid5k] 18/73: wallet core still not building in one step

[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 8fdeb7357466e66e7b80996b1d64ce7519cfefa5
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Sun Nov 28 10:13:14 2021 +0100

    wallet core still not building in one step
---
 README.md                               |  3 ++-
 additional/README.md                    | 31 +++++++++++++++++++++++++++----
 additional/{ => plots}/config.yaml      |  3 +++
 additional/{ => plots}/plot.sh          |  2 +-
 experiment/README.md                    |  1 +
 experiment/experiment-specification.yml |  2 ++
 experiment/scripts/helpers.sh           | 14 ++++++++++----
 image/README.md                         |  1 +
 image/taler-debian11.yaml               |  2 +-
 9 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index ed22ec8..7a86c9b 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,8 @@ No need to install the required build tools on your machine.
 
 ### Additional
 
-Scripts and configurations which can be used to e.g. persist
+Additional resources such as grafana dashboards and
+scripts/configurations which can be used to e.g. persist
 data of experiments.
 
 ### Configs
diff --git a/additional/README.md b/additional/README.md
index 28278cf..807f19a 100644
--- a/additional/README.md
+++ b/additional/README.md
@@ -1,10 +1,33 @@
 # Additional Resources for Experiments
 
-## plot.sh
+## plots
 
-Create png plots from the grafana experiment dashboards using [Grafana 
Dashboard Plotter](https://github.com/bossm8/grafana-dashboard-plotter).
+### plot.sh
+
+Create png plots from the grafana experiment dashboards using 
+[Grafana Dashboard 
Plotter](https://github.com/bossm8/grafana-dashboard-plotter).
+
+To use this script, the `.env` file located in `experiment` needs to be 
configured 
+since grafana configuration is read from there.
 
 ## grafana
 
-**TBD**
-Will contain grafana dashboards once finished
+### Custom
+
+Contains all *custom* dashboards for the experiments. 
+Import them vie `Create->Import->Upload JSON` (plus sign) 
+
+The database dashboard is a combination of the following two (plus some custom 
custom panels):
+
+* [Postgres Overview](https://grafana.com/grafana/dashboards/455): 455 
+* [PostgreSQL Statistics](https://grafana.com/grafana/dashboards/6742): 6742
+
+### Library
+
+Additional ones needed can be imported from the library.
+In your Grafana instance head to `Create->Import->Import via grafana.com` 
+and copy those ID one after another:
+
+* [Node Exporter Full](https://grafana.com/grafana/dashboards/1860): 1860
+* [Nginx Exporter](https://grafana.com/grafana/dashboards/12708): 12708
+
diff --git a/additional/config.yaml b/additional/plots/config.yaml
similarity index 81%
rename from additional/config.yaml
rename to additional/plots/config.yaml
index 8a13227..2e0c036 100644
--- a/additional/config.yaml
+++ b/additional/plots/config.yaml
@@ -1,3 +1,6 @@
+# Configuration for the Grafana Dashboard Plotter
+# https://github.com/bossm8/grafana-dashboard-plotter.git 
+
 grafana:
   admin_api_key: ${ADMIN_API_KEY}
   base_url: ${BASE_URL}
diff --git a/additional/plot.sh b/additional/plots/plot.sh
similarity index 95%
rename from additional/plot.sh
rename to additional/plots/plot.sh
index 068ff91..b89a516 100755
--- a/additional/plot.sh
+++ b/additional/plots/plot.sh
@@ -4,7 +4,7 @@ set -eu
 
 PLOTTER_DIR=plotter
 
-source ../experiment/.env
+source ../../experiment/.env
 
 if [ ! -d ${PLOTTER_DIR} ]; then
   git clone https://github.com/bossm8/grafana-dashboard-plotter.git 
${PLOTTER_DIR}
diff --git a/experiment/README.md b/experiment/README.md
index bc01f41..4c6de59 100644
--- a/experiment/README.md
+++ b/experiment/README.md
@@ -25,6 +25,7 @@ To successfully run an experiment the following steps must be 
made:
 * Specify the experiment name and time
 * Wait until taler.rspec is allocated successfully and nodes are ready
 * Click (Re)Run ESpec for the job (use the type Directory and select this 
directory (experiment))
+* If any error ocurr just press (Re)Run Espec again because sometimes there 
are still unindentidfied errors
 
 ### Add addtional Wallet Hosts
 
diff --git a/experiment/experiment-specification.yml 
b/experiment/experiment-specification.yml
index 4465e9b..908a4cf 100644
--- a/experiment/experiment-specification.yml
+++ b/experiment/experiment-specification.yml
@@ -1,3 +1,5 @@
+# Experiment Speification
+# To be loaded into jFed using (Re)Run Espec
 version: 1.0-basic
 rspec: 
   - bundled: taler.rspec
diff --git a/experiment/scripts/helpers.sh b/experiment/scripts/helpers.sh
index a062501..899fead 100755
--- a/experiment/scripts/helpers.sh
+++ b/experiment/scripts/helpers.sh
@@ -7,18 +7,24 @@ set -x
 # Set a dynamic domain name in our own dns
 # argument: the domain to be added
 function set_ddn() {
+  # There are still issues sometimes
+  # hostname -I ... failure syntax error
+  while [ ! hostname -I ]; do
+    sleep 5;
+    systemctl restart dnsmasq
+  done
   nsupdate -v << EOF
 server ${DNS_HOSTS}
 zone ${DNS_ZONE}
-update add $1 3600 A $(hostname -I)
+update add ${1} 3600 A $(hostname -I)
 send
 EOF
 }
 
 function set_host() {
-  echo "TALER_HOST=$1" >> /etc/environment
-  echo "TALER_HOST=$1" >> /root/.env
-  export "TALER_HOST=$1"
+  echo "TALER_HOST=${1}" >> /etc/environment
+  echo "TALER_HOST=${1}" >> /root/.env
+  export "TALER_HOST=${1}"
 }
 
 function enable_netdelay() {
diff --git a/image/README.md b/image/README.md
index 6cc5523..866af19 100644
--- a/image/README.md
+++ b/image/README.md
@@ -27,6 +27,7 @@ Replace `<G5K_USER> `and `<G5K_HOST>` in 
`taler-debian11.yaml` in the following
 Alternatively they can be replaced after the build in 
`build/taler-debian11/taler-debian11.dsc`
 
 ### Build
+
 `kameleon build taler-debian11`
 
 **NOTE** Make sure that all dependencies listed in Grid5000 Environments are 
installed
diff --git a/image/taler-debian11.yaml b/image/taler-debian11.yaml
index 18cfaca..8199bdb 100644
--- a/image/taler-debian11.yaml
+++ b/image/taler-debian11.yaml
@@ -142,7 +142,7 @@ setup:
          cd taler-wallet*
          npm install -g pnpm
          ./configure
-         make install
+         make || make install
 
          cd .. && rm -rf taler-wallet-*
 

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