[taler-grid5k] 04/141: add dummy scripts and some etc files

[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 6521a09188c0abb08dca3c1338de2ef8443c0fcb
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Fri Oct 1 14:05:43 2021 +0200

    add dummy scripts and some etc files
---
 at-boot.sh                        |  9 ---------
 etc/taler/taler.conf              |  0
 gridboot.service                  | 13 -------------
 jfed/.gitignore                   |  1 +
 jfed/README                       | 13 ++++++++++++-
 jfed/env                          |  0
 jfed/experiment-specification.yml |  6 ++++++
 jfed/setup.sh                     | 24 ++++++++++++++++++++++++
 jfed/taler-perf.rspec             | 14 +++++++-------
 scripts/database.sh               | 13 +++++++++++++
 scripts/exchange.sh               |  1 +
 scripts/wallet.sh                 |  1 +
 update.sh                         | 22 ----------------------
 13 files changed, 65 insertions(+), 52 deletions(-)

diff --git a/at-boot.sh b/at-boot.sh
deleted file mode 100644
index 578425f..0000000
--- a/at-boot.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-# Run by the gridboot.service at boot. Updates
-# the grid5k.git and then runs a script from that
-# Git.
-#
-cd /root/grid5k
-git pull
-chmod +x update.sh
-exec /root/grid5k/update.sh
diff --git a/etc/taler/taler.conf b/etc/taler/taler.conf
new file mode 100644
index 0000000..e69de29
diff --git a/gridboot.service b/gridboot.service
deleted file mode 100644
index 509a682..0000000
--- a/gridboot.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Modify image based on grid5k Git on boot
-
-Wants=network-online.target
-After=syslog.target network.target network-online.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/local/bin/at-boot.sh
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/jfed/.gitignore b/jfed/.gitignore
new file mode 100644
index 0000000..4c49bd7
--- /dev/null
+++ b/jfed/.gitignore
@@ -0,0 +1 @@
+.env
diff --git a/jfed/README b/jfed/README
old mode 100644
new mode 100755
index 5bb7d0a..5a7a239
--- a/jfed/README
+++ b/jfed/README
@@ -1,2 +1,13 @@
-taler-perf: boots nodes based on the omnibus image into grid5000
+All files needed to run the experiment can be found inside the jfed/ directory:
+  * experiment-specitication.yml: espec to run the experiment
+  * taler-perf.rspec: boots nodes based on the omnibus image into grid5000
+  * env: template file to add enviroment variables needed for the experiment
+  
+Steps:
+  * cp env .env
+  * edit .env and define the specified variables
+  * in the jfed experimenter gui click 'Open ESpec'
+  * specify the experiment name and time
+
+
 
diff --git a/jfed/env b/jfed/env
new file mode 100644
index 0000000..e69de29
diff --git a/jfed/experiment-specification.yml 
b/jfed/experiment-specification.yml
new file mode 100755
index 0000000..7266cf2
--- /dev/null
+++ b/jfed/experiment-specification.yml
@@ -0,0 +1,6 @@
+version: 1.0-basic
+rspec: taler-perf.rspec
+upload: 
+   - .env
+execute:
+   - setup.sh
diff --git a/jfed/setup.sh b/jfed/setup.sh
new file mode 100755
index 0000000..1f8f77b
--- /dev/null
+++ b/jfed/setup.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+# Script run when a machine boots
+set -eu
+
+G5K_HOME=/root/grid5k
+
+source .env
+cat .env | tee -a /etc/environment
+
+# Temporarily checkout to the feature branch
+cd ${G5K_HOME} && git checkout node-setup && git pull && cd
+
+# Override default /etc/ with the one from this Git.
+cp -r ${G5K_HOME}/etc/* /etc
+
+HOST=$(hostname)
+
+case "$HOST" in 
+       ${DATABASE_HOSTS}) exec ${G5K_HOME}/scripts/database.sh || echo 
"DATABASE";;
+       ${EXCHANGE_HOSTS}) exec ${G5K_HOME}/scripts/exchange.sh || echo 
"EXCHANGE";;
+       ${WALLET_HOSTS}) exec ${G5K_HOME}/scripts/wallet.sh || echo "WALLET";;
+esac
+
+exit 0
diff --git a/jfed/taler-perf.rspec b/jfed/taler-perf.rspec
index ab153a2..1fa25a7 100644
--- a/jfed/taler-perf.rspec
+++ b/jfed/taler-perf.rspec
@@ -1,24 +1,24 @@
 <?xml version='1.0'?>
-<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2021-09-30T20:52:07.138+02:00" 
xmlns:emulab="http://www.protogeni.net/resources/rspec/ext/emulab/1"; 
xmlns:delay="http://www.protogeni.net/resources/rspec/ext/delay/1"; 
xmlns:jfed-command="http://jfed.iminds.be/rspec/ext/jfed-command/1"; 
xmlns:client="http://www.protogeni.net/resources/rspec/ext/client/1"; 
xmlns:jfed-ssh-keys="http://jfed.iminds.be/rspec/ext/jfed-ssh-keys/1"; xmlns: 
[...]
-  <node client_id="DB" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am" 
component_id="urn:publicid:IDN+am.grid5000.fr+node+%2F3.0%2Fsites%2Fgrenoble%2Fclusters%2Fyeti%2Fnodes%2Fyeti-1">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2021-10-01T13:57:24.317+02:00" 
xmlns:emulab="http://www.protogeni.net/resources/rspec/ext/emulab/1"; 
xmlns:delay="http://www.protogeni.net/resources/rspec/ext/delay/1"; 
xmlns:jfed-command="http://jfed.iminds.be/rspec/ext/jfed-command/1"; 
xmlns:client="http://www.protogeni.net/resources/rspec/ext/client/1"; 
xmlns:jfed-ssh-keys="http://jfed.iminds.be/rspec/ext/jfed-ssh-keys/1"; xmlns: 
[...]
+  <node client_id="DB" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lyon.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <hardware_type name="nova-lyon"/>
+    <hardware_type name="gros-nancy"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="354.33333333333337" y="89.66666666666666"/>
   </node>
-  <node client_id="Exchange" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am" 
component_id="urn:publicid:IDN+am.grid5000.fr+node+%2F3.0%2Fsites%2Fnancy%2Fclusters%2Fgraphique%2Fnodes%2Fgraphique-2">
+  <node client_id="Exchange" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lyon.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <hardware_type name="uvb-sophia"/>
+    <hardware_type name="graphite-nancy"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="551.5" 
y="231.5"/>
   </node>
-  <node client_id="Wallet" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am" 
component_id="urn:publicid:IDN+am.grid5000.fr+node+%2F3.0%2Fsites%2Flille%2Fclusters%2Fchiclet%2Fnodes%2Fchiclet-1">
+  <node client_id="Wallet" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lyon.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <hardware_type name="uvb-sophia"/>
+    <hardware_type name="chiclet-lille"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="762.5" 
y="384.5"/>
   </node>
 </rspec>
\ No newline at end of file
diff --git a/scripts/database.sh b/scripts/database.sh
new file mode 100755
index 0000000..0ad6864
--- /dev/null
+++ b/scripts/database.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+systemctl start postgresql
+
+su - postgres
+
+createdb "${DB_NAME}"
+create user "${DB_USER}" with encrypted password "'${DB_PASSWORD}'"
+grant all privileges on database "${DB_NAME}" to user "${DB_USER}"
+
+exit
+
+exit 0
diff --git a/scripts/exchange.sh b/scripts/exchange.sh
new file mode 100755
index 0000000..a9bf588
--- /dev/null
+++ b/scripts/exchange.sh
@@ -0,0 +1 @@
+#!/bin/bash
diff --git a/scripts/wallet.sh b/scripts/wallet.sh
new file mode 100755
index 0000000..a9bf588
--- /dev/null
+++ b/scripts/wallet.sh
@@ -0,0 +1 @@
+#!/bin/bash
diff --git a/update.sh b/update.sh
deleted file mode 100644
index 78ad208..0000000
--- a/update.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-# Script run when a machine boots. (Always this
-# latest version from Git).
-set -eu
-
-touch /root/at-boot-worked
-
-# Temporarily checkout to the feature branch
-cd /root/grid5k && git checkout node-setup && git pull && cd
-
-# Override default /etc/ with the one from this Git.
-# cp -r /root/grid5k/etc/* /etc
-
-HOST=$(hostname)
-
-case "$HOST" in 
-       yeti-*.grenoble.*) echo "DB";;
-       graphique-*.nancy.*) echo "EXCH";;
-       chifflet-*.lille) echo "WALLET";;
-esac
-
-exit 0

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